r1966: * Looks like Package-Type might get into dpkg. Support it w/o the XB-

  too.

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 435b70010b0d680f9c71ed39feb3bc1bfe6546cc..64b8b7973cb4b62b223e1ab0951c6342eec9430f 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -616,7 +616,7 @@ sub getpackages {
                if (/^Architecture:\s*(.*)/) {
                        $arch=$1;
                }
-               if (/^X[BC]*-Package-Type:\s*(.*)/) {
+               if (/^(?:X[BC]*-)?Package-Type:\s*(.*)/) {
                        $package_type=$1;
                }
                

diff --git a/debian/changelog b/debian/changelog
index 2660c0ec4551214b206a99d473c4c40455062629..1c394fa6056e322293f68c29ac011247f250235e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ debhelper (5.0.43) UNRELEASED; urgency=low
   * Typo. Closes: #400571
   * dh_fixperms: Change a chmod +x to chmod a+x, to avoid the umask
     influencing it.
+  * Looks like Package-Type might get into dpkg. Support it w/o the XB-
+    too.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 26 Dec 2006 16:26:57 -0500
+ -- Joey Hess <joeyh@debian.org>  Wed, 10 Jan 2007 18:00:35 -0500
 
 debhelper (5.0.42) unstable; urgency=low