summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-05-24 11:08:45 -0400
committerJoey Hess <joey@kitenet.net>2013-05-24 11:08:45 -0400
commit7a7b1ca082897cd5ff3e421075f4d5f92ac87397 (patch)
tree7689fb0a15c9918217810d0103897478639d792d
parentd4343a08c774a411c7bbdf06e9ff75926dddd114 (diff)
Allow building debhelper with USE_NLS=no to not require po4a to build. Closes: #709557
-rw-r--r--Makefile2
-rw-r--r--debian/changelog7
2 files changed, 9 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f9bb33d9..3d2d093a 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,9 @@ debhelper.7: debhelper.pod
clean:
rm -f *.1 *.7 Debian/Debhelper/Dh_Version.pm
+ifneq ($(USE_NLS),no)
po4a --previous --rm-translations --rm-backups man/po4a/po4a.cfg
+endif
for lang in $(LANGS); do \
if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \
done;
diff --git a/debian/changelog b/debian/changelog
index e99a2e0c..922d3817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (9.20130519) UNRELEASED; urgency=low
+
+ * Allow building debhelper with USE_NLS=no to not require po4a to build.
+ Closes: #709557
+
+ -- Joey Hess <joeyh@debian.org> Fri, 24 May 2013 11:08:12 -0400
+
debhelper (9.20130518) unstable; urgency=low
* dh_installchangelogs: Write the changelog entry used for a binNMU,