[SCM] qtbase packaging branch, experimental, updated. debian/5.3.0+dfsg-5-2-g193a6ec

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit ed47de91928fc35a5d289161fd2bd8d36b5711a9
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jun 7 16:44:42 2014 -0300

    Install only the last and relevant changelog.
---
 debian/changelog | 5 +++++
 debian/rules     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 489fb63..57b4435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ qtbase-opensource-src (5.3.0+dfsg-5) UNRELEASED; urgency=medium
     I've contacted upstream to know the best way to go from here, in the
     meantime we just don't detect it.
   * Update symbols files with buildds' logs.
+  * Install only the last (and more relevant) changelog. We were trying (and
+    failing) to install all of them, but only the first one would end up as
+    changelog. As the listing order varies between archs, the final changelog
+    will also be different between them, thus not allowing the package to be
+    really Multi-Arch: same (Closes: #750730).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Jun 2014 15:27:33 -0300
 
diff --git a/debian/rules b/debian/rules
index 56f867f..3edd6a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 # Library package list for override_dh_makeshlibs, excludes -dev -dbg
 pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
 # Upstream changelog
-upstream_changes := $(wildcard dist/changes-*)
+upstream_changes := dist/changes-$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-' | sed -e 's/+dfsg//')
 # Current debian version (e.g.: 4:4.5.2-1)
 current_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 # Specific shlibs version (e.g.: 4:4.5.2)

-- 
qtbase packaging