diff -Nru pkg-kde-tools-0.15.21/datalib/kf5_flags pkg-kde-tools-0.15.24ubuntu2~ppa1/datalib/kf5_flags --- pkg-kde-tools-0.15.21/datalib/kf5_flags 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/datalib/kf5_flags 2017-02-10 15:25:04.000000000 +0000 @@ -1,4 +1,3 @@ -DCMAKE_BUILD_TYPE=Debian --DCMAKE_USE_RELATIVE_PATHS=ON -DCMAKE_INSTALL_SYSCONFDIR=/etc -DKDE_INSTALL_USE_QT_SYS_PATHS=ON diff -Nru pkg-kde-tools-0.15.21/debian/changelog pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/changelog --- pkg-kde-tools-0.15.21/debian/changelog 2016-06-29 19:25:06.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/changelog 2017-02-10 15:39:26.000000000 +0000 @@ -1,5 +1,2181 @@ -pkg-kde-tools (0.15.21) trusty; urgency=medium +pkg-kde-tools (0.15.24ubuntu2~ppa1) xenial; urgency=medium - * trusty tools + * Backport to Xenial. + + -- Dominik Stadler (Ubuntu key) Fri, 10 Feb 2017 16:39:08 +0100 + +pkg-kde-tools (0.15.24ubuntu1) zesty; urgency=medium + + * Merge with debian + + -- José Manuel Santamaría Lema Thu, 02 Feb 2017 00:44:08 +0000 + +pkg-kde-tools (0.15.24) unstable; urgency=medium + + * pkgkde-symbolshelper: Do not pass stderr handle to Dpkg::IPC::spawn, + to workaround #839905 (patch does not print to stderr anyway). + * Add myself to Uploaders. + + -- Dmitry Shachnev Wed, 19 Oct 2016 21:33:01 +0300 + +pkg-kde-tools (0.15.23) unstable; urgency=medium + + * Add myself to Uploaders. + * dh_sodeps: make it work also for libraries in the multiarch directory. + * dh_sameversiondep: fix typo in documentation. + + -- Pino Toscano Sat, 27 Aug 2016 09:53:43 +0200 + +pkg-kde-tools (0.15.22) unstable; urgency=medium + + * Team upload. + + [ Dmitry Shachnev ] + * pkgkde-symbolshelper: Add type substitution for long double. + + [ Pino Toscano ] + * Drop -DCMAKE_USE_RELATIVE_PATHS=ON from the CMake flags: it is no more + supported in recent versions, and its usage breaks functionalities + (e.g. the QFINDTESTDATA system in Qt 5). + * Fix typo in copyright. + * Bump Standards-Version to 3.9.8, no changes required. + + -- Pino Toscano Wed, 20 Jul 2016 22:10:41 +0200 + +pkg-kde-tools (0.15.21) unstable; urgency=medium + + [ Dmitry Shachnev ] + * pkgkde-mark-qt5-private-symbols: + - Make --write-results option the default, add option --print-diff for the + old behavior. + - Do not try to mark private symbols if alternative dependency is not + specified in the symbols file. + * Use canonical URL in Vcs-Browser field. + + [ Maximiliano Curia ] + * pkgkde-symbolshelper: Add time_t type substitution. + + -- Maximiliano Curia Sun, 08 May 2016 10:38:28 +0200 + +pkg-kde-tools (0.15.20~ubuntu4) xenial; urgency=medium + + * Add eo to the locale list + + -- Philip Muškovac Thu, 07 Jan 2016 21:37:10 +0100 + +pkg-kde-tools (0.15.20~ubuntu3) xenial; urgency=medium + + * In ubuntu, the cavalencia l10n package is called ca-valencia + + -- Philip Muškovac Wed, 06 Jan 2016 22:39:25 +0100 + +pkg-kde-tools (0.15.20~ubuntu2) xenial; urgency=medium + + * Drop the ECM_MKSPECS_INSTALL_DIR override in kf5.pm, it's obsolete and + uses an inexistent function call + + -- Philip Muškovac Tue, 08 Dec 2015 22:41:11 +0100 + +pkg-kde-tools (0.15.20~ubuntu1) xenial; urgency=medium + + * 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. + * Add missing file from Debian qt-kde-team/2/l10n-packages.mk + + -- Jonathan Riddell Tue, 08 Dec 2015 11:33:48 +0000 + +pkg-kde-tools (0.15.20) unstable; urgency=medium + + * Team upload. + + [ Dmitry Shachnev ] + * Minor fixes to pkgkde-mark-private-symbols.1 manpage. + * Add a new script (pkgkde-mark-qt5-private-symbols) which is a replacement + for the old script (pkgkde-mark-private-symbols) that works with Qt ≥ 5.6. + - Add dependency on python3:any for this script. + - Write the manual page for this script. + * Drop obsolete debian/source/options file. We do not want to force bzip2 + compression now that xz is the dpkg default. + + [ Maximiliano Curia ] + * Drop stale copy of Dpkg/Shlibs (2010-02-21), and use the ones from + libdpkg-perl instead. + - Drop the find_datalibdir and setup_datalibdir functions and the + DATALIBDIR global variable. + - Adapt pkgkde-gensymbols and pkgkde-symbolshelper accordingly. + + -- Dmitry Shachnev Tue, 29 Dec 2015 18:44:43 +0300 + +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 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 Fri, 14 Aug 2015 19:10:10 +0200 + +pkg-kde-tools (0.15.18ubuntu2) wily; urgency=medium + + * Restore adjustment to linitan.mk such that it doesn't fail on binary only + builds on account of not finding a dsc + + -- Harald Sitter Tue, 01 Sep 2015 13:20:08 +0200 + +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 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 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 + + Since 99% of armhf PPA builds (that is excluding those from Canonical) + are run via qemu-arm and qemu-arm doesn't manage to run any of the + frameworks tests without segfaulting (either due to Qt or ctest, it's + not clear) almost all test runs would fail all the time because of qemu. + Since we cannot explicitly check if we are run through qemu-arm we'll + instead simply disable auto_test for this entire use case which should + be good enough for the time being anyway. + Reviewed by Jonathan... + + -- Harald Sitter Mon, 01 Jun 2015 17:48:20 +0200 + +pkg-kde-tools (0.15.17ubuntu1) wily; urgency=medium + + * Merge with Debian, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - Add l10n scripts in kubuntu/ + - Add kubuntu_l10n.pm sequence for Debhelper + - Require kubuntu_l10n sequence in {kf5,kde}.pm sequence + - debian/pkg-kde-tools.install: install kubuntu/ files + - qt-kde-team/{1,2,3}/policy.mk: remove maintainer checking + - Add qt-kde-team/{2,3}/lintian.mk and call it after the binary target in + qt-kde-team/{2,3}/debian-qt-kde.mk + + -- Harald Sitter Fri, 15 May 2015 17:04:16 +0200 + +pkg-kde-tools (0.15.17) unstable; urgency=medium + + [ Diane Trout ] + * Add man pages for pkgkde-gensymbols and pkgkde-symbolshelper + (Closes: #782866). + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Add pkgkde-mark-private-symbols to avoid shipping the script on every + Qt5 package. + * Release to unstable. + + -- Lisandro Damián Nicanor Pérez Meyer Wed, 13 May 2015 09:40:11 -0300 + +pkg-kde-tools (0.15.16ubuntu2) vivid; urgency=medium + + * Remove debian/KUBUNTU-BZR-WORKFLOW - we are moving to git.debian with + our delta + * Bring back kubuntu_l10n dh sequence. + - This sequence was lost in the kf5 port. + - It is by default pulled into the kf5 and kde sequence as well. + - The logic itself is noop unless previously established l10n + requirements are met. + * Apply 'remove maintainer checking' to qt-kde-team/3/policy.mk + * Update syncl10n target and settings for kf5, refresh. + + preparetips is no longer being pulled in. As far as our uses go + it is an optional utility and since we do not use tips in our + applications it is useless for us. Supposedly it was a left over from + when all kde apps were imported into launchpad. + + we are intentionally using the kf5 tools across both kde4libs and kf5 + software because I am lazy. Potentially incomplete message extraction is + still better than no message extraction... + * New list of remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - Add l10n scripts in kubuntu/ + - Add kubuntu_l10n.pm sequence for Debhelper + - Require kubuntu_l10n sequence in {kf5,kde}.pm sequence + - debian/pkg-kde-tools.install: install kubuntu/ files + - qt-kde-team/{1,2,3}/policy.mk: remove maintainer checking + - qt-kde-team/{2,3}/debian-qt-kde.mk: run list-missing after the binary target + - qt-kde-team/{2,3}/list-missing.mk: print marker before and after list-missing + output for script parsing + - Add qt-kde-team/{2,3}/lintian.mk and call it in qt-kde-team/{2,3}/debian-qt-kde.mk + + -- Harald Sitter Mon, 16 Feb 2015 10:12:07 +0100 + +pkg-kde-tools (0.15.16ubuntu1) vivid; urgency=medium + + * Merge with Debian experimental, 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/pkg-kde-tools.install: install kubuntu/ files + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - qt-kde-team/{2,3}/debian-qt-kde.mk: run list-missing after the binary target + - qt-kde-team/{2,3}/list-missing.mk: print marker before and after list-missing + output for script parsing + - Add qt-kde-team/{2,3}/lintian.mk and call it in qt-kde-team/{2,3}/debian-qt-kde.mk + + -- Dmitry Shachnev Tue, 27 Jan 2015 14:20:34 +0300 + +pkg-kde-tools (0.15.16) experimental; urgency=medium + + [ Rohan Garg ] + * Add new sequence helpers for KDE Frameowrks 5 + * Drop useless code from KDE Frameworks time + * Use the KF5 sequence helper + * Fix sillyness + * Fix sequence to use KF5 instead of KDE4 + * More misc. fixes for the KF5 sequence + * meinproc4 is no more in KF5 land, all hail meinproc5 + * Nuke auto_configure duplication, doesn't make sense since we source the KF5 sequence + * Remove useless pkg-kde-tools.kdev4 file + * Make sure we don't link to libkdeinit5_ explicitly + * Make sure ECM_MKSPECS_INSTALL_DIR is also passed + * Add proper marker while passing ECM_MKSPECS_INSTALL_DIR + * Use KDE_INSTALL_USE_QT_SYS_PATHS to do the right thing automatically. and drop useless calls. + * dpkg_architecture_value isn't used, remove + + [ Maximiliano Curia ] + * Bump Standards-Version to 3.9.6, no changes needed + + -- Maximiliano Curia Tue, 20 Jan 2015 13:24:21 +0100 + +pkg-kde-tools (0.15.15ubuntu1) utopic; urgency=medium + + * Merge with debian, remaining changes: + - Add kf5 debhelper module for KDE Frameworks 5 (perllib/Debian/Debhelper/*/kf5.pm) + - Add scripts to build KDE Frameworks 5 & Plasma 5 (qt-kde-team/3/*) + - 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 + - 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 + + -- Rohan Garg Tue, 02 Sep 2014 16:00:34 +0200 + +pkg-kde-tools (0.15.15) unstable; urgency=medium + + * The fix for #744173 required to convert non-anchored regexps to anchored + ones. The problem with this is that kfreebsd-amd64 was no longer matched. + Fix it by adding kfreebsd-amd64 in the lists where amd64 appears, as + they both share the same sizes (Closes: #754765). + + -- Lisandro Damián Nicanor Pérez Meyer Sun, 13 Jul 2014 23:21:12 -0300 + +pkg-kde-tools (0.15.14ubuntu2) utopic; urgency=medium + + * Drop xz.pm and lzma.pm, dpkg >= 1.17.0 has xz compression by default + + -- Rohan Garg Tue, 27 May 2014 12:36:58 +0200 + +pkg-kde-tools (0.15.14ubuntu1) utopic; urgency=medium + + * Merge with Debian git, 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 + + -- Rohan Garg Thu, 08 May 2014 12:29:28 +0200 + +pkg-kde-tools (0.15.14) unstable; urgency=medium + + [ William Grant ] + * perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm: + - Anchor architecture matches to the ends of the string, to avoid + erroneously mapping qreal to float on arm64. + - Add arm64 and ppc64el to the 64-bit matches (Closes: #744173). + + [ Helmut Grohne ] + * Mark binary pkg-kde-tools as M-A:foreign. (Closes: #751338). + + -- Lisandro Damián Nicanor Pérez Meyer Sat, 12 Jul 2014 15:45:14 -0300 + +pkg-kde-tools (0.15.13) unstable; urgency=medium + + [ Maximiliano Curia ] + * Fix "Useless use of \E at" warning in dhmk.pl. + * Bump Standards-Version to 3.9.5, no further changes needed. + + [ Pino Toscano ] + * debcontrol2cmake.pl: filter out binary packages not belonging to the build + architecture. + + -- Maximiliano Curia Sun, 23 Feb 2014 12:02:28 +0100 + +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 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 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 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 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 Wed, 02 Oct 2013 17:34:04 -0300 + +pkg-kde-tools (0.15.8ubuntu2) saucy; urgency=low + + * perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm: + - Anchor architecture matches to the ends of the string, to avoid + erroneously mapping qreal to float on arm64. + - Add arm64 and ppc64el to the 64-bit matches. + + -- William Grant Sun, 13 Oct 2013 10:14:05 +1100 + +pkg-kde-tools (0.15.8ubuntu1) saucy; urgency=low + + * Merge from Debian unstable (LP: #1219695), 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 squences + - 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 + + -- Dmitry Shachnev Tue, 03 Sep 2013 10:48:47 +0400 + +pkg-kde-tools (0.15.8) unstable; urgency=low + + * Team upload. + + [ Felix Geyer ] + * pkgkde-symbolshelper: Add intptr_t type substitution. + + [ Pino Toscano ] + * Fix Vcs-* headers. + + -- Lisandro Damián Nicanor Pérez Meyer Sun, 25 Aug 2013 20:01:30 -0300 + +pkg-kde-tools (0.15.7ubuntu4) saucy; urgency=low + + * Re-enable lintian but only recommend it + + -- Philip Muškovac Tue, 16 Jul 2013 18:07:15 +0200 + +pkg-kde-tools (0.15.7ubuntu3) saucy; urgency=low + + * Remove lintian dependency from pkg-kde-tools as it's too heavy and don't + run the lintian target in debian-qt-kde.mk + + -- Philip Muškovac Tue, 16 Jul 2013 18:04:45 +0200 + +pkg-kde-tools (0.15.7ubuntu2) saucy; urgency=low + + * qt-kde-team/*/debian-qt-kde.mk uses docbook-to-man, so depend on it + + -- Philip Muškovac Mon, 17 Jun 2013 20:14:37 +0200 + +pkg-kde-tools (0.15.7ubuntu1) saucy; 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 squences + - 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 + + -- Scott Kitterman Wed, 22 May 2013 18:37:26 -0400 + +pkg-kde-tools (0.15.7) unstable; urgency=low + + * pkgkde-vcs: replace support for lenny-backports with wheezy-backports. + + -- Modestas Vainius Mon, 20 May 2013 01:00:35 +0300 + +pkg-kde-tools (0.15.6) unstable; urgency=low + + * pkgkde-git: Update sanity check, allow git clones inside gited homes. + * Add myself to Uploaders. + * Bump debhelper buil-dep and compat to 9. + * Bump Standards-Version to 3.9.4, no further changes needed. + + -- Maximiliano Curia Fri, 10 May 2013 17:57:04 +0200 + +pkg-kde-tools (0.15.5-0ubuntu1) saucy; urgency=low + + * Merge with 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 squences + - 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 + * Remove incorrect Vcs lines in debian/control + + -- Jonathan Riddell Sun, 05 May 2013 09:29:28 +0100 + +pkg-kde-tools (0.15.5) experimental; urgency=low + + * dh_sameversiondep: do not fail on dependencies which have versions from + multiple architectures installed. Thanks to Cyril Brulebois for the initial + patch. (Closes: #676833) + + -- Modestas Vainius Sun, 14 Apr 2013 20:25:23 +0300 + +pkg-kde-tools (0.15.4) experimental; urgency=low + + [ José Manuel Santamaría Lema ] + * Filter out -dbg packages from ${allLibraries} variables. + + [ Sune Vuorela ] + * Update my email address + + -- Sune Vuorela Tue, 02 Apr 2013 21:58:46 +0000 + +pkg-kde-tools (0.15.3ubuntu8) raring; urgency=low + + * In extract-messages.sh don't include .pc directories from quilt + + -- Jonathan Riddell Thu, 28 Mar 2013 16:28:23 +0000 + +pkg-kde-tools (0.15.3ubuntu7) raring; urgency=low + + * Add python as dep of pkg-kde-tools. + upstream's msgsplit script for l10n uses python + + -- Harald Sitter Mon, 18 Mar 2013 13:50:06 +0100 + +pkg-kde-tools (0.15.3ubuntu6) raring; urgency=low + + * Add envrionment variables to dh_kubuntu_l10n_* for use in the package + kubuntu-patched-l10n which processes other packages so it needs to force + a check regardless of any preconditions the scripts would usually expect. + - KUBUNTU_L10N_FORCE_RUN - Forces a run of the pot creation. + - KUBUNTU_L10N_NO_DESKTOP - Skips desktop file portion. + Desktop file changes are not supported through kubuntu-patched-l10n so + processing them could lead to unintended results. + * If preconditions are met, create the sources on all architectures. + Otherwise we can run into funny results when a desktop file is in an + arch: any package and then ends up without ubuntu domain key on amd64. + + -- Harald Sitter Wed, 13 Mar 2013 14:49:03 +0100 + +pkg-kde-tools (0.15.3ubuntu5) raring; urgency=low + + * dhmk related l10n fixes. dhmk expects sequence introduced binarys to be + a name rather than a path, in particular making it a path will make dhmk + fall over its on stupidity and fail to generate pseudo-targets thus causing + FTBFS + * Rename kubuntu-debhelper-*.sh to dh_kubuntu_l10n_* + * Restructure kubuntu/ dir to contain subdirectories bin/ and lib/ + + Change .install to install bin/* to usr/bin and lib/* to usr/lib/kubuntu-l10n + + Scripts from upstream are now in lib/libexec (due to their rather random + names they ought not be in usr/bin) + + dh_kubuntu scripts add libexec to their PATH to pick up the upstream + tooling + * Remove kubuntu.mk used in dhmk1 and cdbs. Those build systems are now + unsupported as far as l10n goes. All packages that want l10n need to use + either dhmk2 or the debhelper kde sequence or the debhelper kubuntu-l10n + sequence. + + -- Harald Sitter Tue, 12 Mar 2013 13:22:15 +0100 + +pkg-kde-tools (0.15.3ubuntu4) raring; urgency=low + + * Re-add createdesktopcontext.pl to sync (needed for Kubuntu specific stuff + to build a pot of desktop files). + * Include kubuntu/debhelper/finddesktopfiles.sh which is a simpler version + of the previously used findfiles from upstream. In particular it only + runs a find for all known desktopfile-like file endings and writes + those to a file to be picked bup createdesktopcontext.pl later. + * Convert kdesdk-script sync to use git (recently moved there) + * Make git based sync use proper git with a shallow single-branch clone of + the respective release tag (as fast as possible, also as reliable as + possible). + * Drop sync note about findfiles script which is no longer present + * Drop the SVNREV variable in rules as we either sync from a git tag or + SVN's stable branch now. + * Set path in i18n scripts to avoid having to define the absolute path + (resolving the absolute path of $script and using that would be even + neater). + * Abort langpack helper execution iff not building for archive or it was + not explicitly enabled. Previously it would not build when not building + for archive or not targetting main. As now most of Kubuntu is in universe + and we do not use launchpad for upstream software all packages that need + launchpad translations need to explicitly opt-in by adding + 'X-Ubuntu-Use-Langpack: yes' to their control file. Since mangling for + Kubuntu only makes sense in an archive context this restriction remains. + * Drop auto-l10n from kde dh buildsystem and move it to the sequence instead. + * Sync l10n scripts from upstream. + + -- Harald Sitter Mon, 11 Mar 2013 19:44:11 +0100 + +pkg-kde-tools (0.15.3ubuntu3) raring; urgency=low + + * qt-kde-team/2/lintian.mk: Generate a temporary .changes file for the + lintian check as the final one is generated later. + + -- Philip Muškovac Thu, 28 Feb 2013 14:13:44 +0100 + +pkg-kde-tools (0.15.3ubuntu2) raring; urgency=low + + * Add support to show lintian warnings during build: + - debian/control: Add dependency on lintian + - qt-kde-team/2/debian-qt-kde.mk: run lintian after the binary target + - qt-kde-team/2/lintian.mk: print lintian output with markers to make + script parsing easier. + + -- Philip Muškovac Sat, 02 Feb 2013 14:25:42 +0100 + +pkg-kde-tools (0.15.3ubuntu1) raring; urgency=low + + * Merge with Debian unstable, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - debian/install: install kubuntu/ files + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress + packages with LZMA + - add perlib/Debian/Debhelper/lzma.pm and xz.pm + - perlib/Debian/Debhelper/kde.pm: include xz squences + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install + for i18n + - 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 + * Remove incorrect Vcs lines in debian/control + + -- Jonathan Riddell Thu, 15 Nov 2012 15:57:25 +0000 + +pkg-kde-tools (0.15.3) unstable; urgency=low + + * Reupload without cruft. + + -- Modestas Vainius Wed, 22 Aug 2012 22:52:24 +0300 + +pkg-kde-tools (0.15.2ubuntu1) quantal; urgency=low + + * Merge with Debian unstable, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - debian/install: install kubuntu/ files + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress + packages with LZMA + - add perlib/Debian/Debhelper/lzma.pm and xz.pm + - perlib/Debian/Debhelper/kde.pm: include xz squences + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install + for i18n + * qt-kde-team/2/debian-qt-kde.mk: don't pass -Zxz to dh_builddeb as we + already do that in the kde debhelper addon + * 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 + + -- Felix Geyer Sat, 11 Aug 2012 17:52:53 +0200 + +pkg-kde-tools (0.15.2) unstable; urgency=low + + * Enable xz compression for Debian Qt/KDE team packages by default. + (Closes: #657243) Thanks to Ansgar Burchardt for the patch. + + -- Modestas Vainius Mon, 06 Aug 2012 01:58:43 +0300 + +pkg-kde-tools (0.15.1) unstable; urgency=low + + * Team upload. + + [ Pino Toscano ] + * Extend the workaround for cmake bug #653916 also to CFLAGS. + + [ Modestas Vainius ] + * pkgkde-getbuildlogs: support gzip Content-Encoding. + + -- Modestas Vainius Sat, 30 Jun 2012 13:56:16 +0300 + +pkg-kde-tools (0.15.0ubuntu1) quantal; urgency=low + + * Merge with Debian unstable, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - debian/install: install kubuntu/ files + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress + packages with LZMA + - add perlib/Debian/Debhelper/lzma.pm + - perlib/Debian/Debhelper/kde.pm: include lzma squences + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install + for i18n + * Add "xz" debhelper addons that compresses packages using the XZ algorithm. + * Make the kde debhelper addon use xz instad of lzma. + * Enable xz compression on all architectures. + + -- Felix Geyer Fri, 08 Jun 2012 12:49:58 +0200 + +pkg-kde-tools (0.15.0) unstable; urgency=low + + * Team upload. + + [ Modestas Vainius ] + * Bump Standards-Version to 3.9.3: no changes needed. + * Install pkgkde-git as an alias for pkgkde-vcs with VCS type forced to git. + * Implement pkgkde-git clone and update-config subcommands. + * Make variables.mk respect LDFLAGS from environment. Thanks to Simon + Ruderich for the patch. (Closes: #669183) + * pkgkde-symbolshelper: output covariant return trunks with c++ tag since the + symbol name contains an arch-specific offset. (Closes: #657806) + + [ José Manuel Santamaría Lema ] + * Add a workaround for cmake bug #653916 (cmake ignores CPPFLAGS) in + qt-kde-team/2/dhmk.mk. + + -- Modestas Vainius Sat, 02 Jun 2012 21:45:25 +0300 + +pkg-kde-tools (0.14.4) unstable; urgency=low + + * Team upload. + + [ Pino Toscano ] + * pkgkde-symbolshelper: fix the size_t, ssize_t, int64_t, uint64_t, + qptrdiff, quintptr expansions on sparc64 and ppc64. (Closes: #656380) + + -- Modestas Vainius Mon, 21 May 2012 19:36:08 +0300 + +pkg-kde-tools (0.14.3ubuntu1) quantal; urgency=low + + * Merge with Debian git snapshot, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/install: install kubuntu/ files + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress + packages with LZMA + - add perlib/Debian/Debhelper/lzma.pm + - perlib/Debian/Debhelper/kde.pm: include lzma squences + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install + for i18n + * debian/rules: add rules to sync l10n + * Run syncl10n. + * Drop code that sets KUBUNTU_DESKTOP_POT which isn't used anymore. + + -- Felix Geyer Mon, 30 Apr 2012 19:18:02 +0200 + +pkg-kde-tools (0.14.3) unstable; urgency=low + + [ Modestas Vainius ] + * SymbolFileCollection.pm: import Dpkg::Arch::debarch_is into proper package. + + [ José Manuel Santamaría Lema ] + * Add check-not-installed target. + + [ Pino Toscano ] + * pkgkde-symbolshelper: fix the int64_t and uint64_t expansions on s390x. + + -- Modestas Vainius Mon, 26 Dec 2011 13:03:43 +0200 + +pkg-kde-tools (0.14.2ubuntu5) precise; urgency=low + + * Update kubuntu-debhelper-langpack-generate.sh to not fail when no + .pot files are generated + + -- Jonathan Riddell Thu, 12 Apr 2012 09:42:28 +0100 + +pkg-kde-tools (0.14.2ubuntu4) precise; urgency=low + + * In kubuntu-debhelper-langpack-clean.sh fix syntax on variable name + + -- Jonathan Riddell Wed, 11 Apr 2012 14:44:08 +0100 + +pkg-kde-tools (0.14.2ubuntu3) precise; urgency=low + + * Add calls to kubuntu i18n scripts back to + perllib/Debian/Debhelper/Buildsystem/kde.pm, makefiles/1/cdbs/kde.mk and qt-kde-team/1/debian-qt-kde.mk, + needed for .pot generation + * Add back kubuntu.mk, debhelper/kubuntu.mk and debhelper/ scripts to to .pot generation + * Add to pkg-kde-tools.install + + -- Jonathan Riddell Wed, 11 Apr 2012 13:50:01 +0100 + +pkg-kde-tools (0.14.2ubuntu2) precise; urgency=low + + * Mark pkg-kde-tools Multi-Arch: foreign. + + -- Steve Langasek Tue, 08 Nov 2011 10:27:37 -0800 + +pkg-kde-tools (0.14.2ubuntu1) precise; urgency=low + + * Merge with Debian unstable, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/install: install kubuntu/ files + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + compress packages with LZMA + - add perlib/Debian/Debhelper/lzma.pm + - perlib/Debian/Debhelper/kde.pm: include lzma squences + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm: + add ppc64 support + + -- Felix Geyer Sat, 15 Oct 2011 15:18:25 +0200 + +pkg-kde-tools (0.14.2) unstable; urgency=low + + * Export buildflags in dhmk.mk. + + -- Modestas Vainius Mon, 18 Jul 2011 22:55:25 +0300 + +pkg-kde-tools (0.14.1ubuntu2) oneiric; urgency=low + + * Stop stripping translations from desktop files as per discussion on + kubuntu-devel mailing list. + - Keep desktop-template-list for compatibility with current kde-l10n + packages. + - Keep /usr/bin scripts for now. We should look into moving them back to + kdesdk-scripts next cycle. + + -- Felix Geyer Wed, 14 Sep 2011 21:22:09 +0200 + +pkg-kde-tools (0.14.1ubuntu1) oneiric; urgency=low + + * Merge with Debian unstable, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - debian/install: install kubuntu/ files + - debian/control: add python to build-dependencies + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress + packages with LZMA + - perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install + for i18n + - add perlib/Debian/Debhelper/lzma.pm + - perlib/Debian/Debhelper/kde.pm: include lzma squences + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm: + add ppc64 support + * Run syncl10n and merge findfiles from KDE 4.7. + * Clean package after running syncl10n. + + -- Felix Geyer Wed, 13 Jul 2011 13:31:44 +0200 + +pkg-kde-tools (0.14.1) unstable; urgency=low + + * pkgkde-symbolshelper: no longer replace substs in the symbol name unless + the symbol is tagged with a 'subst' tag. This was kept for compatibility + with << 0.6 symbol files. + * Drop overriden_command alias from dhmk.mk. Most packages should have + already been transitioned to correct spelling. + * pkgkde-symbolshelper: drop VirtTable subst which was deprecated long ago. + + -- Modestas Vainius Thu, 23 Jun 2011 11:17:39 +0300 + +pkg-kde-tools (0.14.0ubuntu2) oneiric; urgency=low + + * When processing .desktop files add the X-Ubuntu-Gettext-Domain key to the + [Desktop Entry] group instead of always appending it to the end of the + file. (LP: #794320) + + -- Felix Geyer Sat, 11 Jun 2011 01:03:07 +0200 + +pkg-kde-tools (0.14.0ubuntu1) oneiric; urgency=low + + * Merge with Debian unstable, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - debian/install: install kubuntu/ files + - debian/control: add python to build-dependencies + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress + packages with LZMA + - perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install + for i18n + - add perlib/Debian/Debhelper/lzma.pm + - perlib/Debian/Debhelper/kde.pm: include lzma squences + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - perllib/Debian/PkgKde/SymbolsHelper/Substs/{TypeSubst,VirtTable}.pm: + add ppc64 support + + -- Felix Geyer Fri, 27 May 2011 18:32:24 +0200 + +pkg-kde-tools (0.14.0) unstable; urgency=low + + * Do not use Debian "branded" names in DLRestrictions (like e.g. + debian_dlrestrictions special symbol). + * pkgkde-symbolshelper: expand qreal subst to float on sh4. (Closes: #627486) + * DLRestrictions: hide dlr_are_symbol_objects_compatible() symbol. + * DLRestrictions: rework and cleanup error functions. Export new APIs. + * DLRestrictions: improve library compatibility checking APIs and export more + functions. + * Add symbol file for libdlrestrictions1. + * Version libdlrestrictions.so.1 symbols (--default-symver). + * Do a basic DLRestrictions test at build time. + * Improve DLRestrictions performance and fix a couple of bugs. + + -- Modestas Vainius Thu, 26 May 2011 00:25:41 +0300 + +pkg-kde-tools (0.13.1) experimental; urgency=low + + * Fix sections libdlrestrictions1 and libdlrestrictions-dev (libs and + libdevel respectively). + * Bump Standards-Version to 3.9.2: no changes needed. + * Relicense DLRestrictions under less troublesome LGPLv2.1. + * While installing, preserve source permissions of files in cmake, makefiles, + qt-kde-team and some other directories. This solves unexecutable scripts + problem. + + -- Modestas Vainius Tue, 24 May 2011 12:28:48 +0300 + +pkg-kde-tools (0.13.0) experimental; urgency=low + + * pkgkde-vcs tag: allow 'stable' in the changelog distribution field. + * Implement CMake based build system for the package. + * Add DLRestrictions library. Check descriptions of new binary packages + (namely libdlrestrictions1 and libdlrestrictions-dev) for more information. + * Beginings of unit test implementation for the DLRestrictions library. They + do not work yet though. + * Ship verbatim texts of the GPL-3 (COPYING.GPL-3), GPL-2 (COPYING.GPL-2) and + LGPL-3 (COPYING.LGPL-3) licenses in the source package. + * Bump packaging copyright years in debian/copyright. + + -- Modestas Vainius Tue, 24 May 2011 03:49:14 +0300 + +pkg-kde-tools (0.12.1ubuntu3) oneiric; urgency=low + + * Drop scour as it has proven to cause bugs (see #786192). + Packages that are known to work fine can still directly use the scour + sequence. + + -- Felix Geyer Thu, 26 May 2011 19:05:40 +0200 + +pkg-kde-tools (0.12.1ubuntu2) oneiric; urgency=low + + * Depend on python-rsvg and python-cairo so that dh_scour can do the + correctness test. + + -- Felix Geyer Sun, 08 May 2011 19:43:28 +0200 + +pkg-kde-tools (0.12.1ubuntu1) oneiric; urgency=low + + * Merge with Debian unstable, remaining changes: + - qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - debian/install: install kubuntu/ files + - debian/control: add python to build-dependencies + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress + packages with LZMA + - perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install + for i18n + - add perlib/Debian/Debhelper/lzma.pm + - perlib/Debian/Debhelper/kde.pm: include lzma and scour squences + + add python and python-scour to Depends + - qt-kde-team/{1,2}/policy.mk: remove maintainer checking + - perllib/Debian/PkgKde/SymbolsHelper/Substs/{TypeSubst,VirtTable}.pm: + add ppc64 support + * lzma.pm: Use dpkg_architecture_value() instead of relying on the + DEB_HOST_ARCH env variable. + + -- Felix Geyer Thu, 05 May 2011 16:18:06 +0200 + +pkg-kde-tools (0.12.1) unstable; urgency=low + + * pkgkde-getbuildlogs: fix fetching of last logs. + * pkgkde-getbuildlogs: assume logs are in UTF-8. Fixes perl warning. + + -- Modestas Vainius Mon, 02 May 2011 00:36:31 +0300 + +pkg-kde-tools (0.12.0) unstable; urgency=low + + * Implement and add DebianABIManager. Refer to + /usr/share/doc/pkg-kde-tools/README.DebianABIManager for more information. + * Since kdelibs5-dev 4.6.1, ENABLE_LIBKDEINIT_RUNPATH defaults to ON whenever + CMAKE_BUILD_TYPE is Debian. + * Fix a typo in qt-kde-team/2/library-packages.mk: makes + libpkgs_addsubst_allLibraries work. + * qt-kde-team/2/debian-qt-kde.mk: attach debian/stamp-man-pages properly. + dh_auto_build is executed when build* targets are run, not binary*. + * Rename 'overriden_command' to 'overridden_command' (which is correct + spelling). But keep 'overriden_command' as an alias for now. + * Switch debian/rules engine to home-grown dhmk. This might help to + detect regressions and might ease testing and development process. + * qt-kde-team/2/library-packages.mk: libpkgs_gen_strict_local_shlibs no + longer depends on the presence of the respective DEBIAN/*/shlibs. + * Fix dh examples in README.Debian to be dh compat=8 compatible. + + -- Modestas Vainius Wed, 27 Apr 2011 11:58:46 +0300 + +pkg-kde-tools (0.11.4) unstable; urgency=low + + * qt-kde-team/1: set old kde4 flags before including variables.mk hence some + hacks (like DEB_CONFIG_INSTALL_DIR stuff) will work as before. + (Closes: #618200) + + -- Modestas Vainius Fri, 25 Mar 2011 23:42:22 +0200 + +pkg-kde-tools (0.11.3) unstable; urgency=low + + * "Innocent" backtick in the echo statement causes packages to FTBFS. Fix it. + * Some tweaks to qt-kde-team/2/list-missing.mk. + + -- Modestas Vainius Sun, 13 Mar 2011 21:40:03 +0200 + +pkg-kde-tools (0.11.2) unstable; urgency=low + + * Add support for list-missing target to qt-kde-team/2/*. + * Minor language tweaks to the echos/comments in dhmk.mk. + + -- Modestas Vainius Sun, 13 Mar 2011 17:05:43 +0200 + +pkg-kde-tools (0.11.1) unstable; urgency=low + + * Move most of kde4_flags to qt-kde-team/1/debian-qt-kde.mk as absolute + majority of them are kde4libs specific anyway. This is done in order to + avoid cmake 2.8.4 warnings about unused variables and unnecessary + duplication of configuration. + + -- Modestas Vainius Fri, 11 Mar 2011 20:25:23 +0200 + +pkg-kde-tools (0.11.0) unstable; urgency=low + + * dhmk.mk: add a shortcut variable $(overriden_command) for getting full + original command line of the overriden command in the override targets. + * Some bug fixes and performance improvements for the whole qt-kde-team/2 + debian/rules build engine. + * It's highly recommended for qt-kde-team/2/debian-qt-kde.mk based packages + to build-depend on pkg-kde-tools 0.11 now. + + -- Modestas Vainius Fri, 11 Mar 2011 03:18:56 +0200 + +pkg-kde-tools (0.10.0) unstable; urgency=low + + * Implement a new build debian/rules build engine (dubbed dhmk) for Qt/KDE + team packages. See qt-kde-team/2/README for more information. + + -- Modestas Vainius Wed, 09 Mar 2011 15:44:39 +0200 + +pkg-kde-tools (0.9.5) unstable; urgency=low + + * Make pkgkde-getbuildlogs work with new infrastructure on + https://buildd.debian.org. + + -- Modestas Vainius Sun, 20 Feb 2011 19:23:20 +0200 + +pkg-kde-tools (0.9.4) unstable; urgency=low + + * Bump Standards-Verstion to 3.9.1: no changes needed. + * Fix "dpkg: * has bad syntax: invalid character in revision number" error + which debhelper kde buildsystem used to spit (it wasn't fatal though). + * Use perl API in place of dpkg --compare-versions (kde buildsystem). + * Add lintian override for "capitalization-error-in-description kde KDE". + + -- Modestas Vainius Sun, 20 Feb 2011 12:46:01 +0200 + +pkg-kde-tools (0.9.3ubuntu10) natty; urgency=low + + * Re-enable Scour as python-scour has dropped the problematic dependencies. + + -- Felix Geyer Sun, 20 Mar 2011 19:13:09 +0100 + +pkg-kde-tools (0.9.3ubuntu9) natty; urgency=low + + * Temporarily comment out Scour in perllib/Debian/Debhelper/Sequence/kde.pm + and drop python-scour from depends due to powerpc breakage + + -- Scott Kitterman Sat, 19 Mar 2011 17:32:23 -0400 + +pkg-kde-tools (0.9.3ubuntu8) natty; urgency=low + + * Revert last upload now that gcc4.5 is fixed + + -- Scott Kitterman Sun, 13 Mar 2011 11:52:16 -0400 + +pkg-kde-tools (0.9.3ubuntu7) natty; urgency=low + + * Force gcc-4.4 on ARM while we are waiting for a gcc-4.5 fix to segfault + in a Qt inline function, see #705689. + Respectively changed files: + - 1/debian-qt-kde.mk + - cdbs/kde.mk + - Sequence/lzma.pm + + -- Harald Sitter Thu, 03 Mar 2011 21:07:04 +0100 + +pkg-kde-tools (0.9.3ubuntu6) natty; urgency=low + + * Add ppc64 support. + + -- Colin Watson Wed, 16 Feb 2011 21:40:31 +0000 + +pkg-kde-tools (0.9.3ubuntu5) natty; urgency=low + + * Revert the last upload. -mimplicit-it=thumb on armel no longer works and + there will be a proper IT patch for qt4-x11 shortly + + -- Scott Kitterman Mon, 15 Nov 2010 09:12:55 -0500 + +pkg-kde-tools (0.9.3ubuntu4) natty; urgency=low + + * Add CXXFLAGS += -Wa,-mimplicit-it=thumb on armel to work around + lack of native Thumb2 support in qt4-x11 to qt-kde-team/1/debian-qt-kde.mk + and makefiles/1/cdbs/kde.mk + + -- Scott Kitterman Sat, 13 Nov 2010 17:11:01 -0500 + +pkg-kde-tools (0.9.3ubuntu3) natty; urgency=low + + * Add depends on python-scour + + -- Jonathan Riddell Sat, 06 Nov 2010 13:42:46 +0000 + +pkg-kde-tools (0.9.3ubuntu2) natty; urgency=low + + * In kde.pm run with scour Debhelper + + -- Jonathan Riddell Fri, 05 Nov 2010 16:28:20 +0000 + +pkg-kde-tools (0.9.3ubuntu1) natty; urgency=low + + * Merge with Debian unstable, remaining changes: + - datalib/kde4_flags: distribution text = "Kubuntu packages" + - debian/rules: add rules to sync l10n + - debian/install: install kubuntu/ files + - debian/control: add python to build-dependencies + - makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk: + add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress + packages with LZMA + - perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install + for i18n + - add perlib/Debian/Debhelper/lzma.pm + - perlib/Debian/Debhelper/kde.pm: + add require Debian::Debhelper::Sequence::lzma + - qt-kde-team/1/policy.mk: remove maintainer checking + + -- Alessandro Ghersi Fri, 15 Oct 2010 01:51:17 +0200 + +pkg-kde-tools (0.9.3) unstable; urgency=low + + * Use a new tag message style in `pkgkde-vcs tag`: + ; urgency= + + -- Modestas Vainius Sun, 25 Jul 2010 02:02:54 +0300 + +pkg-kde-tools (0.9.2ubuntu15) maverick; urgency=low + + * qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when + maintainer is not Debian qt-kde team + + -- Alessandro Ghersi Sun, 12 Sep 2010 21:58:12 +0200 + +pkg-kde-tools (0.9.2ubuntu14) maverick; urgency=low + + * Revert -u to -- change from previous uploaded. + Caues issues with arguments to dpkg-deb somehow. + + -- Harald Sitter Tue, 17 Aug 2010 01:02:50 +0200 + +pkg-kde-tools (0.9.2ubuntu13) maverick; urgency=low + + * Prevent tests from failing by using require instead of use, since use + invokes require inside a block there is a bit of a scope mess it seems + * Update lzma.pm to attach -- -Zlzma rather than -u -Zlzma to dh_builddeb, + -u is considered deprecate + + -- Harald Sitter Mon, 16 Aug 2010 20:20:37 +0200 + +pkg-kde-tools (0.9.2ubuntu12) maverick; urgency=low + + * Add lzma sequence to debhelper + + This enables Qt-only packages to simply build with "--with lzma" if + they use dh + * Use that new sequence in the KDE one + + -- Harald Sitter Mon, 16 Aug 2010 17:02:58 +0200 + +pkg-kde-tools (0.9.2ubuntu11) maverick; urgency=low + + * In both kubuntu.mk files set KUBUNTU_DESKTOP_POT at makefile scope to + avoid running into shell scope issues causing desktop_.pot files. + * Set DEB_BUILD_ARCH manually in the CDBS kubuntu.mk too to ensure that it + is set when the pot hook gets executed. + + -- Harald Sitter Wed, 04 Aug 2010 16:24:30 +0200 + +pkg-kde-tools (0.9.2ubuntu10) maverick; urgency=low + + * Update the README.l10n with information about syncl10n and the fact that + there is a need to sync with KDE every once in a while. + * Add descriptions to the variables in debian/rules to make it more obvious + what to do. + * Syncl10n + merge findfiles (with a no-change for us but necessary to keep + the relation to KDE's file more obvious) + + -- Harald Sitter Sun, 01 Aug 2010 14:04:22 +0200 + +pkg-kde-tools (0.9.2ubuntu9) maverick; urgency=low + + * Trying to repair the logic of the l10n restriction to i386. + The gettext domain does still needs to be added and removed, regardless + of the architecture, but the actual template creation only ought to + happen on i386. + Due to increasingly more complex code this is indeed likely to break things + OTOH the restriction as seen in ubuntu7&8 are breaking translations on + everything but i386. + + -- Harald Sitter Fri, 30 Jul 2010 22:03:10 +0200 + +pkg-kde-tools (0.9.2ubuntu8) maverick; urgency=low + + * Slightly adjust the syntax for DEB_NO_COMPRESSION to avoid warnings. + + -- Harald Sitter Fri, 30 Jul 2010 11:53:49 +0200 + +pkg-kde-tools (0.9.2ubuntu7) maverick; urgency=low + + * Restrict l10n to i386 - This is the final stage, l10n magic will only + happen for proper archive builds targetting main or restricted on i386. + * Add support for DEB_NO_COMPRESSION, in combiniation with DEB_NO_LZMA + this enables builds without any deb compression whatsoever. + (Note: former only works if latter is also set to 1!) + + -- Harald Sitter Fri, 30 Jul 2010 00:09:15 +0200 + +pkg-kde-tools (0.9.2ubuntu6) maverick; urgency=low + + * Add kdevelop to kubuntu/desktop-template-list + + -- Jonathan Riddell Mon, 26 Jul 2010 18:23:51 +0100 + +pkg-kde-tools (0.9.2ubuntu5) maverick; urgency=low + + * Add choqok in desktop-template-list + * Add rekonq in desktop-template-list + + -- Jonathan Riddell Mon, 26 Jul 2010 18:07:37 +0100 + +pkg-kde-tools (0.9.2ubuntu4) maverick; urgency=low + + * Fix kubuntu-debhelper-langpack-clean.sh, remove excessive dollar + sign + + -- Jonathan Riddell Mon, 26 Jul 2010 17:41:06 +0100 + +pkg-kde-tools (0.9.2ubuntu3) maverick; urgency=low + + * Add kubuntu/README.l10n explaining when l10n is built and when not. + * Fix l10n for dh7 builds, as broken in the previous upload + * Enhance l10n restrictions to main|restricted builds + + -- Harald Sitter Tue, 13 Jul 2010 20:49:54 +0200 + +pkg-kde-tools (0.9.2ubuntu2) maverick; urgency=low + + * Only set the Ubuntu-Gettext when we do a build for the regular Ubuntu + archives. This is determined by looking for /CurrentlyBuilding as created + by the buildd's. Only if this file contains Purpose: Primary the domains + will be set appropriately. Please note that no POT creation will happen + if this check fails. + + -- Harald Sitter Tue, 22 Jun 2010 20:42:24 +0200 + +pkg-kde-tools (0.9.2ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining changes: + - Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" + - Add kubuntu/ files and edit debian/install + - debian-qt-kde.mk: include kubuntu.mk + - debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - cdbs/kde.mk: include kubuntu.mk + - cdbs/kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when + maintainer is not Debian qt-kde team + - Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call + them in kde.pm for .pot generation in pure Debhelper 7 packages + - Add python in dependencies + + -- Alessandro Ghersi Sat, 19 Jun 2010 02:08:52 +0200 + +pkg-kde-tools (0.9.2) unstable; urgency=medium + + * Add libdpkg-perl (>= 1.15.6~) to Build-Depends. Needed for symbolshelper + syntax checks. + * Add support for DEB_KDE_LINK_WITH_NO_UNDEFINED (defaults to + DEB_KDE_LINK_WITH_AS_NEEDED value) to variables.mk. + + -- Modestas Vainius Sat, 12 Jun 2010 11:30:50 +0300 + +pkg-kde-tools (0.9.1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining changes: + - Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" + - Add kubuntu/ files and edit debian/install + - debian-qt-kde.mk: include kubuntu.mk + - debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - cdbs/kde.mk: include kubuntu.mk + - cdbs/kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when + maintainer is not Debian qt-kde team + - Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call + them in kde.pm for .pot generation in pure Debhelper 7 packages + - Add python in dependencies + - Add libdpkg-perl (>= 1.15.6~) in build-depends to pass tests + + -- Alessandro Ghersi Fri, 04 Jun 2010 04:40:14 +0200 + +pkg-kde-tools (0.9.1) unstable; urgency=low + + * pkgkde-getbuildlogs: load HTTP::Request & friends in the INIT block in + order to pass syntax check without libwww-perl installed (Closes: #584375). + + -- Modestas Vainius Fri, 04 Jun 2010 01:04:28 +0300 + +pkg-kde-tools (0.9.0) unstable; urgency=low + + * Drop deprecated `pkgkde-symbolshelper symbolfile` support from + cdbs/symbolshelper.mk. + * qt-kde-team/1/debian-qt-kde.mk: enable quilt patchsystem only if + quilt is in Build-Depends. This adds support for 3.0 (quilt) source format. + * Switch HTML_INSTALL_DIR from /usr/share/doc/kde4/HTML to + /usr/share/doc/kde/HTML, add NEWS entry about this important change which + may trigger FTBFSes in the third party packages. + * debian-qt-kde.mk: replace usr/share/doc/kde4 references with + usr/share/doc/kde. + + -- Modestas Vainius Tue, 01 Jun 2010 01:05:57 +0300 + +pkg-kde-tools (0.8.0ubuntu2) maverick; urgency=low + + * Use the new dpkg-perl api in dh_sameversiondep as the required dpkg + version is in the archive. + * Add libwww-perl to build-deps and re-enable the tests. + * Add python to the dependencies as it is required by the msgsplit script. + * Add shebang line to kubuntu-debhelper-langpack-generate.sh and + kubuntu-debhelper-langpack-clean.sh. + * Remove executable flags from all files that don't need it. + + -- Felix Geyer Sat, 22 May 2010 17:06:39 +0200 + +pkg-kde-tools (0.8.0ubuntu1) maverick; urgency=low + + * Merge with Debian unstable remaining changes: + - Use /usr/share/doc/kde/HTML for docs + - Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" + - Add kubuntu/ files and edit debian/install + - debian-qt-kde.mk: include kubuntu.mk + - debian-qt-kde.mk: include quilt only if there are patches + - debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - cdbs/kde.mk: include kubuntu.mk + - cdbs/kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when + maintainer is not Debian qt-kde team + - Change docs path to /usr/share/doc/kde/ not /usr/share/doc/kde4/ in + debian-qt-kde.mk rules + - Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call + them in kde.pm for .pot generation in pure Debhelper 7 packages + - Disable tests as a temporary workaround against FTBFS + * Use old dpkg-perl api for dh_sameversiondep since we don't have a newer + dpkg yet. Once it's uploaded this delta should be instantly dropped. + * Bump down the dpkg build-depends and breaks versions fof the above. + + -- Jonathan Thomas Sat, 15 May 2010 15:05:32 -0400 + +pkg-kde-tools (0.8.0) unstable; urgency=low + + * pkgkde-symbolshelper: disable symbol file backups by default. + * pkgkde-symbolshelper: do not bump symbol minimum version when the only + change made is detection of substs in the original symbol. + * Add run-local wrapper for easy execution of scripts directly from the + source package. + * Add support for perl tests under t/*.t subdirectory to Makefile. + * Add t/perl_syntax_check.t for checking syntax of the perl scripts in + the package. + * pkgkde-symbolshelper: drop symbolfile and postgensymbols subcommands + that were deprecated long ago. + * Bump major version number due to removal of deprecated options (and + possible introduction of FTBFSes for packages which still use them). + + -- Modestas Vainius Fri, 14 May 2010 23:13:52 +0300 + +pkg-kde-tools (0.7.3) unstable; urgency=low + + * pkgkde-gensymbols: add vim modeline. + * pkgkde-gensymbols: no longer check dpkg version. It is 1) pointless now + as pkg-kde-tools depends on the appropriate libdpkg-perl version and 2) + the check is inaccurate for our needs as it checks the version of the dpkg + binary rather than dpkg-dev package. + + -- Modestas Vainius Thu, 29 Apr 2010 00:03:14 +0300 + +pkg-kde-tools (0.7.2) unstable; urgency=low + + * pkgkde-gensymbols: exclude self when looking for dpkg-gensymbols in PATH. + This should fix endless loop when do()ing system dpkg-gensymbols. + + -- Modestas Vainius Fri, 23 Apr 2010 00:09:52 +0300 + +pkg-kde-tools (0.7.1) unstable; urgency=low + + * Remove workaround introduced in 0.7.0.1: no longer needed. + * pkgkde-symbolshelper: allow to specify confirmed arches for *patch. + * Depend on libdpkg-perl (>= 1.15.6~), recommend dpkg-dev of the same + version and break earlier dpkg-dev versions. + * No longer ship a backported dpkg-gensymbols.pl script. The one from + dpkg-dev (>= 1.15.6) is enough now. As a result, make appropriate changes + to pkgkde-gensymbols. + * Drop dpkg-dev 1.15.4 compatibility code from dh_sameversiondep. + * Make dh_sameversiondep work with libdpkg-perl (>= 1.15.6) (Dpkg::Substvars + API changed). Thanks to Roderich Schupp for the patch (Closes: #577056). + * No longer ship stable (v1.0) libdpkg-perl interfaces in pkg-kde-tools. + Therefore, rm -rf datalib/Dpkg/Compression* datalib/Dpkg/Interface. + + -- Modestas Vainius Thu, 22 Apr 2010 10:57:29 +0300 + +pkg-kde-tools (0.7.0.1) experimental; urgency=low + + * Remove perl from pkg-kde-tools Depends to workaround (and use to our own + advantage) brokeness in experimental buildds. + + -- Modestas Vainius Thu, 08 Apr 2010 13:41:29 +0300 + +pkg-kde-tools (0.7.0) unstable; urgency=low + + * `pkgkde-symbolshelper *`: properly handle the case when some substs have + been detected but symbols differences still remain (rare variant of + "possible incomplete subst detection"). libakonadi-kde4 in kdepimlibs was + hit by this bug. + * Add a new tool `pkgkde-getbuildlogs` that can be used to get + build logs from https://buildd.debian.org for the specified package. + * Move kde4_flags to /usr/share/pkg-kde-tools/lib subdir. + * `pkgkde-symbolshelper *patch`: properly assign version that was chosen in + the prompt. + * Completely drop makefiles/1/debhelper/kde.mk. It was deprecated in 0.5. + * Improve pkg-kde-tools package description. Now it contains short + descriptions of all tools the package provides. + * Reword dh_sameversiondep manual page a bit. + * Recommend libwww-perl. + * Reorganize source package directory structure: + - get rid of symbolshelper, debhelper, vcs subdirectires. Move perl modules + to perllib subdirectory and the rest to the top of the source tree; + - unify how datalibdir is found and exported in the Debian::PkgKde module + ({find,setup}_datalibdir()). Make pkgkde-gensymbols and + pkgkde-symbolshelper use these new subroutines; + - change datalib path in pkgkde-deb2symbols; + - rewrite Makefile for reorganized source tree. + * Update debian/copyright. + + -- Modestas Vainius Tue, 16 Mar 2010 02:58:34 +0200 + +pkg-kde-tools (0.6.8) unstable; urgency=low + + * Add dh_sodeps helper program for autogenering dependencies for library + development packages based on the targets *.so symlinks point to. + * Add dh addon "sodeps" for dh_sodeps. + + -- Modestas Vainius Wed, 03 Mar 2010 04:27:52 +0200 + +pkg-kde-tools (0.6.7) unstable; urgency=low + + * Instruct cdbs to handle DEB_BUILD_OPTIONS=parallel for team packages rather + than rely on dpkg-buildpackage -jN to mess with MAKEFLAGS. Team packages + are parallel safe. + + -- Modestas Vainius Tue, 02 Mar 2010 13:20:03 +0200 + +pkg-kde-tools (0.6.6) unstable; urgency=low + + * pkgkde-{symbolshelper,gensymbols}: compatibility fix for dpkg-dev 1.15.6 + retaining compatibility with 1.15.5 as well (Dpkg::IPC::spawn). + * Use new Dpkg::IPC::spawn() rather than Dpkg::IPC::fork_and_exec() in the + code. + * Update code stolen from dpkg-dev to current git master. + * pkgkde-deb2symbols: be quiet when dumping symbol file. + * `pkgkde-symbolshelper batchpatch`: improve error messages. + * Fix patch parsing when patches go one right after another. + * `pkgkde-symbolshelper rewrite`: understand -v again. + * Add pkgkde-override-sc-dev-latest command. + + -- Modestas Vainius Sun, 28 Feb 2010 20:56:33 +0200 + +pkg-kde-tools (0.6.5) unstable; urgency=low + + * pkgkde-debs2symbols: remove 0 size patch files. + * `pkgkde-symbolshelper batchpatch`: if no packages explicitly specified, + select only those for which patches exist. + * Move RPATH "workaround" code for <= KDE 4.3.x from makefiles/1/cdbs/kde.mk + to makefiles/1/variables.mk hence debian-qt-kde.mk will also use it. + + -- Modestas Vainius Wed, 17 Feb 2010 21:51:40 +0200 + +pkg-kde-tools (0.6.4ubuntu5) lucid; urgency=low + + * Make dh7 only do pot creation/cleanup on packages other than *-l10n-* + * Update SVNREV in debian/rules to that of KDE 4.4.2 + + Instead of using the tag date, use the precise revision! + * Sync l10n scripts with 4.4.2 + + -- Harald Sitter Fri, 02 Apr 2010 08:30:17 +0200 + +pkg-kde-tools (0.6.4ubuntu4) lucid; urgency=low + + * Add syncing of l10n scritps with KDE SVN to debian/rules (syncl10n) + + this can be invoked via make -f debian/rules syncl10n + + sync scripts, to fix POT creation (LP: #529483) + + -- Harald Sitter Mon, 01 Mar 2010 15:21:23 +0100 + +pkg-kde-tools (0.6.4ubuntu3) lucid; urgency=low + + * Manually merge kubuntu/findfiles + introduce merge history in the file + * Import current kubuntu/msgsplit from KDE SVN + * Import current kubuntu/extract-messages.sh from KDE SVN + + -- Harald Sitter Tue, 23 Feb 2010 15:14:33 +0100 + +pkg-kde-tools (0.6.4ubuntu2) lucid; urgency=low + + * Also use LZMA compression for dh7 builds + + -- Harald Sitter Mon, 22 Feb 2010 13:47:11 +0100 + +pkg-kde-tools (0.6.4ubuntu1) lucid; urgency=low + + * Merge with Debian unstable remaining changes: + - Use /usr/share/doc/kde/HTML for docs + - Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" + - Add kubuntu/ files and edit debian/install + - debian-qt-kde.mk: include kubuntu.mk + - debian-qt-kde.mk: include quilt only if there are patches + - debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - cdbs/kde.mk: include kubuntu.mk + - debhelper/kde.mk: include debhelper/kubuntu.mk + - kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when + maintainer is not Debian qt-kde team + - Change docs path to /usr/share/doc/kde/ not /usr/share/doc/kde4/ in + debian-qt-kde.mk rules + - Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call + them in kde.pm for .pot generation in pure Debhelper 7 packages + + -- Alessandro Ghersi Wed, 17 Feb 2010 01:21:28 +0100 + +pkg-kde-tools (0.6.4) unstable; urgency=low + + * Add -q option to pkgkde-gensymbols. -c0 will never fail but still generate + a diff. Use -c0 -q to keep pkgkde-gensymbols completely quiet as before. + * `pkgkde-symbolshelper create`: make it work with a single input symbol + file. + * `pkgkde-symbolshelper rewrite`: avoid dupe c++ aliases after convert in + some cases. + + -- Modestas Vainius Tue, 16 Feb 2010 02:53:40 +0200 + +pkg-kde-tools (0.6.3) unstable; urgency=low + + * pkgkde-debs2symbols: allow to specify deb directory (-d option) and + symbol file directory (-s option). + * pkgkde-symbolshelper: implement `batchpatch` subcommand which is capable of + patching multiple packages at once (provided current working directory is + the top of the debian source package tree with symbol files in standard + locations). + * `pkgkde-symbolshelper patch`: rename --base|b option to --file-to-patch|f. + * pkgkde-symbolshelper: implement --backup option (backs up outfile). + + -- Modestas Vainius Sun, 14 Feb 2010 21:47:06 +0200 + +pkg-kde-tools (0.6.2) unstable; urgency=low + + * Implement dh_movelibkdeinit debhelper program which moves libkdeinit4_*.so + from public /usr/lib to private /usr/lib/kde4/libkdeinit if RUNPATHs are + set properly. + * Add dh_movelibkdeinit helper to debhelper kde addon sequence, CDBS kde.mk + and debian-qt-kde.mk. + * Pass new LIBKDEINIT_INSTALL_DIR and ENABLE_LIBKDEINIT_RUNPATH options to + cmake by default (CDBS kde.mk and debhelper kde buildsystem). + * No longer globally skip RPATH handling in cmake if kdelibs5-dev is 4:4.4.0 + or higher. kde4libs build system has been properly fixed in 4:4.4.0-1. + * Omit usr/lib/kde4/ from dh_makeshlibs by default (debian-qt-kde.mk, kde.mk, + dh kde addon). + * dh kde addon: exclude kde documentation from dh_compress by default. + * Add qt-kde-team/1/library-packages.mk which is capable of: + - generating and handling ${allLibraries}, ${kde43Libraries} substs; + - generating strict local shlibs. + * Improve README.Debian information about dh kde addon. + * Make dh kde addon return truth value. + * Compress pkg-kde-tools tarball with bzip2 by default. + + -- Modestas Vainius Sat, 13 Feb 2010 19:36:56 +0200 + +pkg-kde-tools (0.6.1) unstable; urgency=low + + * Rework detection of arch specific symbols. This should fix some bugs + with arch symbol tag processing and generation. + * Now `pkgkde-symbolshelper create` bases its template on the arch specific + symbol file (as specified with -a option). This alters arch tag generation + a bit (negative arches are used more frequently than before). + * Alter behaviour of -o option: + - if it is not specified, output is dumped to the same file as input was + read from; + - if it is specified without argument, dump to stdout; + - if it is specified with argument, dump to the file in argument. + * pkgkde-symbolshelper create/patch: arch specific files/patches are passed + via @ARGV now. + * pkgkde-symbolshelper create/patch: prompt for version if -v is not + specified on the command line. Good defaults are also suggested. + + -- Modestas Vainius Sat, 06 Feb 2010 23:43:07 +0200 + +pkg-kde-tools (0.6.0) unstable; urgency=low + + * "SymbolsHelper Reloaded" release. + + * Remove DMUA field from debian/control which was added for me. + * Provide newer dpkg-gensymbols as pkgkde-gensymbols. + * Make it possible to replace dpkg-gensymbols with pkgkde-gensymbols + (by adding /usr/share/pkg-kde-tools/bin to $PATH). + * Use my @debian.org address in the Uploaders field. + * Helpers for adding /usr/share/pkg-kde-tools/bin to $PATH: + - implement this in cdbs/symbolshelper.mk; + - new pkgkde_symbolshelper dh addon takes care of this for dh(1). + * Port pkgkde-symbolshelper to the latest dpkg-dev symbols API. + Most subcomands as of 0.4.0 are supported, some are no longer needed. + * Add support for substitutions directly to pkgkde-gensymbols + (dpkg-gensymbols wrapper). This renders `pkgkde-symbolshelper symbolfile` + obsolete. + * Switch to 3.0 (native) format: ignores VCS directories by default. + * Update my address in the code copyright notices. + * Update debian/copyright. + * Add pkgkde-debs2symbols utility which is capable of: + - auto-downloading library binary packages for all available architectures; + - creating raw arch-specific symbol files based on the contents of the + binary packages. Those symbol files can be later fed to + `pkgkde-symbolshelper create`; + - generating arch-specific dpkg-gensymbols diffs between the reference + symbol file template and actual contents of the (later) binary packages. + Like build logs, those patches can be later fed to `pkgkde-symbolshelper + patch`. + * Add multi-arch/multi-patch support to `pkgkde-symbolshelper patch`. Now, it + is capable of patching symbol file template for multiple arches (using + multiple patches) at the same time. All revelevant information is + kept/merged, arch tags are managed automatically whenever possible. + Incremental patching is also supported. + * Add support for detection/expansion of the qprtdiff and quintptr substs (Qt + types). + * Promote dpkg-dev to Recommends, bump needed version to 1.15.5~. + * Remove dpkg-dev from Breaks. + * Update Standards-Version to 3.8.4: no changes needed. + * Fix lintian "I: hyphen-used-as-minus-sign + usr/share/man/man1/pkgkde-vcs.1.gz:97" + + -- Modestas Vainius Mon, 01 Feb 2010 20:09:10 +0200 + +pkg-kde-tools (0.5.3ubuntu2) lucid; urgency=low + + * When generating .desktop translation templates do not include + .pc directory made by Quilt + + -- Jonathan Riddell Wed, 06 Jan 2010 17:29:26 +0000 + +pkg-kde-tools (0.5.3ubuntu1) lucid; urgency=low + + * Merge with Debian testing, remaining changes: + - Use /usr/share/doc/kde/HTML for docs + - Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" + - Add kubuntu/ files and edit debian/install (dh_sameversiondeps removed now, unused) + - debian-qt-kde.mk: include kubuntu.mk + - debian-qt-kde.mk: include quilt only if there are patches + - debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - cdbs/kde.mk: include kubuntu.mk + - debhelper/kde.mk: include debhelper/kubuntu.mk + - kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when + maintainer is not Debian qt-kde team + - Change docs path to /usr/share/doc/kde/ not /usr/share/doc/kde4/ in + debian-qt-kde.mk rules + * Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call + them in kde.pm for .pot generation in pure Debhelper 7 packages + + -- Jonathan Riddell Wed, 06 Jan 2010 17:10:58 +0000 + +pkg-kde-tools (0.5.3) unstable; urgency=low + + * Add support for dpkg-dev 1.15.5 to dh_sameversiondep. + + -- Modestas Vainius Wed, 18 Nov 2009 02:31:00 +0200 + +pkg-kde-tools (0.5.2ubuntu2) lucid; urgency=low + + * Change docs path to /usr/share/doc/kde/ not /usr/share/doc/kde4/ in + debian-qt-kde.mk rules + + -- Jonathan Riddell Thu, 12 Nov 2009 11:47:21 +0000 + +pkg-kde-tools (0.5.2ubuntu1) lucid; urgency=low + + * Merge with Debian unstable, remaining changes: + - Use /usr/share/doc/kde/HTML for docs + - Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" + - Add kubuntu/ files and edit debian/install (dh_sameversiondeps removed now, unused) + - debian-qt-kde.mk: include kubuntu.mk + - debian-qt-kde.mk: include quilt only if there are patches + - debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + - cdbs/kde.mk: include kubuntu.mk + - debhelper/kde.mk: include debhelper/kubuntu.mk + * kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + * qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when + maintainer is not Debian qt-kde team + + -- Jonathan Riddell Wed, 04 Nov 2009 14:33:59 +0000 + +pkg-kde-tools (0.5.2) unstable; urgency=low + + * Add pkgkde-vcs helper tool for performing various common tasks + when packaging with version control system repositories. As of this commit + the only VCS supported is Git which supports 'tag' subcommand for tagging + debian package releases when as they are uploaded Debian. + * Add ${misc:Depends} to shut up lintian. + + -- Modestas Vainius Fri, 16 Oct 2009 23:25:33 +0300 + +pkg-kde-tools (0.5.1) unstable; urgency=low + + +++ Changes by Modestas Vainius: + + * dh_sameversiondep: really disable warnings about unknown substvars. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Change the generation of the HTML documentation's path to + /usr/share/doc/kde4/ instead of /usr/share/doc/kde/. We are building with + -DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML . + * Bump Standards-Version to 3.8.3: no changes needed. + * Add © in copyright file instead of (C). + + -- Debian Qt/KDE Maintainers Wed, 23 Sep 2009 10:14:30 +0200 + +pkg-kde-tools (0.5.0) unstable; urgency=low + + * Split off KDE 4 cmake flags from variables.mk to the text file. + * Create debhelper subdir and move dh_sameversiondep to it. + * Add a kde build system for debhelper (>= 7.3). + * Add a kde sequence addon (template) for debhelper (>= 7.3.16). + * Deprecate debhelper/kde.mk snippet. Use kde build system/sequence addon + instead. + * Remove extra slashes from debian/install. + * Switch debian/rules to dh. Update build dependencies and compat + accordingly. + + -- Modestas Vainius Thu, 27 Aug 2009 19:50:35 +0300 + +pkg-kde-tools (0.4.11ubuntu7) karmic; urgency=low + + * Also add dh_clean to override + + -- Jonathan Riddell Tue, 25 Aug 2009 17:12:59 +0100 + +pkg-kde-tools (0.4.11ubuntu6) karmic; urgency=low + + * Re-add dh_installdocs back to override rule + + -- Jonathan Riddell Tue, 25 Aug 2009 17:06:11 +0100 + +pkg-kde-tools (0.4.11ubuntu5) karmic; urgency=low + + * Improvements to kubuntu/debhelper/kubuntu.mk from Fathi Boudra + + -- Jonathan Riddell Mon, 24 Aug 2009 18:14:39 +0100 + +pkg-kde-tools (0.4.11ubuntu4) karmic; urgency=low + + * Add kubuntu/debhelper/kubuntu.mk + * Make makefiles/1/debhelper/kde.mk include it + + -- Jonathan Riddell Mon, 24 Aug 2009 13:26:13 +0100 + +pkg-kde-tools (0.4.11ubuntu3) karmic; urgency=low + + * Add include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk to + makefiles/1/debhelper/kde.mk + + -- Alessandro Ghersi Tue, 18 Aug 2009 06:59:33 +0200 + +pkg-kde-tools (0.4.11ubuntu2) karmic; urgency=low + + * qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when + maintainer is not Debian qt-kde team + + -- Alessandro Ghersi Mon, 17 Aug 2009 00:25:43 +0200 + +pkg-kde-tools (0.4.11ubuntu1) karmic; urgency=low + + * Test build in Karmic PPA + * Drop Kubuntu's disabled cdbs/symbolshelper.mk as dpkg 1.15 is in karmic + * Merge from debian unstable, remaining changes: + - Add scripts for i18n in kubuntu/ directory + - variables.mk: /usr/share/doc/kde/HTML for docs path, Kubuntu packages + - kde.mk: include kubuntu.mk + - debian-qt-kde.mk: include kubuntu.mk + - debian-qt-kde.mk: include quilt only if there are patches + - debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel + + -- Luka Renko Fri, 14 Aug 2009 08:09:03 +0200 + +pkg-kde-tools (0.4.11) unstable; urgency=low + + * Debhelper 7.3.7 has been upload to unstable, pkg-kde-tools with + debhelper/kde.mk follows. + + -- Modestas Vainius Fri, 24 Jul 2009 15:17:47 +0300 + +pkg-kde-tools (0.4.10) experimental; urgency=low + + * Add a basic debhelper/kde.mk snippet which automatically passes KDE cmake + flags to dh_auto_configure and runs dh $@ by default. Either of defaults + can be overriden as needed. + * Update debian/README.Debian with details about dh(1) support. + * Bump Standards-Version to 3.8.2: no changes needed. + * Suggest debhelper (>= 7.3.0) which includes dh(1) with cmake support. + + -- Modestas Vainius Thu, 02 Jul 2009 20:12:07 +0300 + +pkg-kde-tools (0.4.9) unstable; urgency=low + + [ Modestas Vainius ] + * Clarify comment in variables.mk. + * Install severily stripped down version of pkgkde-symbolshelper which + is compatible with dpkg-dev >= 1.15.3. This version is inappropriate + to generate/patch new symbols, it is here just to avoid breaking + old packages. While dpkg-dev 1.15.3 has some big improvements, they + are still not enough to properly support most C++ libraries. + + [ Raúl Sánchez Siles ] + * Remove usage of deprecated dh_desktop. + + -- Debian Qt/KDE Maintainers Sat, 27 Jun 2009 22:32:11 +0300 + +pkg-kde-tools (0.4.8) unstable; urgency=low + + * Add maintainer check to debian_qt_kde.mk to disallow anybody else but + Debian Qt/KDE Maintainers to use this snippet (i.e. for official KDE + packages only). The check is supposed to support Kubuntu packages too. + + -- Modestas Vainius Wed, 27 May 2009 13:42:22 +0300 + +pkg-kde-tools (0.4.7) unstable; urgency=low + + +++ Changes by Modestas Vainius: + + * dpkg 1.15.1 entered unstable, so pkg-kde-tools 0.4.7 follows. + * Change Conflicts to Breaks on dpkg-dev/kdelibs5 (more apppropriate in + this case). + + +++ Changes by Fathi Boudra: + + * Re-word README.Debian: + - use 80 colons max + - add a note on DEB_KDE_LINK_AS_NEEDED usage + - improve debhelper snippet based on dh-make template + - fix typo kde4.mk -> kde.mk + - remove extra lines + + -- Debian Qt/KDE Maintainers Thu, 21 May 2009 09:14:44 +0300 + +pkg-kde-tools (0.4.6ubuntu11) karmic; urgency=low + + * Do not compress using LZMA on armel + + -- Harald Sitter Wed, 29 Jul 2009 18:55:05 +0200 + +pkg-kde-tools (0.4.6ubuntu10) karmic; urgency=low + + * Separate .pot generation into kubuntu.mk and include it in + kde.mk and debian-qt-kde.mk + + -- Jonathan Riddell Wed, 29 Jul 2009 15:57:57 +0100 + +pkg-kde-tools (0.4.6ubuntu9) karmic; urgency=low + + * Add playground-base to desktop-template-list for knetworkmanager + + -- Jonathan Riddell Mon, 27 Jul 2009 17:31:34 +0100 + +pkg-kde-tools (0.4.6ubuntu8) karmic; urgency=low + + * Really add extract-xml.sh to pot creation + + -- Harald Sitter Sun, 26 Jul 2009 21:39:02 +0200 + +pkg-kde-tools (0.4.6ubuntu7) karmic; urgency=low + + * Import extract-xml.sh from KDE SVN + * Add extract-xml.sh to the pot creation in kde.mk + + -- Harald Sitter Sun, 26 Jul 2009 21:36:05 +0200 + +pkg-kde-tools (0.4.6ubuntu6) karmic; urgency=low + + * Compress packages with LZMA via DEB_DH_BUILDDEB_ARGS += -- -Zlzma if this + should cause any problems it is advisable to wrap it in some if $package = + $enabeled_packages. This can be deactivated by exporting DEB_NO_LZMA=1 + + -- Harald Sitter Mon, 08 Jun 2009 19:18:13 +0200 + +pkg-kde-tools (0.4.6ubuntu5) karmic; urgency=low + + * Add a KUBUNTU_NO_DELETE_POT variable for packages which moan if you delete their .pot file + + -- Jonathan Riddell Wed, 06 May 2009 11:22:04 +0000 + +pkg-kde-tools (0.4.6ubuntu4) karmic; urgency=low + + * Applied magic from cdbs' kde4.mk to qt-kde-team/1/debian-qt-kde.mk so it + doesn't insist on quilt being installed + + -- Harald Sitter Sat, 02 May 2009 16:29:11 +0200 + +pkg-kde-tools (0.4.6ubuntu3) karmic; urgency=low + + * Change docs path to /usr/share/doc/kde/HTML, this makes KDE 3 docs readable + in the help centre + + -- Jonathan Riddell Fri, 01 May 2009 15:20:48 +0000 + +pkg-kde-tools (0.4.6ubuntu2) karmic; urgency=low + + * Don't call symbolshelper.mk from debian-qt-kde.mk and remove conflicts with + old dpkg + + -- Jonathan Riddell Thu, 30 Apr 2009 14:42:54 +0000 + +pkg-kde-tools (0.4.6ubuntu1) karmic; urgency=low + + * Merge with Debian, remaining changes: + - Add scripts for i18n in kubuntu/ directory + - Add i18n code to kde.mk and variables.mk + + -- Jonathan Riddell Wed, 29 Apr 2009 16:25:44 +0100 + +pkg-kde-tools (0.4.6) experimental; urgency=low + + * Merge changes from 0.4.2, now compatible with KDE 4.2.2 in sid. + * Improve output of the patch subcommand: + - it includes added MISSING symbols now; + - dump postprocessed symbols. + * Switch to named parameters for *_min_version() subs. + * Bump Standards-Version to 3.8.1 (no changes). + * Fix dh_sameversiondep POD page (lintian warning). + + -- Modestas Vainius Sat, 11 Apr 2009 16:51:06 +0300 + +pkg-kde-tools (0.4.5) experimental; urgency=low + + * Restore pkgkde-symbolshelper compatibility with dpkg-dev 1.15.0. This + breaks compatibility with dpkg-dev (<< 1.15) though. Add conflicts. + * Small dpkg-dev 1.15.0 compatibility fix for dh_sameversiondep. + + -- Modestas Vainius Sun, 29 Mar 2009 15:26:12 +0300 + +pkg-kde-tools (0.4.2) unstable; urgency=low + + * Remove setting of kde home. We now use the default. + * Add aggressive conflicts to avoid bad accidents. + + -- Sune Vuorela Wed, 01 Apr 2009 22:23:23 +0200 + +pkg-kde-tools (0.4.1) unstable; urgency=low + + * Add Vcs fields to debian/control (Git). + * Get rid of custom bug file processing in qt-kde-team/1/debian-qt-kde.mk. + This is handled by dh_bugfiles now. + + -- Modestas Vainius Wed, 11 Mar 2009 13:57:19 +0200 + +pkg-kde-tools (0.4.0.1ubuntu4) jaunty; urgency=low + + * Update extract-messages.sh + * Refine desktop-template-list + + -- Jonathan Riddell Wed, 08 Apr 2009 17:49:24 +0100 + +pkg-kde-tools (0.4.0.1ubuntu3) jaunty; urgency=low + + * Add playground-sysadmin (kpackagekit) to pkg-kde-tools + + -- Jonathan Riddell Wed, 08 Apr 2009 01:28:50 +0100 + +pkg-kde-tools (0.4.0.1ubuntu2) jaunty; urgency=low + + * Add desktop-template-list with the list of .desktop file translation + templates we need for packages in main. Used by kde-l10n-xx to refresh + it's translations from upstream. + + -- Jonathan Riddell Tue, 07 Apr 2009 16:59:32 +0100 + +pkg-kde-tools (0.4.0.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add extractrc and extractattr from kdesdk-scripts + - Replace kdesdk-scripts (<< 4:4.1.80-0ubuntu2), previous versions contain + the same scripts. + - Add dh_sameversiondeps and i18n scripts from kdesdk-scripts into + kubuntu/ directory, stops circular dependency on kdesdk-scripts. + - DKDE_DISTRIBUTION_TEXT="Kubuntu packages" + - DKDE_DEFAULT_HOME=.kde + - Add .pot generation to kde.mk for Launchpad + - Change debian-qt-kde.mk to just include the Kubuntu kde4.mk from CDBS so + KDE4 debian/rules from Debian will work in Kubuntu (Still need to look + at what of the debian-qt-kde.mk should get integrated into kde4.mk or if + Kubuntu should change to use debian-qt-kde.mk for Karmic and later) + + -- Scott Kitterman Mon, 02 Mar 2009 10:43:49 -0500 + +pkg-kde-tools (0.4.0.1) unstable; urgency=low + + * Get rid of THIS_SHOULD_GO_TO_UNSTABLE hack. + * Release to unstable. + + -- Modestas Vainius Mon, 16 Feb 2009 01:58:52 +0200 + +pkg-kde-tools (0.4.0) experimental; urgency=low + + * pkgkde-symbolshelper: add support for resorting symbol files (useful after + manual editing). + * pkgkde-symbolshelper create: add support for adding arch specific symbols + to the symbol template. + * Add dh_sameversiondep from official KDE packaging: + - make pkg-kde-tools suggest debhelper v7 and dpkg-dev; + - add POD help and generate manual page from it; + - add support for the external reference package. + * Pass -X.svn to dh_install + * Add makefiles/1/cdbs/symbolshelper.mk which hooks pkgkde-symbolshelper + calls to cdbs. + * Add stuff from svn pkg-kde/cdbs as qt-kde-team. Port kde.mk and rename + it to debian-qt-kde.mk as it was called in kde3 when stored in cdbs/ dir. + - use /usr/share/pkg-kde-tools/makefiles/1/variables.mk; + - link with --as-needed by default; + - remove lintian section, we should use dh_lintian; + - add README to discourage other developers from using qt-kde-team; + - enable pkgkde-symbolshelper support in debian-qt-kde.mk by defaylt. + * Add "distro policy" checking when building the package: + - THIS_SHOULD_GO_TO_UNSTABLE moved policy/unstable.mk + - policy/unstable.mk also emits a warning when KDE alpha or betas are to + be uploaded to unstable. + + -- Modestas Vainius Sun, 25 Jan 2009 13:20:43 +0200 + +pkg-kde-tools (0.3.1) experimental; urgency=low + + * pkgkde-symbolshelper/patch: improve processing of patches which patch + multiple files. Use the first patch portion that applies properly. + * pkgkde-symbolshelper/patch: rename -p parameter to -d (diff), support -p + (package) option. + * pkgkde-symbolshelper: rework module stucture a bit, merge small handlers + into one file. + * debian/rules: disable .svn check. It is wrong and useless since does not + check the tarball itself but the directory the tarball gets built from. + * add support for int64_t/uint64_t differences on 64bit/32bit arches. + + -- Modestas Vainius Wed, 14 Jan 2009 14:18:17 +0200 + +pkg-kde-tools (0.3) experimental; urgency=low + + * Add pkgkde-symbolshelper. It aims to make handling of symbols in + C++ libraries easier. Symbols in C++ libraries are inconsistent among + arches due to mangling and other issues. + - Add GPL3 notice to debian/copyright which pkgkde-symbolshelper is under. + * Add myself to Uploaders. + * Tweak description. + * Add DM-Upload-Allowed: yes. + + -- Modestas Vainius Sat, 29 Nov 2008 16:53:01 +0200 + +pkg-kde-tools (0.2ubuntu4) jaunty; urgency=low + + * Add extractrc and extractattr from kdesdk-scripts + + -- Jonathan Riddell Mon, 16 Feb 2009 16:20:11 +0000 + +pkg-kde-tools (0.2ubuntu3) jaunty; urgency=low + + * Replace kdesdk-scripts (<< 4:4.1.80-0ubuntu2), previous versions contain + the same scripts. + + -- Harald Sitter Sat, 06 Dec 2008 18:42:27 +0100 + +pkg-kde-tools (0.2ubuntu2) jaunty; urgency=low + + * Add dh_sameversiondeps and i18n scripts from kdesdk-scripts into + kubuntu/ directory, stops circular dependency on kdesdk-scripts. + + -- Jonathan Riddell Mon, 17 Nov 2008 13:58:29 +0000 + +pkg-kde-tools (0.2ubuntu1) jaunty; urgency=low + + * Initial Kubuntu upload + -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" + -DKDE_DEFAULT_HOME=.kde + * Add .pot generation to kde.mk for Launchpad + + -- Jonathan Riddell Wed, 05 Nov 2008 11:00:07 +0000 + +pkg-kde-tools (0.2) unstable; urgency=low + + * The no .svn dir in release release. + * Add a way to set --as-needed during build. + * there was a reference to ENABLE_FINAL in variables.mk. Kill it. + + -- Sune Vuorela Wed, 29 Oct 2008 17:35:13 +0100 + +pkg-kde-tools (0.1) unstable; urgency=low + + * Initial Release. + + -- Sune Vuorela Thu, 18 Sep 2008 21:39:35 +0200 - -- Cyber Sec Mon, 09 Nov 2015 17:05:54 +0200 diff -Nru pkg-kde-tools-0.15.21/debian/control pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/control --- pkg-kde-tools-0.15.21/debian/control 2016-06-29 19:25:06.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/control 2017-02-10 15:25:04.000000000 +0000 @@ -3,11 +3,13 @@ Priority: extra Maintainer: Debian Qt/KDE Maintainers Build-Depends: cmake (>= 2.6.4), debhelper (>= 9), libdpkg-perl (>= 1.15.6~) -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Uploaders: Sune Vuorela , Modestas Vainius , Maximiliano Curia , - Lisandro Damián Nicanor Pérez Meyer + Lisandro Damián Nicanor Pérez Meyer , + Pino Toscano , + Dmitry Shachnev , Vcs-Git: https://anonscm.debian.org/git/pkg-kde/pkg-kde-tools.git Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/pkg-kde-tools.git @@ -15,6 +17,7 @@ Architecture: all Multi-Arch: foreign Depends: libdpkg-perl (>= 1.15.6~), + lintian, python3:any (>= 3.3.2-2~), ${misc:Depends}, ${perl:Depends} diff -Nru pkg-kde-tools-0.15.21/debian/copyright pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/copyright --- pkg-kde-tools-0.15.21/debian/copyright 2016-06-29 19:25:06.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/copyright 2017-02-10 15:25:04.000000000 +0000 @@ -35,7 +35,7 @@ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. -The follwing license applies to: +The following license applies to: - makefiles directory and its contents; - qt-kde-team directory and its contents; diff -Nru pkg-kde-tools-0.15.21/debian/NEWS pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/NEWS --- pkg-kde-tools-0.15.21/debian/NEWS 2016-06-29 19:25:06.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/NEWS 2017-02-10 15:25:03.000000000 +0000 @@ -1,4 +1,4 @@ -pkg-kde-tools (0.9.0) panto; urgency=low +pkg-kde-tools (0.9.0) unstable; urgency=low HTML_INSTALL_DIR path has been switched from /usr/share/doc/kde4/HTML to /usr/share/doc/kde/HTML. If you refer to usr/share/doc/kde4/ anywhere in the diff -Nru pkg-kde-tools-0.15.21/debian/pkg-kde-tools.install pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/pkg-kde-tools.install --- pkg-kde-tools-0.15.21/debian/pkg-kde-tools.install 2016-06-29 19:25:06.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/pkg-kde-tools.install 2017-02-10 15:25:04.000000000 +0000 @@ -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 diff -Nru pkg-kde-tools-0.15.21/debian/rules pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/rules --- pkg-kde-tools-0.15.21/debian/rules 2016-06-29 19:25:06.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/debian/rules 2017-02-10 15:25:03.000000000 +0000 @@ -4,3 +4,43 @@ override_dh_install: $(overridden_command) --list-missing + +# KDE branch to use. Various scripts are coming from kdesdk or other parts of +# KDE, those will preferrably be fetched from the branch (still taking into +# account the revision from below). +KDEBRANCH=v4.13.0 + +KDEGIT=git://anongit.kde.org +TARGET=kubuntu/libexec +CPTARGET=../kubuntu/libexec +EXPORT=export -r$(SVNREV) --force + +# Note that for git we use single branch shallow clone of the git tags. This is +# about as fast as it gets with git. +syncl10ninternal: + svn $(EXPORT) svn://anonsvn.kde.org/home/kde/branches/stable/l10n-kde4/scripts/createdesktopcontext.pl $(TARGET)/createdesktopcontext.pl + svn $(EXPORT) svn://anonsvn.kde.org/home/kde/branches/stable/l10n-kde4/scripts/extract-messages.sh $(TARGET)/extract-messages.sh + svn $(EXPORT) svn://anonsvn.kde.org/home/kde/branches/stable/l10n-kde4/scripts/extract-xml.sh $(TARGET)/extract-xml.sh + svn $(EXPORT) svn://anonsvn.kde.org/home/kde/branches/stable/l10n-kde4/scripts/msgsplit $(TARGET)/msgsplit + @echo "Working on kde-dev-scripts" + git clone --branch $(KDEBRANCH) --depth 1 --single-branch $(KDEGIT)/kde-dev-scripts.git && \ + cd kde-dev-scripts && \ + cp extractattr $(CPTARGET) && \ + cp extractrc $(CPTARGET) + @echo "Working on kdelibs" + git clone --branch $(KDEBRANCH) --depth 1 --single-branch $(KDEGIT)/kdelibs.git && \ + cd kdelibs && \ + cp kdeui/preparetips $(CPTARGET) + +syncl10nclean: + rm -rf kde-dev-scripts + rm -rf kdelibs + +# Clean git directories before and after to prevent problems. +syncl10n: syncl10nclean syncl10ninternal syncl10nclean + +# ...also clean git directories as part of regular clean. +override_dh_auto_clean: syncl10nclean + dh_auto_clean + +.PHONY: override_dh_auto_clean syncl10n syncl10nclean syncl10ninternal diff -Nru pkg-kde-tools-0.15.21/dh_sameversiondep pkg-kde-tools-0.15.24ubuntu2~ppa1/dh_sameversiondep --- pkg-kde-tools-0.15.21/dh_sameversiondep 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/dh_sameversiondep 2017-02-10 15:25:04.000000000 +0000 @@ -107,7 +107,7 @@ The name of the package which dependencies are to be intersected with the dependencies of the I package. Defaults to the first package in -debian/control if ommited. +debian/control if omitted. =item I (optional) diff -Nru pkg-kde-tools-0.15.21/dh_sodeps pkg-kde-tools-0.15.24ubuntu2~ppa1/dh_sodeps --- pkg-kde-tools-0.15.21/dh_sodeps 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/dh_sodeps 2017-02-10 15:25:04.000000000 +0000 @@ -73,7 +73,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $tmpdir = tmpdir($package); - my @solinks = grep { -l $_ } glob("$tmpdir/usr/lib/*.so"); + my $globstring = "$tmpdir/usr/lib/*.so"; + my $multiarch = dpkg_architecture_value("DEB_HOST_MULTIARCH"); + if (defined $multiarch) { + $globstring = "$globstring $tmpdir/usr/lib/$multiarch/*.so" + } + my @solinks = grep { -l $_ } glob($globstring); if (@solinks) { my $arch = package_arch($package); @@ -93,7 +98,7 @@ my $target = readlink($solink); foreach my $p (@packages) { next if $p eq $package; - if (-e "debian/$p/usr/lib/$target") { + if (-e "debian/$p/usr/lib/$target" || (defined $multiarch and -e "debian/$p/usr/lib/$multiarch/$target")) { addsubstvar($package, "so:Depends", $p, $verinfo); } } diff -Nru pkg-kde-tools-0.15.21/kubuntu/bin/dh_kubuntu_l10n_clean pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/bin/dh_kubuntu_l10n_clean --- pkg-kde-tools-0.15.21/kubuntu/bin/dh_kubuntu_l10n_clean 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/bin/dh_kubuntu_l10n_clean 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/sh + +# Env +# KUBUNTU_L10N_FORCE_RUN:: force running regardless of what ma be detected otherwise +# KUBUNTU_L10N_NO_DESKTOP:: don't process desktop files + +if [ -z "$KUBUNTU_L10N_FORCE_RUN" ]; then + if ! grep -q '^Purpose: PRIMARY' /CurrentlyBuilding || + ! grep -q 'X[[:alpha:]]*-Ubuntu-Use-Langpack: yes' debian/control; then + echo "No primary archive build or not using langpack -> not generating l10n content." + exit 0 + fi +else + echo "Forcing l10n run" +fi + +libpath=/usr/lib/kubuntu-l10n/ +export PATH=$libpath/libexec:$PATH + +if [ -z ${KUBUNTU_DESKTOP_POT} ]; then + KUBUNTU_DESKTOP_POT=`dpkg-parsechangelog | grep Source: | cut -d: -f2 | tr -d ' '` +fi + +if [ -z ${KUBUNTU_NO_DELETE_POT} ]; then + # Strip translation domain from desktop files... + finddesktopfiles LIST + for file in `cat LIST`; do + sed -i '/X-Ubuntu-Gettext-Domain=/d' ${file} + done + rm -f LIST + + # Remove all pots. + rm -rf po/*.pot; +fi diff -Nru pkg-kde-tools-0.15.21/kubuntu/bin/dh_kubuntu_l10n_generate pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/bin/dh_kubuntu_l10n_generate --- pkg-kde-tools-0.15.21/kubuntu/bin/dh_kubuntu_l10n_generate 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/bin/dh_kubuntu_l10n_generate 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,62 @@ +#!/bin/sh + +# Env +# KUBUNTU_L10N_FORCE_RUN:: force running regardless of what ma be detected otherwise +# KUBUNTU_L10N_NO_DESKTOP:: don't process desktop files + +if [ -z "$KUBUNTU_L10N_FORCE_RUN" ]; then + if ! grep -q '^Purpose: PRIMARY' /CurrentlyBuilding || + ! grep -q 'X[[:alpha:]]*-Ubuntu-Use-Langpack: yes' debian/control; then + echo "No primary archive build or not using langpack -> not generating l10n content." + exit 0 + fi +else + echo "Forcing l10n run" +fi + +libpath=/usr/lib/kubuntu-l10n/ +export PATH=$libpath/libexec:$PATH + +################################### Messages ################################### + +# Generating translation templates for general messages as well as those +# extractable from XML files. +echo "extract-messages & extract-xml" +mkdir -p po +extract-messages.sh +extract-xml.sh +if [ -n "$(ls -A po/)" ]; then + for file in po/*pot; do + sed "s/charset=CHARSET/charset=UTF-8/" -i $file; + done +fi + +################################### Desktop #################################### + +if [ -n "$KUBUNTU_L10N_NO_DESKTOP" ]; then + echo "no desktop file processing" + exit 0 +fi + +echo "finddesktopfiles & createdesktopcontext" + +if [ -z ${KUBUNTU_DESKTOP_POT} ]; then + KUBUNTU_DESKTOP_POT=`dpkg-parsechangelog | grep Source: | cut -d: -f2 | tr -d ' '` +fi + +finddesktopfiles LIST +sed /\.pc/d LIST -i + +createdesktopcontext.pl --file-list=LIST --base-dir=. > desktop.${KUBUNTU_DESKTOP_POT}.tmp +msguniq --to-code=UTF-8 --no-wrap -o desktop.${KUBUNTU_DESKTOP_POT} desktop.${KUBUNTU_DESKTOP_POT}.tmp 2>/dev/null +msgsplit desktop.${KUBUNTU_DESKTOP_POT} + +mv desktop.${KUBUNTU_DESKTOP_POT} po/desktop_${KUBUNTU_DESKTOP_POT}.pot +rm -f desktop.${KUBUNTU_DESKTOP_POT} desktop.${KUBUNTU_DESKTOP_POT}.tmp + +# add translation domain to files +for file in `cat LIST`; do + echo X-Ubuntu-Gettext-Domain=desktop_${KUBUNTU_DESKTOP_POT} >> ${file} +done + +rm -f LIST diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/desktop-template-list pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/desktop-template-list --- pkg-kde-tools-0.15.21/kubuntu/lib/desktop-template-list 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/desktop-template-list 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,18 @@ +extragear-base/desktop_extragear-base_konq-plugins +extragear-graphics/desktop_extragear-graphics_digikamimageplugins +extragear-graphics/desktop_extragear-graphics_digikam +extragear-graphics/desktop_extragear-graphics_kipi-plugins +extragear-graphics/desktop_extragear-graphics_skanlite +extragear-multimedia/desktop_extragear-multimedia_amarok +extragear-multimedia/desktop_extragear-multimedia_k3b +extragear-multimedia/desktop_extragear-multimedia_kaffeine +extragear-network/desktop_extragear-network_konversation +extragear-network/desktop_extragear-network_kopete-cryptography +extragear-network/desktop_extragear-network_ktorrent +extragear-network/desktop_extragear-network_choqok +extragear-network/desktop_extragear-network_rekonq +extragear-sdk/extragear-sdk_kdevplatform +extragear-sdk/extragear-sdk_kdevelop +playground-sysadmin/desktop_playground-sysadmin +playground-network/desktop_playground-network +playground-base/desktop_playground-base diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/libexec/createdesktopcontext.pl pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/createdesktopcontext.pl --- pkg-kde-tools-0.15.21/kubuntu/lib/libexec/createdesktopcontext.pl 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/createdesktopcontext.pl 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,121 @@ +#! /usr/bin/env perl + +# Version for KDE4 + +use strict; +use warnings; +use v5.8.0; # We really want decent Unicode support + +use Getopt::Long; + +sub printdate +{ + printf ( "%04i", ( $_[5] + 1900 ) ); + print "-"; + printf ( "%02i", $_[4] + 1); + print "-"; + printf ( "%02i", $_[3] ); + print " "; + printf ( "%02i", $_[2] ); + print ":"; + printf ( "%02i", $_[1] ); + print "+0000"; +} + +sub prepare +{ + binmode( STDOUT, ":utf8" ); + + my @now = gmtime(); + print "#, fuzzy\n"; + print "msgid \"\"\n"; + print "msgstr \"\"\n"; + print "\"Project-Id-Version: desktop files\\n\"\n"; + print "\"Report-Msgid-Bugs-To: http://bugs.kde.org\\n\"\n"; + print "\"POT-Creation-Date: "; printdate( @now ); print "\\n\"\n"; + print "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n"; + print "\"Last-Translator: FULL NAME \\n\"\n"; + print "\"Language-Team: LANGUAGE \\n\"\n"; + print "\"MIME-Version: 1.0\\n\"\n"; + print "\"Content-Type: text/plain; charset=UTF-8\\n\"\n"; + print "\"Content-Transfer-Encoding: 8bit\\n\"\n"; + print "\n\n"; +} + +sub processfiles +{ + my ( $files, $basedir) = ( @_ ); + for my $filename ( @$files ) + { + chomp( $filename ); + next if -d $filename; + open( FH, "<:utf8", $filename ) or warn "Cannot open file $filename"; + + # print STDERR "Processing $filename...\n"; ### DEBUG + + my $regexp = qr{^(Name|Comment|Language|Keywords|X-KDE-Keywords|About|Description|GenericName|Query|ExtraNames|X-KDE-Submenu)=(.+)}; + + # Context is given by preceeding the entry with # ctxt:... comment. + # For example, this: + # # ctxt: Blah blah + # Name=... + # ends up as "Name|Blah blah" context in the PO file. + my $regexp_ctxt = qr{^\s*#\s*ctxt\s*:\s*(.*?)\s*$}; + + my $context_free = ""; + while( ) + { + if ( m/$regexp/o ) + { + my $context = $1; + my $msgid = $2; + if ($context_free) { + $context = "$context|$context_free"; + $context =~ s/\\/\\\\/g; + $context =~ s/\"/\\\"/g; + } + chomp( $msgid ); + $msgid =~ s/$regexp//; + $msgid =~ s/\\/\\\\/g; + $msgid =~ s/\"/\\\"/g; + if ($msgid =~ m/ +$/) { + $msgid =~ s/ +$//; # remove trailing spaces + print STDERR "ERROR: white space at the end of $msgid in $filename\n"; + } + if ($msgid =~ m/\r$/) { + $msgid =~ s/[ \r]+$//; # remove trailing space or CR characters + print STDERR "ERROR: CR at the end of $msgid in $filename\n"; + } + $filename =~ s,^$basedir/,,; + print "#: $filename:$.\n"; + print "msgctxt \"$context\"\n"; + print "msgid \"$msgid\"\n"; + print "msgstr \"\"\n"; + print "\n"; + } + # Free context refers only to the immediate next line. + # Thus, if next line is not extracted, current context is gone. + if ( m/$regexp_ctxt/o ) { + $context_free = $1; + } else { + $context_free = ""; + } + } + + close( FH ); + } +} + +my $onefilelist; +my $basedir; +GetOptions ( "file-list=s" => \$onefilelist, + "base-dir=s" => \$basedir + ); + +prepare; + +open( FILELIST, $onefilelist ) or warn ( "Cannot open file list: $onefilelist" ); +my @thislist = ; +processfiles( \@thislist, $basedir ); +close( FILELIST ); + diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/libexec/extractattr pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/extractattr --- pkg-kde-tools-0.15.21/kubuntu/lib/libexec/extractattr 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/extractattr 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,165 @@ +#! /usr/bin/env perl + +# +# Copyright (c) 2004 Richard Evans +# +# License: LGPL 2.0 +# + +sub usage +{ + warn <<"EOF"; + +extractattr [flags] filenames + +This script extracts element attributes from designer (.ui) and XMLGIU (.rc) files +and writes on standard output (usually redirected to rc.cpp) the equivalent +i18n() calls so that xgettext can parse them. + +--attr=spec : Specify the attribute to be extracted. The specification + consists of the following comma separated arguments: + + Element,attribute[,context] + + The context is optional and overrides the name set by + --context below. Repeat the flag to specify multiple + attributes: + + --attr=Title,data --attr=Description,data,Stencils + +--context=name : Give i18n calls a context name: i18nc("name", ...) +--lines : Include source line numbers in comments (deprecated, it is switched on by default now) +--help|? : Display this summary + +EOF + + exit; +} + +########################################################################################### + +use strict; +use warnings; +use Getopt::Long; + +########################################################################################### +# Add options here as necessary - perldoc Getopt::Long for details on GetOptions + +GetOptions ( "attr=s" => \my @opt_attr, + "context=s" => \my $opt_context, + "lines" => \my $opt_lines, + "help|?" => \&usage ); + +unless ( @ARGV ) +{ + warn "No filename specified"; + exit; +} + +unless ( @opt_attr ) +{ + warn "No attributes specified"; + exit; +} + +########################################################################################### +# Program start proper - NB $. is the current line number + +my $code =<<'EOF'; +our $file_name; + +for $file_name ( @ARGV ) +{ + my $fh; + + unless ( open $fh, "<", $file_name ) + { + warn "Failed to open: '$file_name': $!"; + next; + } + + while ( <$fh> ) + { + last if $. == 1 and $_ !~ /^(?:]*?| . + quotemeta($attribute) . qq|="([^"]+)"/ and write_i18n('| . $context . qq|', \$1, "| . $element . "\",\"" . $attribute . qq|");\n|; + } + + return "$code\n"; +} + +sub write_i18n +{ + my ($context, $text, $tag, $attr) = @_; + + our $file_name; + + unless ( $text ) + { + print "// Skipped empty message at $file_name line $.\n"; + return; + } + + $text =~ s/<//g; + $text =~ s/'/\'/g; + $text =~ s/"/\"/g; + $text =~ s/&/&/g; + + # Escape characters exactly like uic does it + # (As extractrc needs it, we follow the same rule to avoid to be different.) + $text =~ s/\\/\\\\/g; # escape \ + $text =~ s/\"/\\\"/g; # escape " + $text =~ s/\r//g; # remove CR (Carriage Return) + $text =~ s/\n/\\n\"\n\"/g; # escape LF (Line Feed). uic also change the code line at a LF, we do not do that. + + $context ||= $opt_context; + + (my $norm_fname = $file_name) =~ s/^\.\///; + print "//i18n: tag $tag attribute $attr\n"; + print "//i18n: file: $norm_fname:$.\n"; + if ( $context ) + { + print qq|i18nc("$context","$text");\n|; + } + else + { + print qq|i18n("$text");\n|; + } +} + diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/libexec/extract-messages.sh pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/extract-messages.sh --- pkg-kde-tools-0.15.21/kubuntu/lib/libexec/extract-messages.sh 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/extract-messages.sh 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,60 @@ +#! /bin/bash + +podir=${podir:-$PWD/po} +files=`find . -name Messages.sh | grep -v .pc` +dirs=`for i in $files; do echo \`dirname $i\`; done | sort -u` +tmpname="$PWD/messages.log" +EXTRACTRC=${EXTRACTRC:-extractrc} +EXTRACTATTR=${EXTRACTATTR:-extractattr} +EXTRACT_GRANTLEE_TEMPLATE_STRINGS=${EXTRACT_GRANTLEE_TEMPLATE_STRINGS:-grantlee_strings_extractor.py} +MSGCAT=${MSGCAT:-msgcat} +PREPARETIPS=${PREPARETIPS:-preparetips} +REPACKPOT=${REPACKPOT:-repack-pot.pl} +export EXTRACTRC EXTRACTATTR MSGCAT PREPARETIPS REPACKPOT EXTRACT_GRANTLEE_TEMPLATE_STRINGS +if [ "x$IGNORE" = "x" ]; then + IGNORE="/tests/" +else + IGNORE="$IGNORE +/tests/" +fi + +for subdir in $dirs; do + # skip Messages.sh files of KDevelop's app templates + grep '{APPNAMELC}[^ ]*.pot' $subdir/Messages.sh 1>/dev/null && continue + + test -z "$VERBOSE" || echo "Making messages in $subdir" + (cd $subdir + if find . -name \*.c\* -o -name \*.h\* | fgrep -v "$IGNORE" | xargs fgrep -s -q KAboutData ; then + echo 'i18nc("NAME OF TRANSLATORS","Your names");' >> rc.cpp + echo 'i18nc("EMAIL OF TRANSLATORS","Your emails");' >> rc.cpp + fi + + # using xgettext 0.15 or later + ### TODO what --flags param should be used? + XGETTEXT_FLAGS_QT="--from-code=UTF-8 -C --qt -ktr:1,1t -ktr:1,2c,2t -kQT_TRANSLATE_NOOP:1c,2,2t -kQT_TR_NOOP:1,1t -ktranslate:1c,2,2t -ktranslate:2,3c,3t" + XGETTEXT_FLAGS="--copyright-holder=This_file_is_part_of_KDE --from-code=UTF-8 -C --kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 -kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kI18N_NOOP2_NOSTRIP:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 --msgid-bugs-address=http://bugs.kde.org" + XGETTEXT_FLAGS_WWW="--copyright-holder=This_file_is_part_of_KDE --from-code=UTF-8 -L PHP -ki18n -ki18n_var -ki18n_noop --msgid-bugs-address=http://bugs.kde.org" + export XGETTEXT_FLAGS + export XGETTEXT_FLAGS_QT + export XGETTEXT_FLAGS_WWW + + if test -f Messages.sh; then + # Note: Messages.sh is supposed to get the translators' placeholder by rc.cpp + podir=$podir srcdir=. XGETTEXT_PROGRAM="${XGETTEXT:-xgettext}" XGETTEXT_QT="${XGETTEXT:-xgettext} $XGETTEXT_FLAGS_QT" XGETTEXT_WWW="${XGETTEXT:-xgettext} $XGETTEXT_FLAGS_WWW" XGETTEXT="${XGETTEXT:-xgettext} $XGETTEXT_FLAGS" bash Messages.sh + fi + exit_code=$? + if test "$exit_code" -ne 0; then + echo "Bash exit code: $exit_code" + else + rm -f rc.cpp + fi + ) >& $tmpname + test -s $tmpname && { echo $subdir ; cat "$tmpname"; } +done + +# # Repack extracted templates. +# for potfile in $podir/*.pot; do +# $REPACKPOT $potfile +# done + +rm -f $tmpname diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/libexec/extractrc pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/extractrc --- pkg-kde-tools-0.15.21/kubuntu/lib/libexec/extractrc 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/extractrc 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,461 @@ +#! /usr/bin/env perl + +### TODO: other copyrights, license? +# Copyright (c) 2004 Richard Evans + +sub usage +{ + warn <<"EOF"; + +extractrc [flags] filenames + +This script extracts messages from designer (.ui) and XMLGUI (.rc) files and +writes on standard output (usually redirected to rc.cpp) the equivalent +i18n() calls so that xgettext can parse them. + +--tag=name : Also extract the tag name(s). Repeat the flag to specify + multiple names: --tag=tag_one --tag=tag_two + +--tag-group=group : Use a group of tags - uses 'default' if omitted. + Valid groups are: @{[TAG_GROUPS()]} + +--context=name : Give i18n calls a context name: i18nc("name", ...) +--lines : Include source line numbers in comments (deprecated, it is switched on by default now) +--cstart=chars : Start of to-EOL style comments in output, defaults to // +--language=lang : Create i18n calls appropriate for KDE bindings + in the given language. Currently known languages: + C++ (default), Python +--ignore-no-input : Do not warn if there were no filenames specified +--help|? : Display this summary + +EOF + + exit; +} + +########################################################################################### + +use strict; +use warnings; +use Getopt::Long; +use Data::Dumper; + +use constant TAG_GROUP => +{ + default => "[tT][eE][xX][tT]|title|string|whatsthis|tooltip|label", + koffice => "Example|GroupName|Text|Comment|Syntax|TypeName", + none => "", +}; + +use constant TAG_GROUPS => join ", ", map "'$_'", sort keys %{&TAG_GROUP}; + +# Specification to extract nice element-context for strings. +use constant ECTX_SPEC => +{ + # Data structure: extension => {tag => [ctxlevel, [attribute, ...]], ...} + # Order of attributes determines their order in the extracted comment. + "ui" => { + "widget" => [10, ["class", "name"]], + "item" => [15, []], + "property" => [20, ["name"]], + "attribute" => [20, ["name"]], + }, + "rc" => { + "Menu" => [10, ["name"]], + "ToolBar" => [10, ["name"]], + }, + "kcfg" => { + "group" => [10, ["name"]], + "entry" => [20, ["name"]], + "whatsthis" => [30, []], + "tooltip" => [30, []], + "label" => [30, []], + }, +}; + +# Specification to exclude strings by trailing section of element-context. +use constant ECTX_EXCLUDE => +[ + # Data structure: [[tag, attribute, attrvalue], [...]] + # Empty ("") attribute means all elements with given tag, + # empty attrvalue means element with given tag and attribute of any value. + [["widget", "class", "KFontComboBox"], ["item", "", ""], ["property", "", ""]], + [["widget", "class", "KPushButton"], ["attribute", "name", "buttonGroup"]], + [["widget", "class", "QRadioButton"], ["attribute", "name", "buttonGroup"]], + [["widget", "class", "QToolButton"], ["attribute", "name", "buttonGroup"]], + [["widget", "class", "QCheckBox"], ["attribute", "name", "buttonGroup"]], + [["widget", "class", "QPushButton"], ["attribute", "name", "buttonGroup"]], + [["widget", "class", "KTimeZoneWidget"], ["property", "name", "text"]], +]; + +# The parts between the tags of the extensions will be copied verbatim +# Same data structure as in ECTX_EXCLUDE, but per extension. +my %EXTENSION_VERBATIM_TAGS = ( + "kcfg" => [["code", "", ""], ["default", "code", "true"], + ["min", "code", "true"], ["max", "code", "true"]], + ); + +# Add attribute lists as hashes, for membership checks. +for my $ext ( keys %{&ECTX_SPEC} ) { + for my $tag ( keys %{ECTX_SPEC->{$ext}} ) { + my $arr = ECTX_SPEC->{$ext}{$tag}[1]; + ECTX_SPEC->{$ext}{$tag}[2] = {map {$_ => 1} @{$arr}}; + } +} + +########################################################################################### +# Add options here as necessary - perldoc Getopt::Long for details on GetOptions + +GetOptions ( "tag=s" => \my @opt_extra_tags, + "tag-group=s" => \my $opt_tag_group, + "context=s" => \my $opt_context, # I18N context + "lines" => \my $opt_lines, + "cstart=s" => \my $opt_cstart, + "language=s" => \my $opt_language, + "ignore-no-input" => \my $opt_ignore_no_input, + "help|?" => \&usage ); + +unless( @ARGV ) +{ + warn "No filename specified" unless $opt_ignore_no_input; + exit; +} + +$opt_tag_group ||= "default"; + +die "Unknown tag group: '$opt_tag_group', should be one of " . TAG_GROUPS + unless exists TAG_GROUP->{$opt_tag_group}; + +my $tags = TAG_GROUP->{$opt_tag_group}; +my $extra_tags = join "", map "|" . quotemeta, @opt_extra_tags; +my $text_string = qr/($tags$extra_tags)( [^>]*)?>/; # Precompile regexp +my $cstart = $opt_cstart; # no default, selected by language if not given +my $language = $opt_language || "C++"; +my $ectx_known_exts = join "|", keys %{&ECTX_SPEC}; + +########################################################################################### + +# Unescape basic XML entities. +sub unescape_xml ($) { + my $text = shift; + + $text =~ s/<//g; + $text =~ s/&/&/g; + $text =~ s/"/"/g; + + return $text; +} + +# Convert uic to C escaping. +sub escape_uic_to_c ($) { + my $text = shift; + + $text = unescape_xml($text); + + $text =~ s/\\/\\\\/g; # escape \ + $text =~ s/\"/\\\"/g; # escape " + $text =~ s/\r//g; # remove CR (Carriage Return) + $text =~ s/\n/\\n\"\n\"/g; # escape LF (Line Feed). uic also change the code line at a LF, we do not do that. + + return $text; +} + +########################################################################################### + +sub dummy_call_infix { + my ($cstart, $stend, $ctxt, $text, @cmnts) = @_; + for my $cmnt (@cmnts) { + print qq|$cstart $cmnt\n|; + } + if (defined $text) { + $text = escape_uic_to_c($text); + if (defined $ctxt) { + $ctxt = escape_uic_to_c($ctxt); + print qq|i18nc("$ctxt", "$text")$stend\n|; + } else { + print qq|i18n("$text")$stend\n|; + } + } +} + +my %dummy_calls = ( + "C++" => sub { + dummy_call_infix($cstart || "//", ";", @_); + }, + "Python" => sub { + dummy_call_infix($cstart || "#", "", @_); + }, +); + +die "unknown language '$language'" if not defined $dummy_calls{$language}; +my $dummy_call = $dummy_calls{$language}; + +# Program start proper - NB $. is the current line number + +for my $file_name ( @ARGV ) +{ + my $fh; + + unless ( open $fh, "<", $file_name ) + { + # warn "Failed to open: '$file_name': $!"; + next; + } + + # Ready element-context extraction. + my $ectx_ext; + my $ectx_string; + if ( $file_name =~ /\.($ectx_known_exts)(\.(in|cmake))?$/ ) { + $ectx_ext = $1; + my $ectx_tag_gr = join "|", keys %{ECTX_SPEC->{$ectx_ext}}; + $ectx_string = qr/($ectx_tag_gr)( [^>]*)?>/; # precompile regexp + } + + my $string = ""; + my $origstring = ""; + my $in_text = 0; + my $start_line_no = 0; + my $in_skipped_prop = 0; + my $tag = ""; + my $attr = ""; + my $context = ""; + my $notr = ""; + + # Element-context data: [[level, tag, [[attribute, value], ...]], ...] + # such that subarrays are ordered increasing by level. + my @ectx = (); + + # All comments to pending dummy call. + my @comments = (); + + while ( <$fh> ) + { + if ( $. == 1 and $_ !~ /^(?:{$ectx_ext}{$tag} ) + { + my @atts; + for my $ectx_att ( @{ECTX_SPEC->{$ectx_ext}{$tag}[1]} ) + { + if ( $attr and $attr =~ /\b$ectx_att\s*=\s*(["'])([^"']*?)\1/ ) + { + my $aval = $2; + push @atts, [$ectx_att, $aval]; + } + } + # Kill all tags in element-context with level higer or equal to this, + # and add it to the end. + my $clevel = ECTX_SPEC->{$ectx_ext}{$tag}[0]; + for ( my $i = 0; $i < @ectx; ++$i ) + { + if ( $clevel <= $ectx[$i][0] ) + { + @ectx = @ectx[0 .. ($i - 1)]; + last; + } + } + push @ectx, [$clevel, $tag, [@atts]]; + } + + if ( ($tag, $attr) = $string =~ /<$text_string/o ) + { + my ($attr_comment) = $attr =~ /\bcomment=\"([^\"]*)\"/ if $attr; + $context = $attr_comment if $attr_comment; + my ($attr_context) = $attr =~ /\bcontext=\"([^\"]*)\"/ if $attr; + $context = $attr_context if $attr_context; + # It is unlikely that both attributes 'context' and 'comment' + # will be present, but if so happens, 'context' has priority. + my ($attr_extracomment) = $attr =~ /\bextracomment=\"([^\"]*)\"/ if $attr; + push @comments, "i18n: $attr_extracomment" if $attr_extracomment; + + my ($attr_notr) = $attr =~ /\bnotr=\"([^\"]*)\"/ if $attr; + $notr = $attr_notr if $attr_notr; + + my $nongreedystring = $string; + $string =~ s/^.*<$text_string//so; + $nongreedystring =~ s/^.*?<$text_string//so; + if ($string cmp $nongreedystring) + { + print STDERR "Warning: Line $origstring in file $file_name has more than one tag to extract on the same line, that is not supported by extractrc\n"; + } + if ( not $attr or $attr !~ /\/ *$/ ) + { + $in_text = 1; + $start_line_no = $.; + } + } + else + { + @comments = (); + $string = ""; + } + } + + next unless $in_text; + next unless $string =~ /<\/$text_string/o; + + my $text = $string; + $text =~ s/<\/$text_string.*$//o; + + if ( $text cmp "" ) + { + # See if the string should be excluded by trailing element-context. + my $exclude_by_ectx = 0; + my @rev_ectx = reverse @ectx; + for my $ectx_tail (@{&ECTX_EXCLUDE}) + { + my @rev_ectx_tail = reverse @{$ectx_tail}; + my $i = 0; + $exclude_by_ectx = (@rev_ectx > 0 and @rev_ectx_tail > 0); + while ($i < @rev_ectx and $i < @rev_ectx_tail) + { + my ($tag, $attr, $aval) = @{$rev_ectx_tail[$i]}; + $exclude_by_ectx = (not $tag or ($tag eq $rev_ectx[$i][1])); + if ($exclude_by_ectx and $attr) + { + $exclude_by_ectx = 0; + for my $ectx_attr_aval (@{$rev_ectx[$i][2]}) + { + if ($attr eq $ectx_attr_aval->[0]) + { + $exclude_by_ectx = $aval ? $aval eq $ectx_attr_aval->[1] : 1; + last; + } + } + } + last if not $exclude_by_ectx; + ++$i; + } + last if $exclude_by_ectx; + } + + if (($context and $context eq "KDE::DoNotExtract") or ($notr eq "true")) + { + push @comments, "Manually excluded message at $file_name line $."; + } + elsif ( $exclude_by_ectx ) + { + push @comments, "Automatically excluded message at $file_name line $."; + } + else + { + (my $norm_fname = $file_name) =~ s/^\.\///; + push @comments, "i18n: file: $norm_fname:$."; + if ( @ectx ) { + # Format element-context. + my @tag_gr; + for my $tgr (reverse @ectx) + { + my @attr_gr; + for my $agr ( @{$tgr->[2]} ) + { + #push @attr_gr, "$agr->[0]=$agr->[1]"; + push @attr_gr, "$agr->[1]"; # no real nead for attribute name + } + my $attr = join(", ", @attr_gr); + push @tag_gr, "$tgr->[1] ($attr)" if $attr; + push @tag_gr, "$tgr->[1]" if not $attr; + } + my $ectx_str = join ", ", @tag_gr; + push @comments, "i18n: ectx: $ectx_str"; + } + push @comments, "xgettext: no-c-format" if $text =~ /%/o; + $dummy_call->($context, $text, @comments); + @comments = (); + } + } + else + { + push @comments, "Skipped empty message at $file_name line $."; + } + + $string =~ s/^.*<\/$text_string//o; + $in_text = 0; + + # Text can be multiline in .ui files (possibly), but we warn about it in XMLGUI .rc files. + + warn "there is floating in: '$file_name'" if $. != $start_line_no and $file_name =~ /\.rc$/i; + } + + close $fh or warn "Failed to close: '$file_name': $!"; + + die "parsing error in $file_name" if $in_text; + + if ($ectx_ext && exists $EXTENSION_VERBATIM_TAGS{$ectx_ext}) + { + unless ( open $fh, "<", $file_name ) + { + # warn "Failed to open: '$file_name': $!"; + next; + } + + while ( <$fh> ) + { + chomp; + $string .= "\n" . $_; + + for my $elspec (@{ $EXTENSION_VERBATIM_TAGS{$ectx_ext} }) + { + my ($tag, $attr, $aval) = @{$elspec}; + my $rx; + if ($attr and $aval) { + $rx = qr/<$tag[^<]*$attr=["']$aval["'][^<]*>(.*)<\/$tag>/s + } elsif ($attr) { + $rx = qr/<$tag[^<]*$attr=[^<]*>(.*)<\/$tag>/s + } else { + $rx = qr/<$tag>(.*)<\/$tag>/s + } + if ($string =~ $rx) + { + # Add comment before any line that has an i18n substring in it. + my @matched = split /\n/, $1; + my $mlno = $.; + (my $norm_fname = $file_name) =~ s/^\.\///; + for my $mline (@matched) { + # Assume verbatim code is in language given by --language. + # Therefore format only comment, and write code line as-is. + if ($mline =~ /i18n/) { + $dummy_call->(undef, undef, ("i18n: file: $norm_fname:$mlno")); + } + $mline = unescape_xml($mline); + print "$mline\n"; + ++$mlno; + } + $string = ""; + } + } + } + + close $fh or warn "Failed to close: '$file_name': $!"; + } +} diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/libexec/extract-xml.sh pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/extract-xml.sh --- pkg-kde-tools-0.15.21/kubuntu/lib/libexec/extract-xml.sh 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/extract-xml.sh 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,51 @@ +#! /bin/bash + +podir=${podir:-$PWD/po} +files=`find . -name XmlMessages.sh` +dirs=`for i in $files; do echo \`dirname $i\`; done | sort -u` +tmpname="$PWD/messages.log" +INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT:-intltool-extract} +INTLTOOL_FLAGS=-q +test -z "$VERBOSE" || INTLTOOL_FLAGS= +XGETTEXT=${XGETTEXT:-xgettext} +# using xgettext 0.15 or later +### TODO what --flags param should be used? +XGETTEXT_FLAGS="--copyright-holder=This_file_is_part_of_KDE --from-code=UTF-8 -C --kde --msgid-bugs-address=http://bugs.kde.org" +export INTLTOOL_EXTRACT XGETTEXT XGETTEXT_FLAGS + +for subdir in $dirs; do + test -z "$VERBOSE" || echo "Making XML messages in $subdir" + (cd $subdir + + if test -f XmlMessages.sh; then + xml_po_list=`bash -c ". XmlMessages.sh ; get_files"` + for xml_file_relpath in $xml_po_list; do + xml_file_po=`bash -c ". XmlMessages.sh ; po_for_file $xml_file_relpath"` + xml_podir=${xml_file_relpath}.podir + xml_in_file=$xml_podir/`basename $xml_file_relpath`.in + if [ ! -e $xml_podir ]; then + mkdir $xml_podir + cat $xml_file_relpath | sed -e 's/.*lang=.*//g' | sed -r -e 's/(\<\/?)comment(\>)/\1_comment\2/g' > $xml_in_file + if test -s $xml_in_file ; then + $INTLTOOL_EXTRACT $INTLTOOL_FLAGS --type='gettext/xml' $xml_in_file + $XGETTEXT $XGETTEXT_FLAGS --keyword=N_ -o $podir/${xml_file_po}t ${xml_in_file}.h + else + echo "Empty preprocessed XML file: $xml_in_file !" + fi + rm -rf $xml_podir + else + echo "$xml_podir exists!" + fi + done + fi + exit_code=$? + if test "$exit_code" -ne 0; then + echo "Bash exit code: $exit_code" + else + rm -f rc.cpp + fi + ) >& $tmpname + test -s $tmpname && { echo $subdir ; cat "$tmpname"; } +done + +rm -f $tmpname diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/libexec/finddesktopfiles pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/finddesktopfiles --- pkg-kde-tools-0.15.21/kubuntu/lib/libexec/finddesktopfiles 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/finddesktopfiles 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,21 @@ +#!/bin/bash + +# Find all desktop file styled translatable files. +# This is somewhat based on KDE's findfiles script (in particular the find call). +# +# http://websvn.kde.org/trunk/l10n-kde4/scripts/findfiles?view=log + +if test -z "$1"; then + echo "call: $0 " + exit +fi + +filelist=$1 + +rm -f "$filelist"_* $filelist + +: > $filelist + +find $dir \( -name \*.directory -o -name \*.desktop -o -name \*.desktop.cmake -o -name \*.kimap -o -name \*.themerc -o -name \*.kcsrc -o -name \*.setdlg -o -name index.theme -o -name \*.notifyrc -o -name \*.protocol -o -name \*.profile -o -name \*.actions \) -a \( -type f -o -type l \) >> $filelist + +sort -o $filelist -u $filelist diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/libexec/msgsplit pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/msgsplit --- pkg-kde-tools-0.15.21/kubuntu/lib/libexec/msgsplit 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/msgsplit 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,168 @@ +#! /usr/bin/env python + +import sys, string, codecs, os + +# TODO: currently the 78 chars are *without* the quotes, while for Gettext it is *with* the quotes +# FIXME: it seems possible to get lines bigger than 80 characters. +max_length = 78 + +wrap_before = ['

