normalize changed with normalize-audio

git-svn-id: http://abcde.googlecode.com/svn/trunk@15 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/FAQ b/FAQ
index f8caadf..49a35f5 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -1,4 +1,11 @@
 
+Q. What happened with normalize?
+A. Normalize has changed its name under Debian, which is the GNU/Linux 
+   distribution for developing abcde (well, is The GNU/Linux Distribution
+   i only use, at the moment). Now it is called normalize-audio.
+   If you are using some other flavour of OS, you need to change the name
+   of the executable in your abcde.conf file.
+
 Q. I am using MacOSX and I am having problems to use abcde.
 A. Well, I have a Mac, but I use linux on it. I have not been able to find
    a way to make it work there, since I do not have the development tools

diff --git a/Makefile b/Makefile
index a4fc2a2..7945441 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 2.1.20-2.2pre2
+VERSION = 2.1pre2.2.0
 INSTALL = /usr/bin/install -c
 
 # Installation directories

diff --git a/README b/README
index 57e2a92..82e4a32 100644 (file)
--- a/README
+++ b/README
@@ -137,8 +137,8 @@ Options added/modified from 2.1.1 to 2.1.3:
 
 Options added/modified from 2.0.3 to 2.1.x:
 
-* -b use batch processing. It uses normalize to adjust the volume of the
-  songs, and a -g gapless option from lame to remove gaps. Only available
+* -b use batch processing. It uses normalize-audio to adjust the volume of 
+  the songs, and a -g gapless option from lame to remove gaps. Only available
   for mp3+lame combination.
 * a new "normalize" option has been added to -a, to normalize the volume.
 * -o works now with a combination of the different outputs: ogg, mp3, flac.
@@ -188,7 +188,7 @@ abcde requires the following backend tools to work:
 * FLAC encoder (flac) or:
 * Ogg/Speex encoder (speexenc) or:
 * MPP/MP+(Musepack) encoder (mppenc)
-* normalize for volume normalization.
+* normalize-audio for volume normalization.
 * CD Paranoia, an audio CD reading utility,
 * Or cdda2wav, the audio CD reading utility cdparanoia was born from,
 * Or dagrab, another audio CD reading utility.

diff --git a/abcde b/abcde
index 97168a2..5fedb1a 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -11,7 +11,7 @@
 # Copyright for this work is to expire January 1, 2010, after which it
 # shall be public domain.
 
-VERSION="2.2pre3"
+VERSION="2.1pre2.2.0"
 
 usage ()
 {
@@ -1668,6 +1668,7 @@ OGGENCODERSYNTAX=default
 FLACENCODERSYNTAX=default
 SPEEXENCODERSYNTAX=default
 MPPENCODERSYNTAX=default
+NORMALIZERSYNTAX=default
 
 OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
 # Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:
@@ -1687,7 +1688,6 @@ READNICE=10
 DISTMP3NICE=10
 VARIOUSARTISTS=n
 VARIOUSARTISTSTYLE=forward
-NORMALIZERSYNTAX=default
 KEEPWAVS=n
 PADTRACKS=n
 CDDBCOPYLOCAL="n"
@@ -1729,7 +1729,7 @@ MD5SUM=md5sum
 DISTMP3=distmp3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac
-NORMALIZE=normalize
+NORMALIZE=normalize-audio
 CDSPEED=eject
 VORBISGAIN=vorbisgain
 

diff --git a/abcde.1 b/abcde.1
index b163e0c..e1ae473 100644 (file)
--- a/abcde.1
+++ b/abcde.1
@@ -180,7 +180,7 @@ point we only have \'mppenc\' available, from corecodecs.org.
 .TP
 .B NORMALIZERSYNTAX
 Specifies the style of normalizer to use.  Valid options are \'default\'
-and \'normalize'\ (and both run \'normalize\'), since we only support it, ATM.
+and \'normalize'\ (and both run \'normalize-audio\'), since we only support it, ATM.
 .TP
 .B HELLOINFO
 Specifies the Hello information to send to the CDDB server. The CDDB
@@ -362,7 +362,7 @@ An HTTP retrieval program: wget, fetch (FreeBSD) or curl (Mac OS X, among others
 .BR cdparanoia (1),
 .BR cdda2wav (1),
 .BR dagrab (1),
-.BR normalize (1),
+.BR normalize-audio (1),
 .BR oggenc (1),
 .BR vorbize (1),
 .BR flac (1),

diff --git a/abcde.conf b/abcde.conf
index f664816..d79de88 100644 (file)
--- a/abcde.conf
+++ b/abcde.conf
@@ -1,4 +1,4 @@
-# System defaults for abcde version 2.1.x
+# System defaults for abcde version 2.2.x
 # Nothing in this file is uncommented by default.
 # 
 # If you wish to override these system-wide settings, create your own
@@ -100,7 +100,7 @@
 #MD5SUM=md5sum
 #DISTMP3=distmp3
 #VORBISCOMMENT=vorbiscomment
-#NORMALIZE=normalize
+#NORMALIZE=normalize-audio
 #CDSPEED=eject
 
 # Options to call programs with:

diff --git a/changelog b/changelog
index 89a8f06..9fac8ff 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,13 +1,3 @@
-abcde 2.2pre1
-
-  * DATA tracks are now excluded from the ripping process using internally
-    the cdparanoia "-Q" query option. If using another ripper, it does not
-    work (at least there is no support for them in abcde) (Closes: #112692).
-  * New "0" choice for "None of the above" has been introduced. If selected, a
-    template is created and the user encouraged to edit it (Closes: #147683).
-
- -- Jesus Climent <jesus.climent@hispalinux.es>  Mon, 12 Apr 2004 18:03:36 +0000
-
 abcde 2.1.19
 
   * Encoding the whole CD in one file is now possible. Use "-1" as a flag

diff --git a/debian/changelog b/debian/changelog
index 969d3b9..b1407cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-abcde (2.1.20-2.2pre2-1) experimental; urgency=low
+abcde (2.1pre2.2.0-1) experimental; urgency=low
 
   * Added support for MPP/MP+(Musepack) encoding. Although I am trying to
     get 2.2 for Debian Sarge release, mpc seems safe enough to introduce. See
@@ -32,8 +32,9 @@ abcde (2.1.20-2.2pre2-1) experimental; urgency=low
   * Add CDDB information to Ogg/Vorbis and FLAC files (Closes: #265358).
   * Added INTERACTIVE option. Set it to "n" and there you go, without user
     interaction.
+  * normalize has changes its name to normalize-audio.
 
- -- Jesus Climent <jesus.climent@hispalinux.es>  Fri, 13 Aug 2004 12:27:33 +0300
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Fri, 20 Aug 2004 13:09:57 +0000
 
 abcde (2.1.19-1) unstable; urgency=low