rev 7600 - in branches/kde4/packages: kdebase/debian kdebase-workspace/debian kdepimlibs/debian

[Armin Berres]

Author: trigger-guest
Date: 2007-10-20 12:15:53 +0000 (Sat, 20 Oct 2007)
New Revision: 7600

Modified:
   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/kdepimlibs/debian/changelog
   branches/kde4/packages/kdepimlibs/debian/control
Log:
Stricter build dependencies after the branch pull.
Remove the conflict of kde-icons-oxygen with kdebase-data. It isn't needed and prevents co-installability with KDE3.


Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2007-10-20 12:12:06 UTC (rev 7599)
+++ branches/kde4/packages/kdebase/debian/changelog	2007-10-20 12:15:53 UTC (rev 7600)
@@ -4,8 +4,11 @@
 
   * Add libxcb1-dev build dependency.
   * Let kdebase-dev strictly depend on the same binary version of kdebase.
+  * Build depend on kdepimlibs >= 3.94.0-3.
+  * Remove the conflict of kde-icons-oxygen with kdebase-data. It isn't
+    needed and prevents co-installability with KDE3.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Oct 2007 12:56:56 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Oct 2007 14:14:53 +0200
 
 kdebase (4:3.94.0-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2007-10-20 12:12:06 UTC (rev 7599)
+++ branches/kde4/packages/kdebase/debian/control	2007-10-20 12:15:53 UTC (rev 7600)
@@ -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 <fboudra at free.fr>, Armin Berres <trigger+debian at space-based.de>
 Build-Depends: cdbs, debhelper (>= 5), quilt, cmake,
- kdepimlibs5-dev (>= 3.94.0), libqimageblitz-dev, libxine-dev, libusb-dev,
+ kdepimlibs5-dev (>= 3.94.0-2), libqimageblitz-dev, libxine-dev, libusb-dev,
  libsmbclient-dev, libxcb1-dev
 Standards-Version: 3.7.2
 
@@ -122,7 +122,6 @@
 Package: kde-icons-oxygen
 Section: kde
 Architecture: all
-Conflicts: kdebase-data (<= 4:3.94.0-1)
 Replaces: kdebase-data (<= 4:3.94.0-1)
 Suggests: kdebase (>= 4:3.94.0-2)
 Description: Oxygen icon theme for KDE

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2007-10-20 12:12:06 UTC (rev 7599)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2007-10-20 12:15:53 UTC (rev 7600)
@@ -9,8 +9,9 @@
   * Add debug package.
   * Let kdebase-workspace-dev strictly depend on the same binary version of
     kdebase-workspace.
+  * Build depend on kdepimlibs >= 3.94.0-3.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Oct 2007 13:00:31 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Oct 2007 13:14:59 +0200
 
 kdebase-workspace (4:3.94.0-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2007-10-20 12:12:06 UTC (rev 7599)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2007-10-20 12:15:53 UTC (rev 7600)
@@ -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 <fboudra at free.fr>. Armin Berres <trigger+debian at space-based.de>
 Build-Depends: cdbs, debhelper (>= 5), quilt, cmake,
- kdepimlibs5-dev (>= 3.94.0), network-manager-dev, libbluetooth-dev,
+ kdepimlibs5-dev (>= 3.94.0-3), network-manager-dev, libbluetooth-dev,
  libcaptury-dev, libnm-util-dev, libqimageblitz-dev, libraw1394-dev,
  libstrigiqtdbusclient-dev
 Standards-Version: 3.7.2

Modified: branches/kde4/packages/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/changelog	2007-10-20 12:12:06 UTC (rev 7599)
+++ branches/kde4/packages/kdepimlibs/debian/changelog	2007-10-20 12:15:53 UTC (rev 7600)
@@ -1,3 +1,9 @@
+kdepimlibs (3.94.0-3) experimental; urgency=low
+
+  * Build depend on kdelibs5-dev >= 4:3.94.0-3.
+
+ -- Armin Berres <trigger+debian at space-based.de>  Sat, 20 Oct 2007 13:12:03 +0200
+
 kdepimlibs (3.94.0-2) experimental; urgency=low
 
   * svn branch pull to r726760.

Modified: branches/kde4/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/control	2007-10-20 12:12:06 UTC (rev 7599)
+++ branches/kde4/packages/kdepimlibs/debian/control	2007-10-20 12:15:53 UTC (rev 7600)
@@ -3,7 +3,7 @@
 Priority: optional
 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 <fboudra at free.fr>, Armin Berres <trigger+debian at space-based.de>
-Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, kdelibs5-dev (>= 4:3.94.0-1),
+Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, kdelibs5-dev (>= 4:3.94.0-3),
  libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev
 Standards-Version: 3.7.2