rpms/abcde/devel abcde-2.3.99.8-config.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 abcde.spec, 1.21, 1.22 abcde_2.3.99.7-1ubuntu1.diff, 1.1, 1.2 sources, 1.11, 1.12 abcde-2.3.99.7-config.patch, 1.1, NONE

Ville Skyttä scop at fedoraproject.org
Tue Aug 11 22:01:31 UTC 2009


Author: scop

Update of /cvs/pkgs/rpms/abcde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27462

Modified Files:
	.cvsignore abcde.spec abcde_2.3.99.7-1ubuntu1.diff sources 
Added Files:
	abcde-2.3.99.8-config.patch 
Removed Files:
	abcde-2.3.99.7-config.patch 
Log Message:
* Wed Aug 12 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.3.99.8-1
- Update to 2.3.99.8 (#516886).


abcde-2.3.99.8-config.patch:
 README     |    4 ++--
 abcde      |    2 +-
 abcde.1    |    6 +++---
 abcde.conf |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE abcde-2.3.99.8-config.patch ---
diff -up abcde-2.3.99.8/abcde~ abcde-2.3.99.8/abcde
--- abcde-2.3.99.8/abcde~	2009-07-26 20:28:29.000000000 +0300
+++ abcde-2.3.99.8/abcde	2009-08-12 00:47:00.000000000 +0300
@@ -3008,7 +3008,7 @@ MUSICBRAINZ=musicbrainz-get-tracks
 EJECT=eject
 MD5SUM=md5sum
 DISTMP3=distmp3
-NORMALIZE=normalize-audio
+NORMALIZE=normalize
 CDSPEED=eject
 VORBISGAIN=vorbisgain
 MP3GAIN=mp3gain
diff -up abcde-2.3.99.8/abcde.1~ abcde-2.3.99.8/abcde.1
--- abcde-2.3.99.8/abcde.1~	2009-07-26 14:36:02.000000000 +0300
+++ abcde-2.3.99.8/abcde.1	2009-08-12 00:47:02.000000000 +0300
@@ -325,7 +325,7 @@ only support \'faac\', so \'default\' po
 .TP
 .B NORMALIZERSYNTAX
 Specifies the style of normalizer to use.  Valid options are \'default\'
-and \'normalize'\ (and both run \'normalize-audio\'), since we only support it,
+and \'normalize'\ (and both run \'normalize\'), since we only support it,
 ATM.
 .TP
 .B CDROMREADERSYNTAX
@@ -563,7 +563,7 @@ An HTTP retrieval program: wget, fetch (
 (optional) distmp3, a client/server for distributed mp3 encoding.
 .TP
 .B *
-(optional) normalize-audio, a WAV file volume normalizer.
+(optional) normalize, a WAV file volume normalizer.
 .TP
 .B *
 (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, replaygain),
@@ -574,7 +574,7 @@ An HTTP retrieval program: wget, fetch (
 .BR cdparanoia (1),
 .BR cdda2wav (1),
 .BR dagrab (1),
-.BR normalize-audio (1),
+.BR normalize (1),
 .BR oggenc (1),
 .BR vorbize (1),
 .BR flac (1),
diff -up abcde-2.3.99.8/abcde.conf~ abcde-2.3.99.8/abcde.conf
--- abcde-2.3.99.8/abcde.conf~	2009-07-26 14:46:44.000000000 +0300
+++ abcde-2.3.99.8/abcde.conf	2009-08-12 00:47:04.000000000 +0300
@@ -139,7 +139,7 @@
 #DISTMP3=distmp3
 #VORBISCOMMENT=vorbiscomment
 #METAFLAC=metaflac
-#NORMALIZE=normalize-audio
+#NORMALIZE=normalize
 #CDSPEED=eject
 #VORBISGAIN=vorbisgain
 #MKCUE=mkcue
diff -up abcde-2.3.99.8/README~ abcde-2.3.99.8/README
--- abcde-2.3.99.8/README~	2009-07-26 14:46:44.000000000 +0300
+++ abcde-2.3.99.8/README	2009-08-12 00:46:53.000000000 +0300
@@ -152,7 +152,7 @@ Options added/modified from 2.1.1 to 2.1
 
 Options added/modified from 2.0.3 to 2.1.x:
 
-* -b use batch processing. It uses normalize-audio to adjust the volume of 
+* -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
   for mp3+lame combination.
 * a new "normalize" option has been added to -a, to normalize the volume.
@@ -205,7 +205,7 @@ abcde requires the following backend too
 * Ogg/Speex encoder (speexenc) or:
 * MPP/MP+(Musepack) encoder (mppenc) or:
 * AAC encoder (faac)
-* normalize-audio for volume normalization.
+* normalize 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.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Jul 2009 20:53:59 -0000	1.11
+++ .cvsignore	11 Aug 2009 22:01:31 -0000	1.12
@@ -1 +1 @@
-abcde_2.3.99.7.orig.tar.gz
+abcde_2.3.99.8.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- abcde.spec	27 Jul 2009 20:53:59 -0000	1.21
+++ abcde.spec	11 Aug 2009 22:01:31 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.99.7
+Version:        2.3.99.8
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -10,7 +10,7 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://code.google.com/p/abcde/
 Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
-Patch0:         %{name}-2.3.99.7-config.patch
+Patch0:         %{name}-2.3.99.8-config.patch
 # http://code.google.com/p/abcde/issues/detail?id=17
 Patch1:         %{name}-2.1.19-inst.patch
 # Cherry-picked bits from Ubuntu's 2.3.99.7-1ubuntu1
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.3.99.8-1
+- Update to 2.3.99.8 (#516886).
+
 * Mon Jul 27 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.3.99.7-1
 - Update to 2.3.99.7 (#513795); wget and usage patches applied upstream.
 - Patch to improve CDDB track info handling.

abcde_2.3.99.7-1ubuntu1.diff:
 abcde |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Index: abcde_2.3.99.7-1ubuntu1.diff
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde_2.3.99.7-1ubuntu1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abcde_2.3.99.7-1ubuntu1.diff	27 Jul 2009 20:53:59 -0000	1.1
+++ abcde_2.3.99.7-1ubuntu1.diff	11 Aug 2009 22:01:31 -0000	1.2
@@ -25,35 +25,3 @@
  					$RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN"
  					
  				else
-@@ -3291,14 +3292,17 @@
- else
- 	while [ $# -gt 0 ]; do
- 		# Range parsing code courtesy of Vincent Ho
--		RSTART=$(echo $1 | cut -f1 -d-)
--		REND=$(echo $1 | cut -f2 -d-)
--		if [ "$RSTART" = "$REND" ]; then
--			NEWTRACKS="$RSTART"
-+		# Cleaned up to use shell built-ins by Charles Steinkuehler
-+		if [ "${1#*[^0-9-]}" != "$1" ]; then
-+			log error "syntax error while processing track numbers"
- 		else
--			NEWTRACKS=$(f_seq_line $RSTART $REND)
-+			RSTART=${1%%-*}
-+			REND=${1##*-}
-+			while [ ${RSTART:=1} -le ${REND:=0} ] ; do
-+				TRACKQUEUE="$TRACKQUEUE $RSTART"
-+				RSTART=$(( $RSTART + 1 ))
-+			done
- 		fi
--		TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
- 		shift
- 	done
- fi
-@@ -3594,6 +3598,7 @@
- 		FLACENCODER="$FLAC"	
- 		if [ "$DOREPLAYGAIN" = "y" ]; then
- 			FLACENCODEROPTS="${FLACENCODEROPTS} --replay-gain"
-+		fi
- 		# FLAC streams can be encapsulated on a Ogg transport layer
- 		if echo "$FLACENCODEROPTS" | egrep -- "(^| )--ogg($| )" > /dev/null 2>&1 ;then
- 			log error "FLAC on an Ogg container is not yet supported"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Jul 2009 20:53:59 -0000	1.11
+++ sources	11 Aug 2009 22:01:31 -0000	1.12
@@ -1 +1 @@
-a0baa57edecf40c8423eac7e36d06882  abcde_2.3.99.7.orig.tar.gz
+981fd4bfd6938bb6a1130f6193bffb00  abcde_2.3.99.8.orig.tar.gz


--- abcde-2.3.99.7-config.patch DELETED ---




More information about the scm-commits mailing list