kdelibs

Merge lp:~debfx/kdelibs/ubuntu into lp:~kubuntu-packagers/kubuntu-packaging/kdelibs

  1. ubuntu
  2. Merge into kdelibs
Proposed by Felix Geyer on 2010-05-22
Status: Merged
Merged at revision: 217
Proposed branch: lp:~debfx/kdelibs/ubuntu
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kdelibs
Diff against target: 35 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~debfx/kdelibs/ubuntu

Description of the Change

Add libqt4-webkit-dev to build-deps and kdelibs5-dev dependencies.

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 2010-05-18 21:44:30 +0000
3+++ debian/changelog 2010-05-22 16:16:28 +0000
4@@ -1,3 +1,9 @@
5+kde4libs (4:4.4.3a-2ubuntu3) maverick; urgency=low
6+
7+ * Add libqt4-webkit-dev to build-deps and kdelibs5-dev dependencies.
8+
9+ -- Felix Geyer <debfx-pkg@fobos.de> Sat, 22 May 2010 18:00:58 +0200
10+
11 kde4libs (4:4.4.3a-2ubuntu2) maverick; urgency=low
12
13 * Make libknewstuff3-4 replace older versions of kdelibs5. Can be removed
14
15=== modified file 'debian/control'
16--- debian/control 2010-05-18 21:42:47 +0000
17+++ debian/control 2010-05-22 16:16:28 +0000
18@@ -6,7 +6,7 @@
19 Uploaders: Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Armin Berres <armin+debian@space-based.de>, Modestas Vainius <modax@debian.org>, George Kiagiadakis <gkiagiad@csd.uoc.gr>
20 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), quilt, cmake (>= 2.6.3), pkg-kde-tools (>= 0.6.2~), po-debconf,
21 shared-mime-info (>= 0.30), dpkg-dev (>= 1.15.3), libphonon-dev (>= 4:4.6.2),
22- libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4:4.6.0), libqt4-opengl-dev (>= 4:4.6.0),
23+ libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4:4.6.0), libqt4-opengl-dev (>= 4:4.6.0), libqt4-webkit-dev,
24 libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
25 libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
26 libpng-dev, libssl-dev, libsm-dev, flex, bison,
27@@ -466,7 +466,7 @@
28 kdoctools (= ${binary:Version}), kdelibs-bin (= ${binary:Version}),
29 automoc (>= 1.0~version-0.9.88), pkg-kde-tools (>= 0.6.2~),
30 ${sameVersionDep:libqt4-dev:kdelibs5-plugins}, ${sameVersionDep:libsoprano-dev:libnepomuk4},
31- ${sameVersionDep:libphonon-dev:libkhtml5}
32+ ${sameVersionDep:libphonon-dev:libkhtml5}, ${sameVersionDep:libqt4-webkit-dev:libkdewebkit5}
33 Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}
34 Replaces: kdebase-runtime-data (<< 4:4.2.90), kdelibs5-data (<< 4:4.0.80-1),
35 libplasma-dev (<< 4:4.1.96), kdebase-workspace-dev (<< 4:4.4.60),

Subscribers

People subscribed via source and target branches

to all changes: