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

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/wily/pkg-kde-tools

Daniel Holbach (community): Approve on 2015-10-05

Diff: 54 lines (+35/-1)

2 files modified

debian/changelog (+31/-0)
pkgkde-gensymbols (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

102. By Artur Rona on 2015-08-16

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

101. By Artur Rona on 2015-07-16

* 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.

100. By Harald Sitter on 2015-06-01

* 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...

99. By Harald Sitter on 2015-05-15

* 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

98. By Harald Sitter on 2015-02-16

* 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

97. By Dmitry Shachnev on 2015-01-27

* 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

96. By Rohan Garg on 2014-09-02

* 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

95. By Rohan Garg on 2014-05-27

Drop xz.pm and lzma.pm, dpkg >= 1.17.0 has xz compression by default

94. By Rohan Garg on 2014-05-08

* 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

93. By Dmitry Shachnev on 2014-01-15

* 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.