summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoeyh <joeyh>2007-01-10 23:01:15 +0000
committerjoeyh <joeyh>2007-01-10 23:01:15 +0000
commitb415e69ba8f27d0821b9f4ab4f19993a2c0ef211 (patch)
treefd1fb6535cb66a261dff2b603a6ace6e42ec4825
parent985463e25f059565ef677985ebca02c7470efccf (diff)
r1966: * Looks like Package-Type might get into dpkg. Support it w/o the XB-
too.
-rw-r--r--Debian/Debhelper/Dh_Lib.pm2
-rw-r--r--debian/changelog4
2 files changed, 4 insertions, 2 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 435b7001..64b8b797 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 2660c0ec..1c394fa6 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