rev 14169 - in trunk/packages/kdelibs/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-04-01 23:37:34 +0000 (Wed, 01 Apr 2009)
New Revision: 14169

Removed:
   trunk/packages/kdelibs/debian/ban-unstable-uploads
   trunk/packages/kdelibs/debian/patches/24_ban_unstable_uploads.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/patches/series
   trunk/packages/kdelibs/debian/rules
Log:
+++ Changes by Sune Vuorela:
* Add aggressive conflicts to prevent mix and match.
* Remove ban of upload of 3rd party apps.
* Bump runtime versions.
* Bump requirements of pkg-kde-tools to require the .kde edition.
* Temporarily add a versioned dependency on pkg-kde-tools on kdelibs5-dev to
  be absolutely sure not having any accidents.

Deleted: trunk/packages/kdelibs/debian/ban-unstable-uploads

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2009-04-01 22:03:58 UTC (rev 14168)
+++ trunk/packages/kdelibs/debian/changelog	2009-04-01 23:37:34 UTC (rev 14169)
@@ -1,11 +1,15 @@
-kde4libs (4:4.2.2-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.2.2-0r2) UNRELEASED; urgency=low
 
   * New upstream release.
 
-  +++ Changes by Modestas Vainius:
+  +++ Changes by Sune Vuorela:
 
-  * Update list of packages exempted from ban-unstable-uploads. Add
-    adept, eqonomize, kdesvn, kio-ftps, rkward (stuff currently in sid).
+  * Add aggressive conflicts to prevent mix and match.
+  * Remove ban of upload of 3rd party apps.
+  * Bump runtime versions.
+  * Bump requirements of pkg-kde-tools to require the .kde edition.
+  * Temporarily add a versioned dependency on pkg-kde-tools on kdelibs5-dev to
+    be absolutely sure not having any accidents.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2009-04-01 22:03:58 UTC (rev 14168)
+++ trunk/packages/kdelibs/debian/control	2009-04-01 23:37:34 UTC (rev 14169)
@@ -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 <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 (>= 7.2.3), quilt, cmake (>= 2.6.3), pkg-kde-tools (>= 0.4),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), quilt, cmake (>= 2.6.3), pkg-kde-tools (>= 0.4.2),
  shared-mime-info (>= 0.20), libphonon-dev (>= 4:4.3.0),
  libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4.4.3), libqt4-opengl-dev (>= 4.4.3),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -25,6 +25,7 @@
 Depends: ${shlibs:Depends}, kdelibs5-data (>= ${source:Version}),
  kdelibs-bin(>= ${binary:Version}), dbus-x11, shared-mime-info, xauth, xdg-utils
 Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.2.0)
+Conflicts: kdebase-workspace-libs4+5 (<< 4.2.2), kdepimlibs5 (<< 4.2.2)
 Replaces: kdelibs-bin (<< 4:4.1.74)
 Description: core libraries for all KDE 4 applications
  This package contains shared libraries needed to run KDE 4 applications.
@@ -45,7 +46,7 @@
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), libplasma3 (= ${binary:Version}),
- cmake (>= 2.6.2-3~), automoc (>= 1.0~svn850570),
+ cmake (>= 2.6.2-3~), automoc (>= 1.0~svn850570), pkg-kde-tools (>= 0.4.2),
  ${sameVersionDep:libqt4-dev}, ${sameVersionDep:libsoprano-dev}, ${sameVersionDep:libphonon-dev}
 #Suggests: kdelibs5-doc (= ${source:Version})
 Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}

Deleted: trunk/packages/kdelibs/debian/patches/24_ban_unstable_uploads.diff

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2009-04-01 22:03:58 UTC (rev 14168)
+++ trunk/packages/kdelibs/debian/patches/series	2009-04-01 23:37:34 UTC (rev 14169)
@@ -10,4 +10,3 @@
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 23_solid_no_double_build.diff
-24_ban_unstable_uploads.diff

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2009-04-01 22:03:58 UTC (rev 14168)
+++ trunk/packages/kdelibs/debian/rules	2009-04-01 23:37:34 UTC (rev 14169)
@@ -3,7 +3,7 @@
 UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
 #UPSTREAMVERSION ?= 4:4.2.0
 #PLASMA_ABI=$(shell grep 'plasma-abi-' debian/libplasma3.symbols.in | head -n1 | sed 's/^.*\(plasma-abi-\S\+\).*/\1/')
-RUNTIME_DEPS := kdebase-runtime (>= 4:4.2.0)
+RUNTIME_DEPS := kdebase-runtime (>= 4:4.2.2)
 
 DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
 DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg
@@ -18,8 +18,5 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
-binary-install/kdelibs5-dev::
-	install -m 755 -o root -g root -D debian/ban-unstable-uploads debian/kdelibs5-dev/usr/share/kde4/apps/cmake/modules/ban-unstable-uploads
-
 #binary-predeb/libplasma3::
 #	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma3.substvars