', '

', '

', '

', '

', '
', '

', '
', '
', + '

    ', '
      ', '
    • ', '', '', '
      ', '
      ', '
      ', + '
      ', '
      ', '
      ', '
      '] + +### TODO: try to support any charset, not only UTF-8 (so that it can be used outside KDE) + +def splitit( start, message, outfile ): + # print start+"\""+message+"\"" # DEBUG + if len(start): + if len(message) + len(start) < max_length and \ + string.find(message, '\\n') == -1: + outstr = '%s"%s"\n' % (start, message) + outfile.write(outstr.encode('utf-8')) + return + outfile.write(start) + outfile.write(u'""\n') + index = 0 + mlen = len(message) + last_brace = 0 + last_space = 0 + last_comma = 0 + while index < mlen: + if message[index] == r'n' and (index > 0 and message[index-1] == '\\') \ + and (index < 2 or message[index-2] != '\\'): + outstr = '"%s"\n' % message[:index+1] + outfile.write(outstr.encode('utf-8')) + message = message[index+1:] + mlen -= index + 1 + index = 0 + last_brace = 0 + last_space = 0 + last_comma = 0 + continue + elif message[index] == u'>': + last_brace = index + elif message[index] == u' ': + last_space = index + elif message[index] == u',': + last_comma = index + elif message[index] == u'<': + for s in wrap_before: + if index > 0 and message[index:].startswith(s): + outstr = '"%s"\n' % message[:index] + outfile.write(outstr.encode('utf-8')) + message = message[index:] + mlen -= index + index = 0 + last_brace = 0 + last_space = 0 + last_comma = 0 + continue + if index > max_length: + if last_brace > 50: + index = last_brace + while index < mlen - 1 and message[index+1] == ' ': + index += 1 + elif last_space != 0: + index = last_space + elif last_comma != 0: + index = last_comma + else: + while index > 0 and message[index] == u'\\': + index = index - 1 + outstr = '"%s"\n' % message[:index+1] + outfile.write(outstr.encode('utf-8')) + message = message[index+1:] + mlen -= index + 1 + index = 0 + last_brace = 0 + last_space = 0 + last_comma = 0 + continue + index += 1 + if len(message): + outstr = '"%s"\n' % message + outfile.write(outstr.encode('utf-8')) + +if sys.hexversion >= 0x02030000: + # We have Python 2.3 or better + open_type="rU" # Open for read with "Universal Newline Support" +else: + # We have a Python older than 2.3 + open_type="r" # Normal open for read +### TODO: even in the case of a parse error, the script could try to process the next file(s) instead of exiting. +for file in sys.argv[1:]: + orig_file = open(file, open_type) + new_file = open(file + ".new", 'w') + + last='' + start='' + index=0 + line=' ' + while 1: # python 2.1 has no True ;) + line = orig_file.readline() + index += 1 + if not line: + break + if line == '\n' or line[0] == '#': + splitit(start, last, new_file) + start = '' + last = '' + new_file.write(line) + continue + try: + line = string.strip(unicode(line, 'utf-8')) + except UnicodeError: + print file + if line[0] == '"' and line[-1:] == '"': + last += line[1:-1] + continue + # new message + splitit(start, last, new_file) + if line.startswith("msgid "): + start = "msgid " + last = string.lstrip(line[6:-1])[1:] + elif line.startswith("msgstr "): + start = "msgstr " + last = string.lstrip(line[7:-1])[1:] + elif line.startswith("msgctxt "): + start = "msgctxt " + last = string.lstrip(line[8:-1])[1:] + elif line.startswith("msgid_plural "): + start = "msgid_plural " + last = string.lstrip(line[13:-1])[1:] + elif line.startswith("msgstr["): + # For most languages, there will be only one digit + if line[8] == "]" and line[9] == " ": + if line[7].isdigit(): + start = line[:10] + last = string.lstrip(line[10:-1])[1:] + else: + print file, "not-a-digit error for mgstr[] in line", index + orig_file.close() + new_file.close() + sys.exit(1) + else: + posdigit = 7 # The first digit is at position 7 + while line[posdigit].isdigit(): + posdigit += 1 + if posdigit > 7 and line[posdigit] == "]" and line[posdigit+1] == " ": + posdigit += 2 # skip ] and the space + start = line[:posdigit] + last = string.lstrip(line[posdigit:-1])[1:] + else: + print file, "parse error after msgstr[ in line", index + orig_file.close() + new_file.close() + sys.exit(1) + else: + print file, "parsing error in line", index, line + orig_file.close() + new_file.close() + sys.exit(1) + + splitit(start, last, new_file) + orig_file.close() + new_file.close() + os.rename(file + ".new", file) + +# kate: space-indent off; indent-width 8; replace-tabs off; diff -Nru pkg-kde-tools-0.15.21/kubuntu/lib/libexec/preparetips pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/preparetips --- pkg-kde-tools-0.15.21/kubuntu/lib/libexec/preparetips 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/kubuntu/lib/libexec/preparetips 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,66 @@ +#! /usr/bin/perl +# little script to extract the text from the tips file +# and output it, so xgettext can add the tips to the po file +# +# 2000 by Matthias Kiefer + +# IMPORTANT NOTE: Do not change the output without checking if +# translations still work! + +sub printText +{ + my $text = $_[0]; + + if ( $text cmp "" ) + { + + # replace \ with \\ + $text =~ s/\\/\\\\/g; + + # replace " with \" + $text =~ s/"/\\"/g; + + print "\"$text\\n\"\n"; + } +} + +open(FILE,"<","tips") or die "unable to open tips file"; +if ( $^V ge v5.8.0 ) +{ + binmode(FILE,":utf8"); + binmode(STDOUT,":utf8"); +} + +$inTip=0; + +while() +{ + chomp; + + # tip starts with + if(/^\s*(.*)/io) + { + $inTip=1; + print "// i18n: file: tips:$.\n// i18n: ectx: \@info:tipoftheday\n"; + print "i18n("; + printText($1); + next; + } + + if($inTip!=0) + { + # tip ends with + if(/^(.*)\s*<\/html>/io) + { + printText($1); + print ");\n\n"; + $inTip=0; + } + else + { + printText($_); + } + } +} + +close(FILE); diff -Nru pkg-kde-tools-0.15.21/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm pkg-kde-tools-0.15.24ubuntu2~ppa1/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm --- pkg-kde-tools-0.15.21/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm 2017-02-10 15:25:04.000000000 +0000 @@ -238,7 +238,6 @@ my $pid = spawn(exec => [ "patch", "--posix", "--force", "-r-", "-p0" ], from_pipe => \$to_patch_process, to_handle => $outfile, - error_to_handle => $outfile, wait_child => 0 ); my $ret = $self->output($to_patch_process, $filename); diff -Nru pkg-kde-tools-0.15.21/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm pkg-kde-tools-0.15.24ubuntu2~ppa1/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm --- pkg-kde-tools-0.15.21/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm 2017-02-10 15:25:04.000000000 +0000 @@ -297,6 +297,25 @@ return ($arch =~ /^(arm|armeb|armel|armhf|sh4)$/) ? 'f' : 'd'; } +package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::long_double; + +use strict; +use warnings; +use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst'; + +sub new { + my $class = shift; + my $self = $class->SUPER::new(@_); + $self->{substvar} = "{long_double}"; + $self->{types} = [ qw(e g) ]; # native long double / __float128 + return $self; +} + +sub _expand { + my ($self, $arch) = @_; + return ($arch =~ /^(alpha|powerpc|powerpcspe|ppc64|ppc64el|s390x)$/) ? 'g' : 'e'; +} + package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::time_t; use strict; diff -Nru pkg-kde-tools-0.15.21/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm pkg-kde-tools-0.15.24ubuntu2~ppa1/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm --- pkg-kde-tools-0.15.21/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm 2017-02-10 15:25:04.000000000 +0000 @@ -36,6 +36,7 @@ "${NS}::TypeSubst::quintptr"->new(), "${NS}::TypeSubst::intptr_t"->new(), "${NS}::TypeSubst::qreal"->new(), + "${NS}::TypeSubst::long_double"->new(), "${NS}::TypeSubst::time_t"->new(), ); diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/1/debian-qt-kde.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/1/debian-qt-kde.mk --- pkg-kde-tools-0.15.21/qt-kde-team/1/debian-qt-kde.mk 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/1/debian-qt-kde.mk 2017-02-10 15:25:04.000000000 +0000 @@ -31,7 +31,7 @@ # breakage in the old packaging (esp. kde4libs). DEB_CMAKE_KDE4_FLAGS += \ -DKDE4_BUILD_TESTS=false \ - -DKDE_DISTRIBUTION_TEXT="Debian packages" \ + -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DKDE4_USE_ALWAYS_FULL_RPATH=false \ -DCONFIG_INSTALL_DIR=/usr/share/kde4/config \ @@ -48,11 +48,6 @@ # Add support for pkgkde-symbolshelper by default include $(DEB_PKG_KDE_MAKEFILES)/cdbs/symbolshelper.mk -# Since cmake 2.6.2 or higher is required from now on, enable -# relative paths to get more ccache hits. -# NOTE: might not work with vanilla 2.6.2, only with Debian's one. -DEB_CMAKE_KDE4_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON - # Pass standard KDE 4 flags to cmake via appropriate CDBS variable # (DEB_CMAKE_EXTRA_FLAGS) DEB_CMAKE_EXTRA_FLAGS += $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS) diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/2/debian-qt-kde.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/debian-qt-kde.mk --- pkg-kde-tools-0.15.21/qt-kde-team/2/debian-qt-kde.mk 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/debian-qt-kde.mk 2017-02-10 15:25:04.000000000 +0000 @@ -24,6 +24,9 @@ # Support list-missing target include $(dqk_dir)list-missing.mk +# Support lintian target +include $(dqk_dir)lintian.mk + # KDE packages are parallel safe. Add --parallel to dh_auto_% commands $(call set_command_options,dh_auto_%, += --parallel) @@ -52,10 +55,6 @@ endif endif -# Since cmake 2.6.2 or higher is required from now on, enable relative paths to -# get more ccache hits. -$(call set_command_options,dh_auto_configure, += "-u-DCMAKE_USE_RELATIVE_PATHS=ON") - # Run dh_sameversiondep run_dh_sameversiondep: dh_sameversiondep @@ -97,6 +96,8 @@ fi $(foreach t,install-indep install,post_$(t)_dh_install): install_to_doc-html_package +post_binary: list-missing lintian + .PHONY: run_dh_sameversiondep cleanup_manpages install_to_doc-html_package endif # ifneq ($(dhmk_override_info_mode),yes) diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/2/l10n-packages.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/l10n-packages.mk --- pkg-kde-tools-0.15.21/qt-kde-team/2/l10n-packages.mk 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/l10n-packages.mk 2017-02-10 15:25:03.000000000 +0000 @@ -8,7 +8,7 @@ l10npkgs_prefix := kde-l10n l10npkgs_fixed_version_comma := (<< $(l10npkgs_firstversion_ok)), -l10npkgs_langs := ar bg bs ca cavalencia cs da de el engb es et eu fa fi fr ga gl he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt ptbr ro ru sk sl sr sv tr ug uk wa zhcn zhtw +l10npkgs_langs := ar bg bs ca ca-valencia cs da de el engb eo es et eu fa fi fr ga gl he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt ptbr ro ru sk sl sr sv tr ug uk wa zhcn zhtw l10npkgs_packages_rels := $(patsubst %,$(l10npkgs_prefix)-% $(l10npkgs_fixed_version_comma),$(l10npkgs_langs)) l10npkgs_firstversion_ok: diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/2/lintian.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/lintian.mk --- pkg-kde-tools-0.15.21/qt-kde-team/2/lintian.mk 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/lintian.mk 2017-02-10 15:25:03.000000000 +0000 @@ -0,0 +1,28 @@ +# Copyright © 2013 Philip Muskovac +# Description: Defines a lintian rule that prints the lintian messages. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +ifdef dqk_dir + +lintian: + dpkg-genchanges > ../.pkg-kde-lintian.changes + @echo "=== Start lintian" + @-lintian ../.pkg-kde-lintian.changes + @echo "=== End lintian" + rm ../.pkg-kde-lintian.changes + +.PHONY: lintian + +endif diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/2/list-missing.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/list-missing.mk --- pkg-kde-tools-0.15.21/qt-kde-team/2/list-missing.mk 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/list-missing.mk 2017-02-10 15:25:03.000000000 +0000 @@ -20,6 +20,7 @@ list-missing: @if test -d debian/tmp; then \ + echo "=== Start list-missing"; \ (cd debian/tmp && find . -type f -o -type l | grep -v '/DEBIAN/' | sort) > debian/dhmk-install-list; \ (for package in $(shell dh_listpackages); do \ (cd debian/$$package && find . -type f -o -type l); \ @@ -27,7 +28,10 @@ test -e debian/not-installed && grep -v '^#' debian/not-installed; \ ) | sort -u > debian/dhmk-package-list; \ diff -u debian/dhmk-install-list debian/dhmk-package-list | sed '1,2d' | egrep '^-' || true; \ + echo "=== End list-missing"; \ else \ + echo "=== Start list-missing"; \ + echo "=== End list-missing"; \ echo "All files were installed into debian/$(shell dh_listpackages | head -n1)."; \ fi diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/2/policy.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/policy.mk --- pkg-kde-tools-0.15.21/qt-kde-team/2/policy.mk 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/2/policy.mk 2017-02-10 15:25:03.000000000 +0000 @@ -4,8 +4,6 @@ dqk_disable_policy_check ?= dqk_distribution := $(shell dpkg-parsechangelog | sed -n '/^Distribution:/{ s/^Distribution:[[:space:]]*//g; p; q }') dqk_kde_major_version := $(shell echo "$(dqk_upstream_version)" | cut -d. -f1-2) -dqk_maintainer_check := $(shell grep -e '^Maintainer:.*[[:space:]]*$$' \ - -e '^XSBC-Original-Maintainer:.*[[:space:]]*$$' debian/control) # Distribution-specific policy file may not exist. It is fine ifeq (,$(filter $(dqk_distribution),$(dqk_disable_policy_check))) @@ -15,13 +13,4 @@ endif endif -# Reject packages not maintained by Debian Qt/KDE Maintainers -ifeq (,$(dqk_maintainer_check)) - $(info ### debian_qt_kde.mk can only be used with packages (originally) maintained by) - $(info ### Debian Qt/KDE Maintainers, please read /usr/share/pkg-kde-tools/qt-kde-team/README) - $(info ### for more details. Please read /usr/share/doc/pkg-kde-tools/README.Debian for more) - $(info ### information on how to use pkg-kde-tools with other KDE packages.) - $(error debian_qt_kde.mk usage denied by policy.) -endif - endif diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/3/debian-qt-kde.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/3/debian-qt-kde.mk --- pkg-kde-tools-0.15.21/qt-kde-team/3/debian-qt-kde.mk 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/3/debian-qt-kde.mk 2017-02-10 15:25:03.000000000 +0000 @@ -24,6 +24,9 @@ # Support list-missing target include $(dqk_dir)list-missing.mk +# Support lintian target +include $(dqk_dir)lintian.mk + # KDE packages are parallel safe. Add --parallel to dh_auto_% commands $(call set_command_options,dh_auto_%, += --parallel) @@ -93,7 +96,7 @@ fi $(foreach t,install-indep install,post_$(t)_dh_install): install_to_doc-html_package -post_binary: list-missing +post_binary: list-missing lintian .PHONY: run_dh_sameversiondep cleanup_manpages install_to_doc-html_package diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/3/lintian.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/3/lintian.mk --- pkg-kde-tools-0.15.21/qt-kde-team/3/lintian.mk 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/3/lintian.mk 2017-02-10 15:25:04.000000000 +0000 @@ -0,0 +1,28 @@ +# Copyright © 2013 Philip Muskovac +# Description: Defines a lintian rule that prints the lintian messages. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +ifdef dqk_dir + +lintian: + -dpkg-genchanges > ../.pkg-kde-lintian.changes + @echo "=== Start lintian" + @-lintian ../.pkg-kde-lintian.changes + @echo "=== End lintian" + rm -f ../.pkg-kde-lintian.changes + +.PHONY: lintian + +endif diff -Nru pkg-kde-tools-0.15.21/qt-kde-team/3/policy.mk pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/3/policy.mk --- pkg-kde-tools-0.15.21/qt-kde-team/3/policy.mk 2016-05-08 08:38:28.000000000 +0000 +++ pkg-kde-tools-0.15.24ubuntu2~ppa1/qt-kde-team/3/policy.mk 2017-02-10 15:25:03.000000000 +0000 @@ -4,8 +4,6 @@ dqk_disable_policy_check ?= dqk_distribution := $(shell dpkg-parsechangelog | sed -n '/^Distribution:/{ s/^Distribution:[[:space:]]*//g; p; q }') dqk_kde_major_version := $(shell echo "$(dqk_upstream_version)" | cut -d. -f1-2) -dqk_maintainer_check := $(shell grep -e '^Maintainer:.*[[:space:]]*$$' \ - -e '^XSBC-Original-Maintainer:.*[[:space:]]*$$' debian/control) # Distribution-specific policy file may not exist. It is fine ifeq (,$(filter $(dqk_distribution),$(dqk_disable_policy_check))) @@ -15,13 +13,4 @@ endif endif -# Reject packages not maintained by Debian Qt/KDE Maintainers -ifeq (,$(dqk_maintainer_check)) - $(info ### debian_qt_kde.mk can only be used with packages (originally) maintained by) - $(info ### Debian Qt/KDE Maintainers, please read /usr/share/pkg-kde-tools/qt-kde-team/README) - $(info ### for more details. Please read /usr/share/doc/pkg-kde-tools/README.Debian for more) - $(info ### information on how to use pkg-kde-tools with other KDE packages.) - $(error debian_qt_kde.mk usage denied by policy.) -endif - endif