rev 12602 - in branches/kde4/packages: kdebase/debian kdebase-runtime/debian kdebase-workspace/debian kdegames/debian kdelibs/debian kdemultimedia/debian kdepimlibs/debian
Modestas Vainius
modax-guest at alioth.debian.org
Fri Nov 7 20:50:57 UTC 2008
Author: modax-guest
Date: 2008-11-07 20:50:56 +0000 (Fri, 07 Nov 2008)
New Revision: 12602
Modified:
branches/kde4/packages/kdebase-runtime/debian/changelog
branches/kde4/packages/kdebase-runtime/debian/control
branches/kde4/packages/kdebase-workspace/debian/changelog
branches/kde4/packages/kdebase-workspace/debian/control
branches/kde4/packages/kdebase/debian/changelog
branches/kde4/packages/kdebase/debian/control
branches/kde4/packages/kdegames/debian/changelog
branches/kde4/packages/kdegames/debian/control
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/rules
branches/kde4/packages/kdemultimedia/debian/changelog
branches/kde4/packages/kdemultimedia/debian/control
branches/kde4/packages/kdepimlibs/debian/changelog
branches/kde4/packages/kdepimlibs/debian/control
Log:
Adjust build dependencies. This might solve build failues
Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdebase/debian/changelog 2008-11-07 20:50:56 UTC (rev 12602)
@@ -1,3 +1,12 @@
+kdebase (4:4.1.3-2) experimental; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Remove kdepimlibs5-dev from kdebase-dev depends.
+ * Use sameVersionDep for libkonq5-dev dependecy on kdelibs5-dev.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 07 Nov 2008 22:33:31 +0200
+
kdebase (4:4.1.3-1) experimental; urgency=low
* New upstream release
Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdebase/debian/control 2008-11-07 20:50:56 UTC (rev 12602)
@@ -86,7 +86,6 @@
Architecture: any
Depends: ${shlibs:Depends}, dolphin (= ${binary:Version}),
konqueror (= ${binary:Version}), libkonq5-dev (= ${binary:Version}),
- kdepimlibs5-dev (>= 4:4.1.0), libphonon-dev (>= 4:4.1.0),
libqimageblitz-dev (>=1:0.0.4-2), libsmbclient-dev, libusb-dev, libxkbfile-dev, libraw1394-dev
Description: development files for the KDE 4 base module
This package contains development files for building software that uses
@@ -204,7 +203,7 @@
Package: libkonq5-dev
Section: libdevel
Architecture: any
-Depends: libkonq5 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.98)
+Depends: libkonq5 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:libkonq5}
Description: development files for the Konqueror libraries
This package contains development files for building software that uses the
Konqueror libraries.
Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog 2008-11-07 20:50:56 UTC (rev 12602)
@@ -1,3 +1,11 @@
+kdebase-runtime (4:4.1.3-2) experimental; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Bump build dependency on kdepimlibs5-dev and kdelibs5-dev to 4.1.3-2.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 07 Nov 2008 22:19:42 +0200
+
kdebase-runtime (4:4.1.3-1) experimental; urgency=low
* New upstream release
Modified: branches/kde4/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/control 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdebase-runtime/debian/control 2008-11-07 20:50:56 UTC (rev 12602)
@@ -5,7 +5,7 @@
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0),
- kdepimlibs5-dev (>= 4:4.1.1), kdelibs5-dev (>= 4:4.1.1),
+ kdepimlibs5-dev (>= 4:4.1.3-2), kdelibs5-dev (>= 4:4.1.3-2),
libclucene-dev, libsmbclient-dev, libsoprano-dev (>= 2.1),
libstreamanalyzer-dev (>= 0.5.8), libstrigiqtdbusclient-dev (>= 0.5.8),
libxcb1-dev, libxine-dev, libopenexr-dev, libbz2-dev, libx11-dev,
Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog 2008-11-07 20:50:56 UTC (rev 12602)
@@ -1,3 +1,12 @@
+kdebase-workspace (4:4.1.3-2) experimental; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Replace kdepimlibs5-dev with kdelibs5-dev everywhere (should be enough).
+ * Bump build dependency on kdelibs5-dev to 4.1.3-2.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 07 Nov 2008 22:45:49 +0200
+
kdebase-workspace (4:4.1.3-1) experimental; urgency=low
* New upstream release
Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdebase-workspace/debian/control 2008-11-07 20:50:56 UTC (rev 12602)
@@ -4,7 +4,7 @@
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0),
- kdepimlibs5-dev (>= 4:4.1.0), libphonon-dev (>= 4:4.2),
+ kdelibs5-dev (>= 4:4.1.3-2),
libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libcaptury-dev, libdbus-1-dev, libnm-util-dev, network-manager-dev,
libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), libraw1394-dev, libsensors-dev,
@@ -79,7 +79,8 @@
Architecture: any
Depends: ${shlibs:Depends}, kdebase-workspace-libs4+5 (= ${binary:Version}),
libkwineffects1 (= ${binary:Version}), libkdecorations4 (= ${binary:Version}),
- libplasma-dev (= ${binary:Version}), kdepimlibs5-dev (>= 4:4.1.0)
+ libplasma-dev (= ${binary:Version}),
+ ${sameVersionDep:kdelibs5-dev:kdebase-workspace-libs4+5})
Description: development files for the KDE 4 base workspace module
This package contains development files for building software that uses
libraries from the KDE 4 base workspace module.
Modified: branches/kde4/packages/kdegames/debian/changelog
===================================================================
--- branches/kde4/packages/kdegames/debian/changelog 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdegames/debian/changelog 2008-11-07 20:50:56 UTC (rev 12602)
@@ -1,3 +1,11 @@
+kdegames (4:4.1.3-2) UNRELEASED; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Use sameVersionDep for libkdegames-dev kdelibs5-dev dependency.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 07 Nov 2008 22:25:14 +0200
+
kdegames (4:4.1.3-1) experimental; urgency=low
* New upstream release.
Modified: branches/kde4/packages/kdegames/debian/control
===================================================================
--- branches/kde4/packages/kdegames/debian/control 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdegames/debian/control 2008-11-07 20:50:56 UTC (rev 12602)
@@ -64,7 +64,7 @@
Package: libkdegames-dev
Architecture: any
Section: libdevel
-Depends: kdelibs5-dev (>= 4:4.1.0), libkdegames4 (= ${binary:Version})
+Depends: ${sameVersionDep:kdelibs5-dev:libkdegames4}, libkdegames4 (= ${binary:Version})
Description: development files for the KDE 4 games module
This package contains development files for building software that uses
libraries from the KDE 4 games module.
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-11-07 20:50:56 UTC (rev 12602)
@@ -1,3 +1,13 @@
+kde4libs (4:4.1.3-2) experimental; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Bump kdebase-runtime dependency back to 4.1.3. The previous change was
+ a mistake.
+ * Bump kdelibs5 shlibs to 4.1.3-2 to ease the pain.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 07 Nov 2008 22:18:05 +0200
+
kde4libs (4:4.1.3-1) experimental; urgency=low
* New upstream release
Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdelibs/debian/rules 2008-11-07 20:50:56 UTC (rev 12602)
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
#UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
-UPSTREAMVERSION ?= 4:4.1.3
-RUNTIME_DEPS := kdebase-runtime (>= 4:4.1.0)
+UPSTREAMVERSION ?= 4:4.1.3-2
+RUNTIME_DEPS := kdebase-runtime (>= 4:4.1.3)
DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg
Modified: branches/kde4/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/changelog 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdemultimedia/debian/changelog 2008-11-07 20:50:56 UTC (rev 12602)
@@ -1,3 +1,12 @@
+kdemultimedia (4:4.1.3-2) experimental; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Use sameVersionDep for kdemultimedia-dev dependency on kdelibs5-dev.
+ * Remove kdebase-workspace-dev from kdemultimedia-dev depends.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 07 Nov 2008 22:39:43 +0200
+
kdemultimedia (4:4.1.3-1) experimental; urgency=low
* New upstream release
Modified: branches/kde4/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/control 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdemultimedia/debian/control 2008-11-07 20:50:56 UTC (rev 12602)
@@ -44,7 +44,7 @@
Package: kdemultimedia-dev
Section: devel
Architecture: any
-Depends: kdelibs5-dev (>= 4:4.1.0), kdebase-workspace-dev (>= 4:4.1.0),
+Depends: ${sameVersionDep:kdelibs5-dev:kdemultimedia-kio-plugins},
libkcddb-dev (= ${binary:Version}),
kdemultimedia-kio-plugins (= ${binary:Version})
Description: development files for the KDE 4 multimedia module
Modified: branches/kde4/packages/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/changelog 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdepimlibs/debian/changelog 2008-11-07 20:50:56 UTC (rev 12602)
@@ -1,3 +1,11 @@
+kdepimlibs (4:4.1.3-2) experimental; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Build depend on kdelibs5-dev >= 4.1.3-2.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 07 Nov 2008 22:15:58 +0200
+
kdepimlibs (4:4.1.3-1) experimental; urgency=low
* New upstream.
Modified: branches/kde4/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/control 2008-11-07 20:13:12 UTC (rev 12601)
+++ branches/kde4/packages/kdepimlibs/debian/control 2008-11-07 20:50:56 UTC (rev 12602)
@@ -5,7 +5,7 @@
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0),
- kdelibs5-dev (>= 4:4.1.1), libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev,
+ kdelibs5-dev (>= 4:4.1.3-2), libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev,
libakonadi-dev (>= 1.0.0)
Standards-Version: 3.7.3
Homepage: http://pim.kde.org/
More information about the pkg-kde-commits
mailing list