kubuntu-packaging

Merge lp:~apachelogger/kubuntu-packaging/pykde4-no-kdepimlibs into lp:~kubuntu-packagers/kubuntu-packaging/pykde4

  1. pykde4-no-kdepimlibs
  2. Merge into pykde4
Proposed by Harald Sitter
Status: Merged
Merged at revision: 167
Proposed branch: lp:~apachelogger/kubuntu-packaging/pykde4-no-kdepimlibs
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/pykde4
Diff against target: 29 lines (+10/-1)
2 files modified
debian/changelog (+9/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~apachelogger/kubuntu-packaging/pykde4-no-kdepimlibs
Reviewer Review Type Date Requested Status
Scott Kitterman Pending
Review via email: mp+268193@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-08-17 08:21:24 +0000
3+++ debian/changelog 2015-08-17 08:24:43 +0000
4@@ -1,3 +1,12 @@
5+pykde4 (4:4.14.2-0ubuntu4) UNRELEASED; urgency=medium
6+
7+ * Build without kdepimlibs5-dev present to facilitate the kdepim frameworks
8+ 5 transition. kdepimlibs as of KDE Applications 15.08 will be frameworks
9+ based and not co-installable with the old libs (due to data files).
10+ Disable the pimlibs in pykde4.
11+
12+ -- Harald Sitter <sitter@kde.org> Mon, 17 Aug 2015 10:21:55 +0200
13+
14 pykde4 (4:4.14.2-0ubuntu3) wily; urgency=medium
15
16 * Unversioned boost build dependency
17
18=== modified file 'debian/control'
19--- debian/control 2015-08-17 08:21:24 +0000
20+++ debian/control 2015-08-17 08:24:43 +0000
21@@ -5,7 +5,7 @@
22 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
23 Build-Depends:
24 debhelper (>= 7.3), cmake, pkg-kde-tools (>= 0.12),
25- kdelibs5-dev (>= 4:4.14.2), kdepimlibs5-dev (>= 4:4.14.2),
26+ kdelibs5-dev (>= 4:4.14.2),
27 libphonon-dev (>= 4:4.6.0really4.4.4), libsoprano-dev (>= 2.7.0),
28 libqt4-dev (>= 4:4.7.1), libqt4-opengl-dev (>= 4:4.7.1), libqtwebkit-dev,
29 libboost-dev,

Subscribers

People subscribed via source and target branches