Merge lp://staging/~ari-tczew/ubuntu/wily/pkg-kde-tools/merge into lp://staging/ubuntu/wily/pkg-kde-tools
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~ari-tczew/ubuntu/wily/pkg-kde-tools/merge |
| Merge into: | lp://staging/ubuntu/wily/pkg-kde-tools |
| Diff against target: |
54 lines (+35/-1) 2 files modified
debian/changelog (+31/-0) pkgkde-gensymbols (+4/-1) |
| To merge this branch: | bzr merge lp://staging/~ari-tczew/ubuntu/wily/pkg-kde-tools/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
| Daniel Holbach (dholbach) wrote | # |
Unmerged revisions
- 102. By Artur Rona
-
* 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.
Thanks. Uploaded.