summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-15 09:50:47 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-07-15 09:50:47 -0400
commitd92a7906608dcf6c697e912f73376c7f6b030fa8 (patch)
treec93b14ad35563c0f172101311db1ea688eca2903 /debian
parentfba7d9e67576b17ed5eb4da99e5d1882549b5985 (diff)
parent452b7e6a61be42b2c345cdeeb00fbe51f88fce32 (diff)
Merge branch 'master' into buildsystems
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog20
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index cfa6672..ac78030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (7.3.4) experimental; urgency=low
+
+ * Merged debhelper 7.2.24.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 15 Jul 2009 09:50:37 -0400
+
debhelper (7.3.3) experimental; urgency=low
* Add ant buildsystem support. Closes: #537021
@@ -48,6 +54,20 @@ debhelper (7.3.0) experimental; urgency=low
-- Joey Hess <joeyh@debian.org> Wed, 01 Jul 2009 15:31:20 -0400
+debhelper (7.2.24) unstable; urgency=low
+
+ * dh_install: Add test suite covering the last 5 bugs.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 15 Jul 2009 09:42:18 -0400
+
+debhelper (7.2.23) unstable; urgency=low
+
+ * dh_install: Fix support for the case where debian/tmp is
+ explicitly specified in filename paths despite being searched by
+ default. Closes: #537140
+
+ -- Joey Hess <joeyh@debian.org> Wed, 15 Jul 2009 09:24:19 -0400
+
debhelper (7.2.22) unstable; urgency=low
* dh_install: Fix support for the case where --sourcedir=debian/tmp/foo