summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-05-25 11:31:40 -0400
committerJoey Hess <joey@kitenet.net>2013-05-25 11:31:40 -0400
commit2849f4e33bc6ae46335f64d62d33c73e606f7c41 (patch)
tree68978c6682d865da4a12e6ff98f047cfd817aa00 /debian
parent7a7b1ca082897cd5ff3e421075f4d5f92ac87397 (diff)
dh_installchangelogs: No longer automatically converts html changelogs. A plain text version can be provided as a second parameter, or it will generate a file with a pointer to the html changelog if not. html2text's reign of terror has ended. Closes: #562874
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 922d3817..43975a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
debhelper (9.20130519) UNRELEASED; urgency=low
+ * dh_installchangelogs: No longer automatically converts html changelogs.
+ A plain text version can be provided as a second parameter, or it will
+ generate a file with a pointer to the html changelog if not.
+ html2text's reign of terror has ended. Closes: #562874
* Allow building debhelper with USE_NLS=no to not require po4a to build.
Closes: #709557
diff --git a/debian/control b/debian/control
index bfc5b97c..b99342d5 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 (>= 1.16.2), dpkg-dev (>= 1.16.2), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
+Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.16.2), 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), automake (<< 1.11.2)
Multi-Arch: foreign