[Pkg-kde-commits] rev 1372 - branches/kde-3.4.0/packages/kdelibs/debian

Christopher Martin chrsmrtn-guest at costa.debian.org
Tue Jul 26 20:14:29 UTC 2005 

Author: chrsmrtn-guest
Date: 2005-07-26 20:14:28 +0000 (Tue, 26 Jul 2005)
New Revision: 1372

Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/control
   branches/kde-3.4.0/packages/kdelibs/debian/rules
Log:
Commit kdelibs transition changes. kdelibs4 becomes kdelibs4c2, build-depends are tightened, etc.
shlibs are bumped.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-07-26 20:10:03 UTC (rev 1371)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-07-26 20:14:28 UTC (rev 1372)
@@ -1,7 +1,13 @@
-kdelibs (4:3.4.1-1+SVN) UNRELEASED; urgency=low
+kdelibs (4:3.4.2-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
   +++ Changes by Christopher Martin:
   
+  * GCC 4.0 transition: kdelibs4 becomes kdelibs4c2. Tighten build depends on
+    libarts1-dev and libqt3-mt-dev to ensure that we build against
+    transitioned packages.
+  
   * Make kdelibs4 always depend on the identical version of kdelibs-data.
     (Closes: #311958)
 

Modified: branches/kde-3.4.0/packages/kdelibs/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/control	2005-07-26 20:10:03 UTC (rev 1371)
+++ branches/kde-3.4.0/packages/kdelibs/debian/control	2005-07-26 20:14:28 UTC (rev 1372)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.1), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpcre3-dev, libqt3-mt-dev (>= 3.3.4), libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpcre3-dev, libqt3-mt-dev (>= 3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.6.2
 
 Package: kdelibs
 Section: kde
 Architecture: all
-Depends: kdelibs4 (>= ${Source-Version}), kdelibs-bin (>= ${Source-Version}), kdelibs-data (>= ${Source-Version})
+Depends: kdelibs4c2 (>= ${Source-Version}), kdelibs-bin (>= ${Source-Version}), kdelibs-data (>= ${Source-Version})
 Description: core libraries from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -52,12 +52,12 @@
  This package is part of KDE, and a component of the KDE libraries module.
  See the 'kde' and 'kdelibs' packages for more information.
 
-Package: kdelibs4
+Package: kdelibs4c2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (= ${Source-Version}), xbase-clients
-Conflicts: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), kdeaccessibility (<< 3.3.0), kdeaddons (<< 4:3.3.0), kdeadmin (<< 4:3.3.0), kdeartwork (<< 4:3.3.0), kdebase (<< 4:3.3.0), kdebindings (<< 4:3.3.0), kdeedu (<< 4:3.3.0), kdegames (<< 4:3.3.0), kdegraphics (<< 4:3.3.0), kde-i18n (<< 4:3.3.0), kdemultimedia (<< 4:3.3.0), kdenetwork (<< 4:3.3.0), kdepim (<< 4:3.3.0), kdesdk (<< 4:3.3.0), kdetoys (<< 4:3.3.0), kdeutils (<< 4:3.3.0), kdewebdev (<< 1:3.3.0)
-Replaces: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), korganizer (<< 4:3.3.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), kdeartwork-style (<< 4:3.4.0)
+Conflicts: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), kdeaccessibility (<< 3.3.0), kdeaddons (<< 4:3.3.0), kdeadmin (<< 4:3.3.0), kdeartwork (<< 4:3.3.0), kdebase (<< 4:3.3.0), kdebindings (<< 4:3.3.0), kdeedu (<< 4:3.3.0), kdegames (<< 4:3.3.0), kdegraphics (<< 4:3.3.0), kde-i18n (<< 4:3.3.0), kdemultimedia (<< 4:3.3.0), kdenetwork (<< 4:3.3.0), kdepim (<< 4:3.3.0), kdesdk (<< 4:3.3.0), kdetoys (<< 4:3.3.0), kdeutils (<< 4:3.3.0), kdewebdev (<< 1:3.3.0), kdelibs4
+Replaces: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), korganizer (<< 4:3.3.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), kdeartwork-style (<< 4:3.4.0), kdelibs4
 Description: core libraries for all KDE applications
  This package contains all the shared libraries used by all KDE
  applications. You need these libraries to run KDE applications.
@@ -68,7 +68,7 @@
 Package: kdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: kdelibs4 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev, libarts1-dev (>= 1.4.0), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.1), libpcre3-dev, libqt3-mt-dev (>= 3.3.3), libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxslt1-dev
+Depends: kdelibs4c2 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev, libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.1), libpcre3-dev, libqt3-mt-dev (>= 3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxslt1-dev
 Provides: kdelibs-dev
 Conflicts: kdelibs-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0)
 Replaces: kate (<< 4:3.0.0), kdebase-dev (<< 4:3.4.0), kdelibs-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs4 (<< 4:3.2.0), kdepim-dev (<< 4:3.3.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq4-dev (<< 4:3.2.0)
@@ -94,12 +94,14 @@
  This package is part of KDE, and a component of the KDE libraries module.
  See the 'kde' and 'kdelibs' packages for more information.
 
-Package: kdelibs4-dbg
+Package: kdelibs4c2-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Depends: kdelibs4 (= ${Source-Version})
-Description: debugging symbols for kdelibs4
- This package contains the debugging symbols associated with kdelibs4.
+Conflicts: kdelibs4-dbg
+Replaces: kdelibs4-dbg
+Depends: kdelibs4c2 (= ${Source-Version})
+Description: debugging symbols for kdelibs4c2
+ This package contains the debugging symbols associated with kdelibs4c2.
  They will automatically be used by gdb for debugging kdelibs-related
  issues.

Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-07-26 20:10:03 UTC (rev 1371)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-07-26 20:14:28 UTC (rev 1372)
@@ -19,13 +19,13 @@
 	usr/bin/kgrantpty	\
 	usr/bin/kpac_dhcp_helper
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs4
+DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs4c2
 
-PACKAGES_WITH_LIBS := kdelibs4
+PACKAGES_WITH_LIBS := kdelibs4c2
 
-DEB_DH_MAKESHLIBS_ARGS_kdelibs4 := -V'kdelibs4 (>= 4:3.4.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2 := -V'kdelibs4c2 (>= 4:3.4.2-1)'
 
-#shlibs_ver = 4:3.4.1-1
+#shlibs_ver = 4:3.4.2-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
 binary-install/kdelibs-data::

More information about the Pkg-kde-commits mailing list