Merge lp:~ari-tczew/ubuntu/wily/pkg-kde-tools/merge into lp:ubuntu/wily/pkg-kde-tools

[Artur Rona]

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

[Daniel Holbach (dholbach)]

Sitting in the review queue now: https://launchpad.net/ubuntu/wily/+queue?queue_state=1&queue_text=pkg-kde-tools

Unmerged revisions

102. By Artur Rona on 2015-08-16

* Merge from Debian unstable. Remaining changes:
  - qt-kde-team/1/debian-qt-kde.mk:
    + Distribution text = "Kubuntu packages".
  - debian/rules:
    + Add rules to sync l10n.
  - perllib/Debian/Debhelper/Sequence/kubuntu_l10n.pm:
    + Add sequence for Debhelper.
  - perllib/Debian/Debhelper/Sequence/{kf5,kde}.pm:
    + Require kubuntu_l10n sequence.
  - debian/pkg-kde-tools.install, kubuntu/*:
    + Install kubuntu/ files and l10n scripts.
  - qt-kde-team/{1,2,3}/policy.mk:
    + Remove maintainer checking.
  - qt-kde-team/{2,3}/lintian.mk:
    + Call it after the binary target in
      qt-kde-team/{2,3}/debian-qt-kde.mk.
  - perllib/Debian/Debhelper/Sequence/kf5.pm:
    + Disable dh_auto_test for armhf PPA builds.
* Team upload.
* Improve error handling in pkgkde-gensymbols.
  Previously it ignored exceptions from dpkg-gensymbols.

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-16 00:22:40 +0000
+++ debian/changelog	2015-08-16 20:45:04 +0000
@@ -1,3 +1,34 @@
+pkg-kde-tools (0.15.19ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - qt-kde-team/1/debian-qt-kde.mk:
+      + Distribution text = "Kubuntu packages".
+    - debian/rules:
+      + Add rules to sync l10n.
+    - perllib/Debian/Debhelper/Sequence/kubuntu_l10n.pm:
+      + Add sequence for Debhelper.
+    - perllib/Debian/Debhelper/Sequence/{kf5,kde}.pm:
+      + Require kubuntu_l10n sequence.
+    - debian/pkg-kde-tools.install, kubuntu/*:
+      + Install kubuntu/ files and l10n scripts.
+    - qt-kde-team/{1,2,3}/policy.mk:
+      + Remove maintainer checking.
+    - qt-kde-team/{2,3}/lintian.mk:
+      + Call it after the binary target in
+        qt-kde-team/{2,3}/debian-qt-kde.mk.
+    - perllib/Debian/Debhelper/Sequence/kf5.pm:
+      + Disable dh_auto_test for armhf PPA builds.
+
+ -- Artur Rona <[e-mail]>  Sun, 16 Aug 2015 22:38:44 +0200
+
+pkg-kde-tools (0.15.19) unstable; urgency=medium
+
+  * Team upload.
+  * Improve error handling in pkgkde-gensymbols.
+    Previously it ignored exceptions from dpkg-gensymbols.
+
+ -- Felix Geyer <[e-mail]>  Fri, 14 Aug 2015 19:10:10 +0200
+
 pkg-kde-tools (0.15.18ubuntu1) wily; urgency=low
 
   * Merge from Debian unstable. (LP: #1475045) Remaining changes:

=== modified file 'pkgkde-gensymbols'
--- pkgkde-gensymbols	2015-05-15 17:04:16 +0000
+++ pkgkde-gensymbols	2015-08-16 20:45:04 +0000
@@ -72,7 +72,10 @@
     *Dpkg::Shlibs::SymbolFile::parse = *new_symbolfile_parse;
 
     # Finally, run stock dpkg-gensymbols
-    do "$exe";
+    unless (do $exe) {
+        print STDERR $@;
+        exit 1;
+    }
 } else {
     print STDERR "pkgkde-gensymbols: unable to determine execution context.", "\n";
     exit 1;