lp:~mitya57/ubuntu/saucy/pkg-kde-tools/merge

Created by Dmitry Shachnev and last modified
Get this branch:
bzr branch lp:~mitya57/ubuntu/saucy/pkg-kde-tools/merge
Only Dmitry Shachnev can upload to this branch. If you are Dmitry Shachnev please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Dmitry Shachnev
Status:
Merged

Recent revisions

92. By Dmitry Shachnev

Add changelog entry

91. By Dmitry Shachnev

Merge lp:debian/pkg-kde-tools

90. By Philip Muškovac

Re-enable lintian but only recommend it

89. By Philip Muškovac

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

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

87. By Scott Kitterman

* 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

* 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

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

84. By Harald Sitter

Add python as dep of pkg-kde-tools.
upstream's msgsplit script for l10n uses python

83. By Harald Sitter

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

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/saucy/pkg-kde-tools
This branch contains Public information 
Everyone can see this information.

Subscribers