Merge lp:~mitya57/ubuntu/trusty/pkg-kde-tools/0.15.12ubuntu1 into lp:ubuntu/trusty/pkg-kde-tools

[Dmitry Shachnev]

 * 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
   - add debian/KUBUNTU-BZR-WORKFLOW
   - Add l10n scripts in kubuntu/
   - debian/install: install kubuntu/ files
   - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
     compress packages with LZMA
   - add perllib/Debian/Debhelper/Sequence/lzma.pm and xz.pm
   - perllib/Debian/Debhelper/Sequence/kde.pm: include xz sequences
   - qt-kde-team/{1,2}/policy.mk: remove maintainer checking
   - qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
   - qt-kde-team/2/list-missing.mk: print marker before and after list-missing
     output for script parsing
   - Add qt-kde-team/2/lintian.mk and call it in qt-kde-team/2/debian-qt-kde.mk
   - Depend on python and docbook-to-man, recommend lintian
   - TypeSubst.pm: Anchor architecture matches to the ends of the string, to
     avoid erroneously mapping qreal to float on arm64.
   - TypeSubst.pm: Add arm64 and ppc64el to the 64-bit matches.

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-13 10:14:05 +0000
+++ debian/changelog	2014-01-15 16:42:48 +0000
@@ -1,3 +1,55 @@
+pkg-kde-tools (0.15.12ubuntu1) trusty; 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
+    - add debian/KUBUNTU-BZR-WORKFLOW
+    - Add l10n scripts in kubuntu/
+    - debian/install: install kubuntu/ files
+    - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
+      compress packages with LZMA
+    - add perllib/Debian/Debhelper/Sequence/lzma.pm and xz.pm
+    - perllib/Debian/Debhelper/Sequence/kde.pm: include xz sequences
+    - qt-kde-team/{1,2}/policy.mk: remove maintainer checking
+    - qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
+    - qt-kde-team/2/list-missing.mk: print marker before and after list-missing
+      output for script parsing
+    - Add qt-kde-team/2/lintian.mk and call it in qt-kde-team/2/debian-qt-kde.mk
+    - Depend on python and docbook-to-man, recommend lintian
+    - TypeSubst.pm: Anchor architecture matches to the ends of the string, to
+      avoid erroneously mapping qreal to float on arm64.
+    - TypeSubst.pm: Add arm64 and ppc64el to the 64-bit matches.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 15 Jan 2014 20:36:23 +0400
+
+pkg-kde-tools (0.15.12) unstable; urgency=low
+
+  [ Dmitry Shachnev ]
+  * pkgkde-symbolshelper: fix qptrdiff expansion for s390x.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Wed, 18 Dec 2013 11:23:46 -0300
+
+pkg-kde-tools (0.15.11) unstable; urgency=low
+
+  * Add support for mips64 and mips64el. Thanks YunQiang Su for the patch.
+    (Closes: #723223).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Thu, 14 Nov 2013 09:23:17 -0300
+
+pkg-kde-tools (0.15.10) unstable; urgency=low
+
+  * Actually s390 uses 'j' (unsigned int) for quintptr (Closes: #725300).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Thu, 03 Oct 2013 19:02:46 -0300
+
+pkg-kde-tools (0.15.9) unstable; urgency=low
+
+  * Add s390 and s390x to the list of archs that use 'y' (unsigned long long)
+    as replacement for quintptr (Closes: #725023).
+  * Add myself to Uploaders.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Wed, 02 Oct 2013 17:34:04 -0300
+
 pkg-kde-tools (0.15.8ubuntu2) saucy; urgency=low
 
   * perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm:

=== modified file 'debian/control'
--- debian/control	2013-09-03 10:48:47 +0000
+++ debian/control	2014-01-15 16:42:48 +0000
@@ -7,7 +7,8 @@
 Standards-Version: 3.9.4
 Uploaders: Sune Vuorela <[e-mail]>,
            Modestas Vainius <[e-mail]>,
-           Maximiliano Curia <[e-mail]>
+           Maximiliano Curia <[e-mail]>,
+           Lisandro Damián Nicanor Pérez Meyer <[e-mail]>
 Vcs-Git: git://anonscm.debian.org/pkg-kde/pkg-kde-tools.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/pkg-kde-tools.git;a=summary
 

=== modified file 'perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm'
--- perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm	2013-10-13 10:14:05 +0000
+++ perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm	2014-01-15 16:42:48 +0000
@@ -161,7 +161,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /^(amd64|ia64|alpha|s390|s390x|sparc64|ppc64|ppc64el|arm64)$/) ? 'm' : 'j';
+    return ($arch =~ /^(amd64|ia64|alpha|s390|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'm' : 'j';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::ssize_t;
@@ -180,7 +180,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /^(amd64|ia64|alpha|s390|s390x|sparc64|ppc64|ppc64el|arm64)$/) ? 'l' : 'i';
+    return ($arch =~ /^(amd64|ia64|alpha|s390|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'l' : 'i';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::int64_t;
@@ -199,7 +199,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|arm64)$/) ? 'l' : 'x';
+    return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'l' : 'x';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::uint64_t;
@@ -218,7 +218,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|arm64)$/) ? 'm' : 'y';
+    return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'm' : 'y';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qptrdiff;
@@ -237,7 +237,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /^(amd64|ia64|alpha|sparc64|ppc64|ppc64el|arm64)$/) ? 'x' : 'i';
+    return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'x' : 'i';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::quintptr;
@@ -256,7 +256,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /^(amd64|ia64|alpha|sparc64|ppc64|ppc64el|arm64)$/) ? 'y' : 'j';
+    return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'y' : 'j';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::intptr_t;
@@ -275,7 +275,7 @@
 
 sub _expand {
     my ($self, $arch) = @_;
-    return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|arm64)$/) ? 'l' : 'i';
+    return ($arch =~ /^(amd64|ia64|alpha|s390x|sparc64|ppc64|ppc64el|mips64|mips64el|arm64)$/) ? 'l' : 'i';
 }
 
 package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qreal;