diff -u abcde-2.4.0/debian/control abcde-2.4.0/debian/control
--- abcde-2.4.0/debian/control
+++ abcde-2.4.0/debian/control
@@ -1,7 +1,8 @@
 Source: abcde
 Section: sound
 Priority: optional
-Maintainer: Jesus Climent <jesus.climent@hispalinux.es>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jesus Climent <jesus.climent@hispalinux.es>
 Uploaders: Colin Tuckley <colint@debian.org>
 Homepage: http://code.google.com/p/abcde/
 Standards-Version: 3.8.3
diff -u abcde-2.4.0/debian/changelog abcde-2.4.0/debian/changelog
--- abcde-2.4.0/debian/changelog
+++ abcde-2.4.0/debian/changelog
@@ -1,3 +1,11 @@
+abcde (2.4.0-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes: LP: #474094
+    - Fix tagged speex doesn't work due to syntax error
+      Thanks to Michael Helmling  LP: #350359
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 04 Nov 2009 17:23:19 +0530
+
 abcde (2.4.0-1) unstable; urgency=low
 
   [ Jesus Climent ]
@@ -35,6 +43,19 @@
 
  -- Colin Tuckley <colint@debian.org>  Sun, 02 Aug 2009 13:32:30 +0100
 
+abcde (2.3.99.7-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #405151
+    - Tag m4a/spx tracks if the user wants tracks tagged. (LP: #138367)
+    - Patch from Debian bug 389981 to fix abcde's range code. Thanks to
+      Charles Steinkuehler <cstein@newtek.com>.
+  * Fix tagged speex doesn't work due to syntax error 
+    Thanks to Michael Helmling  LP: #350359
+  * Fix replaygain action fails when OUTPUTFORMAT includes ${YEAR} 
+    LP: #327485 
+    
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Mon, 27 Jul 2009 11:58:12 +0530
+
 abcde (2.3.99.7-1) unstable; urgency=low
 
   [ Jesus Climent ]
@@ -78,6 +99,22 @@
 
  -- Colin Tuckley <colint@debian.org>  Sat, 25 Jul 2009 09:50:42 +0100
 
+abcde (2.3.99.6-1ubuntu2) gutsy; urgency=low
+
+  * Really fix Debian bug 389981.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Sun, 14 Oct 2007 12:40:38 +1000
+
+abcde (2.3.99.6-1ubuntu1) gutsy; urgency=low
+
+  * Don't clobber the -M command-line flag. (LP: #146713)
+  * Tag m4a/spx tracks if the user wants tracks tagged. (LP: #138367)
+  * Patch from Debian bug 389981 to fix abcde's range code. Thanks to
+    Charles Steinkuehler <cstein@newtek.com>.
+  * Update maintainer as per spec.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Sun, 14 Oct 2007 10:56:08 +1000
+
 abcde (2.3.99.6-1) unstable; urgency=low
 
   * Default to UNICODE (UTF8) tags and comments (Closes: #282332).
@@ -1273,0 +1311 @@
+
only in patch2:
unchanged:
--- abcde-2.4.0.orig/abcde
+++ abcde-2.4.0/abcde
@@ -1123,9 +1123,10 @@
 					esac	
 					COMMENT="--comment \"$COMMENT\""
 				fi
-				# Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging
-				if [ ! "$DOTAG" = "y" ]; then
-					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT"
+				# Tag the file at encode time, as it can't be done after encoding.
+				if [ "$DOTAG" = "y" ]; then
+					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT"
+
 				else
 					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
 				fi
@@ -1140,8 +1141,8 @@
 				$RUN_COMMAND nice $EFFECTIVE_NICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
 				;;
 			m4a)
-				# Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging
-				if [ ! "$DOTAG" = "y" ]; then
+				# Tag the file at encode time, as it can't be done after encoding.
+				if [ "$DOTAG" = "y" ]; then
 					$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