summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-08 21:23:43 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-07-08 21:23:43 -0400
commit0c6691e739648718ca616aa365dd147cbbaa3a56 (patch)
treea1afbee8cd321441998cf1c7734a744a9eaf73c5 /debian
parentee5536e22dbe1a629beca2296c1b29ec5c771fde (diff)
parent0cec46a017d11c8967a7ea5cb1082e9abfa6dc7b (diff)
Merge branch 'master' into buildsystems
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e33f170..c1568ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,13 @@ debhelper (7.3.0) experimental; urgency=low
-- Joey Hess <joeyh@debian.org> Wed, 01 Jul 2009 15:31:20 -0400
+debhelper (7.2.21) unstable; urgency=low
+
+ * Add a versioned dep on perl-base, to get a version that supports
+ GetOptionsFromArray. Closes: #536310
+
+ -- Joey Hess <joeyh@debian.org> Wed, 08 Jul 2009 21:08:45 -0400
+
debhelper (7.2.20) unstable; urgency=low
* dh_install: Fix installation of entire top-level directory
diff --git a/debian/control b/debian/control
index 92a113a..171c771 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: http://kitenet.net/~joey/code/debhelper/
Package: debhelper
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg-dev (>= 1.14.19), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
+Depends: ${perl:Depends}, ${misc:Depends}, perl-base (>= 5.10), file (>= 3.23), dpkg-dev (>= 1.14.19), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
Suggests: dh-make
Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6)
Description: helper programs for debian/rules