From: joeyh <joeyh>
Date: Wed, 10 Jan 2007 23:01:15 +0000 (+0000)
Subject: r1966: * Looks like Package-Type might get into dpkg. Support it w/o the XB-
X-Git-Tag: 5.0.43~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b415e69ba8f27d0821b9f4ab4f19993a2c0ef211;p=debhelper.git

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 435b700..64b8b79 100644
--- 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 2660c0e..1c394fa 100644
--- 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