Merge with trunk.

debian/changelog

@@ -1,5 +1,15 @@
-ubuntu-dev-tools (0.23ubuntu1) UNRELEASED; urgency=low
+ubuntu-dev-tools (0.24) UNRELEASED; urgency=low
 
+  [ Soren Hansen ]
+  * Handle epochs properly in submittodebian.
+
+  [ Luke Yelavich ]
+  * update-maintainer: Default to main if rmadison gives no section output.
+
+  [ Cesare Tirabassi ]
+  * Add man page for check-symbols (Thanks to Albert Damen - LP: #174123).
+
+  [ Siegfried-Angel Gevatter Pujals (RainCT) ]
   * what-patch:
      - Print a list of files that have been modified outside debian/
      - Add -h and -q options
@@ -9,8 +19,9 @@ ubuntu-dev-tools (0.23ubuntu1) UNRELEASED; urgency=low
      - Move python-central to Build-Depends-Indep
      - Rename XS-Vcs-* fields to Vcs-*
      - Bump minimum cdbs version to 0.4.49
+  * Add Albert Damen to the Authors and Copyright Holders
 
- -- Siegfried-Angel Gevatter Pujals (RainCT) <sgevatter@ubuntu.cat>  Sun, 09 Dec 2007 18:03:27 +0100
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Mon, 17 Dec 2007 16:32:16 +0100
 
 ubuntu-dev-tools (0.23) hardy; urgency=low
 

submittodebian

@@ -45,6 +45,11 @@ def gen_debdiff(changelog):
 	oldver = changelog._blocks[1].version
 	newver = changelog._blocks[0].version
 
+	if oldver.epoch is not None:
+		oldver = str(oldver)[str(oldver).index(":")+1:]
+	if newver.epoch is not None:
+		newver = str(newver)[str(newver).index(":")+1:]
+
 	olddsc = '../%s_%s.dsc' % (pkg, oldver)
 	newdsc = '../%s_%s.dsc' % (pkg, newver)
 

update-maintainer

@@ -68,7 +68,7 @@ if [ -z "$section" ]; then
         echo "--section argument. Run $0 --help for more information." >&2
         exit 1
     fi
-    section=$(echo $pkgline | grep -Eo "main|universe|multiverse|restricted")
+    section=$(echo $pkgline | grep -Eo "main|universe|multiverse|restricted") || section=main
 fi
 case $section in
     "main"|"restricted")        email="Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>"  ;;