[SCM] Debian Qt/KDE packaging tools branch, kubuntu_wily_archive, updated. debian/0.15.17-29-g6cf7e1b

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Sat Jul 25 11:25:47 UTC 2015 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=6cf7e1b

The following commit has been merged in the kubuntu_wily_archive branch:
commit 6cf7e1b2841c32e3ddc7090666e4f8c0e47f9e8e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sat Jul 25 13:25:44 2015 +0200

     Merge from Debian unstable. (LP: #1475045) Remaining changes:
    
    * Merge from Debian unstable. (LP: #1475045) 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.
    * pkgkde-mark-private-symbols: Fix a typo in my surname.
    * Modify pkg-kde-tools.install to install pkgkde-gensymbols
      and pkgkde-symbolshelper manpages, making them much more useful.
      Hopefully Closes: #782866 again.
    * Add a /2/l10n-packages.mk providing a convenient ${kde-l10n:all} substvar
      to be added in Breaks/Replaces for packages that need it.
    * Mark binary pkg-kde-tools as M-A:foreign. (Closes: #751338).
---
 debian/changelog             | 47 +++++++++++++++++++++++++++++++++++++++++---
 debian/control               | 11 +++++------
 debian/links                 |  2 +-
 debian/pkg-kde-tools.install |  7 ++++---
 pkgkde-mark-private-symbols  |  2 +-
 5 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11f8dab..5a49377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+pkg-kde-tools (0.15.18ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable. (LP: #1475045) 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 <ari-tczew at ubuntu.com>  Thu, 16 Jul 2015 00:22:40 +0200
+
+pkg-kde-tools (0.15.18) unstable; urgency=medium
+
+  [ Dmitry Shachnev ]
+  * pkgkde-mark-private-symbols: Fix a typo in my surname.
+
+  [ Diane Trout ]
+  * Modify pkg-kde-tools.install to install pkgkde-gensymbols
+    and pkgkde-symbolshelper manpages, making them much more useful.
+    Hopefully Closes: #782866 again.
+
+  [ Didier Raboud ]
+  * Add a /2/l10n-packages.mk providing a convenient ${kde-l10n:all} substvar
+    to be added in Breaks/Replaces for packages that need it.
+
+ -- Didier Raboud <odyx at debian.org>  Fri, 03 Jul 2015 00:08:19 +0200
+
 pkg-kde-tools (0.15.17ubuntu2) wily; urgency=medium
 
   * Disable dh_auto_test for armhf PPA builds
@@ -167,7 +206,7 @@ pkg-kde-tools (0.15.14ubuntu1) utopic; urgency=medium
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 08 May 2014 12:29:28 +0200
 
-pkg-kde-tools (0.15.14) stable; urgency=medium
+pkg-kde-tools (0.15.14) unstable; urgency=medium
 
   [ William Grant ]
   * perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm:
@@ -175,7 +214,10 @@ pkg-kde-tools (0.15.14) stable; urgency=medium
       erroneously mapping qreal to float on arm64.
     - Add arm64 and ppc64el to the 64-bit matches (Closes: #744173).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 May 2014 10:12:14 +0400
+  [ Helmut Grohne ]
+  * Mark binary pkg-kde-tools as M-A:foreign. (Closes: #751338).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sat, 12 Jul 2014 15:45:14 -0300
 
 pkg-kde-tools (0.15.13) unstable; urgency=medium
 
@@ -1974,4 +2016,3 @@ pkg-kde-tools (0.1) unstable; urgency=low
   * Initial Release.
 
  -- Sune Vuorela <debian at pusling.com>  Thu, 18 Sep 2008 21:39:35 +0200
-
diff --git a/debian/control b/debian/control
index 5f3c8b0..f6da15c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: extra
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: debhelper (>= 9), libdpkg-perl (>= 1.15.6~), cmake (>= 2.6.4)
+Build-Depends: cmake (>= 2.6.4), debhelper (>= 9), libdpkg-perl (>= 1.15.6~)
 Standards-Version: 3.9.6
 Uploaders: Sune Vuorela <sune at debian.org>,
            Modestas Vainius <modax at debian.org>,
@@ -15,11 +15,10 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/pkg-kde-tools.git;a=sum
 Package: pkg-kde-tools
 Architecture: all
 Multi-Arch: foreign
-Depends: ${perl:Depends}, ${misc:Depends}, libdpkg-perl (>= 1.15.6~),
- lintian
+Depends: libdpkg-perl (>= 1.15.6~), lintian, ${misc:Depends}, ${perl:Depends}
 Recommends: dpkg-dev (>= 1.15.6~), libwww-perl
-Suggests: debhelper (>= 7.3.16), cdbs
-Breaks: kdelibs5-dev (<< 4:4.2.2), dpkg-dev (<< 1.15.6~)
+Suggests: cdbs, debhelper (>= 7.3.16)
+Breaks: dpkg-dev (<< 1.15.6~), kdelibs5-dev (<< 4:4.2.2)
 Description: various packaging tools and scripts for KDE Applications
  This package contains a variety of packaging tools and build scripts that may
  be very useful when packaging KDE applications. Even if you are a maintainer
@@ -55,7 +54,7 @@ Description: various packaging tools and scripts for KDE Applications
 Package: libdlrestrictions1
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library that implements library compatibility checks for dlopen()
  This package provides a DLRestrictions library that can be used to check
  compatibility of the external shared library (or plugin) against other
diff --git a/debian/links b/debian/links
index dd7311b..41a2f2d 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1,3 @@
-usr/share/pkg-kde-tools/cmake/README.DebianABIManager usr/share/doc/pkg-kde-tools/README.DebianABIManager
 usr/bin/pkgkde-gensymbols usr/share/pkg-kde-tools/bin/dpkg-gensymbols
 usr/share/man/man1/dpkg-gensymbols.1.gz usr/share/man/man1/pkgkde-gensymbols.1.gz
+usr/share/pkg-kde-tools/cmake/README.DebianABIManager usr/share/doc/pkg-kde-tools/README.DebianABIManager
diff --git a/debian/pkg-kde-tools.install b/debian/pkg-kde-tools.install
index 80b4f88..55d3163 100644
--- a/debian/pkg-kde-tools.install
+++ b/debian/pkg-kde-tools.install
@@ -1,3 +1,5 @@
+kubuntu/bin/* usr/bin/
+kubuntu/lib/* usr/lib/kubuntu-l10n/
 usr/bin/dh_movelibkdeinit
 usr/bin/dh_sameversiondep
 usr/bin/dh_sodeps
@@ -12,13 +14,12 @@ usr/bin/pkgkde-vcs
 usr/share/man/man1/dh_movelibkdeinit.1
 usr/share/man/man1/dh_sameversiondep.1
 usr/share/man/man1/dh_sodeps.1
+usr/share/man/man1/pkgkde-gensymbols.1
 usr/share/man/man1/pkgkde-git.1
 usr/share/man/man1/pkgkde-mark-private-symbols.1
 usr/share/man/man1/pkgkde-override-sc-dev-latest.1
+usr/share/man/man1/pkgkde-symbolshelper.1
 usr/share/man/man1/pkgkde-vcs.1
 usr/share/perl5/Debian/Debhelper/
 usr/share/perl5/Debian/PkgKde*
 usr/share/pkg-kde-tools/
-
-kubuntu/bin/* usr/bin/
-kubuntu/lib/* usr/lib/kubuntu-l10n/
diff --git a/pkgkde-mark-private-symbols b/pkgkde-mark-private-symbols
index 0427b71..ba87f09 100644
--- a/pkgkde-mark-private-symbols
+++ b/pkgkde-mark-private-symbols
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Copyright (c) 2013 Sune Vuorela <sune at debian.org>
 # Copyright (c) 2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-# Copyright (c) 2015 Dmitry Schanev <mitya57 at debian.org>
+# Copyright (c) 2015 Dmitry Shachnev <mitya57 at debian.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

-- 
Debian Qt/KDE packaging tools

More information about the pkg-kde-commits mailing list