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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/trusty/pkg-kde-tools at revision 93

Daniel Holbach (community): Approve on 2014-01-23

Diff: 140 lines (+61/-8)

3 files modified

debian/changelog (+52/-0)
debian/control (+2/-1)
perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm (+7/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

94. By Dmitry Shachnev on 2014-01-15

Don't close the old bug again

93. By Dmitry Shachnev on 2014-01-03

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

92. By William Grant on 2013-10-13

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

91. By Dmitry Shachnev on 2013-09-03

* 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

90. By Philip Muškovac on 2013-07-16

Re-enable lintian but only recommend it

89. By Philip Muškovac on 2013-07-16

Remove lintian dependency from pkg-kde-tools as it's too heavy and don't
run the lintian target in debian-qt-kde.mk

88. By Philip Muškovac on 2013-06-17

qt-kde-team/*/debian-qt-kde.mk uses docbook-to-man, so depend on it

87. By Scott Kitterman on 2013-05-22

* 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

86. By Jonathan Riddell on 2013-05-05

* 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

85. By Jonathan Riddell on 2013-03-28

In extract-messages.sh don't include .pc directories from quilt