summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron M. Ucko <ucko@debian.org>2019-03-12 02:21:45 +0000
committerAaron M. Ucko <ucko@debian.org>2019-03-12 02:21:45 +0000
commitab75b4362d6ccd1c7348358070b8f330b7bc2d86 (patch)
treee58d8be5a31a7a28fa499a254458494238594b3d
parentd3b3a6fac1e8031591c94d28586b6e295a077554 (diff)
parent12017e6d9fe3254f70c13e5f04662374666152d2 (diff)
Merge branch 'master' into 'master'
Explicitly install CHANGES file, to avoid confusion and build failures when... See merge request ucko/fltk1.3!1
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/rules2
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index bca7b2d..b7354a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fltk1.3 (1.3.4-10) UNRELEASED; urgency=medium
+
+ * Explictly install CHANGES file, to avoid confusion
+ and build failures when debhelper doesn't install changelogs
+ by default (e.g. Ubuntu)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 01 Mar 2019 14:28:17 +0100
+
fltk1.3 (1.3.4-9) unstable; urgency=medium
* d/control: Tighten B-D-I on texlive-latex-extra to definitively avoid
diff --git a/debian/rules b/debian/rules
index 62ec049..064f0ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,7 +124,7 @@ override_dh_makeshlibs:
dh_makeshlibs -V
override_dh_installchangelogs:
- dh_installchangelogs
+ dh_installchangelogs CHANGES
for x in debian/*/usr/share/doc/*/changelog; do \
mv -v $$x `dirname $$x`/NEWS; \
done