[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-3-6-gc3c12d7

Dmitry Shachnev mitya57 at moszumanska.debian.org
Wed Jan 6 13:55:56 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=c3c12d7

The following commit has been merged in the experimental branch:
commit c3c12d7bec39b1f4077123fe015fb351994a2b3e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 6 16:52:52 2016 +0300

    Make sure dh_installchangelogs is always called.
---
 debian/changelog | 2 ++
 debian/rules     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4f61b5f..2862990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtbase-opensource-src (5.6.0~beta+dfsg-4) UNRELEASED; urgency=medium
   * Drop unused dbus build-dependency.
   * Stop running pkgkde-mark-qt5-private-symbols script during build. The new
     way is that the maintainers run it themselves after each symbols update.
+  * Make sure dh_installchangelogs is called even when upstream changelog is
+    not present.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Jan 2016 21:05:06 +0300
 
diff --git a/debian/rules b/debian/rules
index ef20e5e..809854d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -321,6 +321,8 @@ override_dh_installdocs:
 override_dh_installchangelogs:
 	if [ -f $(upstream_changes) ] ; then \
 		dh_installchangelogs $(upstream_changes); \
+	else \
+		dh_installchangelogs; \
 	fi
 
 override_dh_strip:

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list