summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-09-09 14:28:51 -0400
committerJoey Hess <joey@kitenet.net>2012-09-09 14:29:26 -0400
commit073034791eea9df519a06deb4058908e30d0fa7d (patch)
tree579c525c079efe0e1b50621e10f5055a6ba42f3a /debian
parentf7c9099e88846f7c117aa592f5119911f03e71e5 (diff)
parent37de53703877f57f1604038706a7dce3e292c3ad (diff)
Merge branch 'wheezy'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 3b34f9c..3f85493 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,17 @@ debhelper (9.20120609) UNRELEASED; urgency=low
-- Joey Hess <joeyh@debian.org> Thu, 05 Jul 2012 08:51:07 -0600
+debhelper (9.20120909) UNRELEASED; urgency=low
+
+ * autoscript() can now be passed a perl sub to run to s/// lines of
+ the script, which avoids problems with using sed, including potentially
+ building too long a sed command-line. This will become the recommended
+ interface in the future; for now it can be used by specific commands
+ such as dh_installxmlcatalogs that encounter the problem.
+ Closes: #665296 Thanks, Marcin Owsiany
+
+ -- Joey Hess <joeyh@debian.org> Sun, 09 Sep 2012 14:23:10 -0400
+
debhelper (9.20120830) unstable; urgency=low
* dh_installcatalogs: Adjust catalog conffile conversion to avoid