[Pkg-kde-commits] rev 2395 - trunk/packages/kdelibs/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2005-11-28 17:17:13 +0000 (Mon, 28 Nov 2005)
New Revision: 2395

Added:
   trunk/packages/kdelibs/debian/kdelibs4c2a.docs
   trunk/packages/kdelibs/debian/kdelibs4c2a.install
   trunk/packages/kdelibs/debian/kdelibs4c2a.presubj
Removed:
   trunk/packages/kdelibs/debian/kdelibs4c2.docs
   trunk/packages/kdelibs/debian/kdelibs4c2.install
   trunk/packages/kdelibs/debian/kdelibs4c2.presubj
Modified:
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs-data.install
   trunk/packages/kdelibs/debian/rules
Log:
Sync trunk from branch; kdelibs allocator rename.


Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2005-11-28 17:13:16 UTC (rev 2394)
+++ trunk/packages/kdelibs/debian/control	2005-11-28 17:17:13 UTC (rev 2395)
@@ -10,7 +10,7 @@
 Package: kdelibs
 Section: kde
 Architecture: all
-Depends: kdelibs4c2 (>= ${Source-Version}), kdelibs-bin (>= ${Source-Version}), kdelibs-data (>= ${Source-Version})
+Depends: kdelibs4c2a (>= ${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,
@@ -51,12 +51,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: kdelibs4c2
+Package: kdelibs4c2a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (>> ${KDE-Version3}), kdelibs-data (<< ${KDE-Version2}.90), xbase-clients
-Conflicts: kdelibs4
-Replaces: kdelibs4, kdeartwork-style (<< 4:3.4.0)
+Conflicts: kdelibs4, kdelibs4c2
+Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0)
 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.
@@ -67,7 +67,7 @@
 Package: kdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: kdelibs4c2 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5-rc1), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev, libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev
+Depends: kdelibs4c2a (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5-rc1), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev, libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev
 Provides: kdelibs-dev
 Replaces: kdebase-dev (<< 4:3.4.0)
 Description: development files for the KDE core libraries
@@ -90,14 +90,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: kdelibs4c2-dbg
+Package: kdelibs4c2a-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
 Conflicts: kdelibs4-dbg
 Replaces: kdelibs4-dbg
-Depends: kdelibs4c2 (= ${Source-Version})
-Description: debugging symbols for kdelibs4c2
- This package contains the debugging symbols associated with kdelibs4c2.
+Depends: kdelibs4c2a (= ${Source-Version})
+Description: debugging symbols for kdelibs4c2a
+ This package contains the debugging symbols associated with kdelibs4c2a.
  They will automatically be used by gdb for debugging kdelibs-related
  issues.

Modified: trunk/packages/kdelibs/debian/kdelibs-data.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs-data.install	2005-11-28 17:13:16 UTC (rev 2394)
+++ trunk/packages/kdelibs/debian/kdelibs-data.install	2005-11-28 17:17:13 UTC (rev 2395)
@@ -1940,6 +1940,7 @@
 debian/tmp/usr/share/emoticons/Default/unlove.png
 debian/tmp/usr/share/emoticons/Default/wilted_rose.png
 debian/tmp/usr/share/emoticons/Default/wink.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/launch.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/actions/share.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kmenu.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kttsd.png
@@ -2935,6 +2936,7 @@
 debian/tmp/usr/share/icons/crystalsvg/32x32/actions/kde.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/actions/kdevelop_down.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/actions/knewstuff.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/launch.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/actions/leftjust.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/actions/locationbar_erase.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/actions/lock.png
@@ -3257,6 +3259,7 @@
 debian/tmp/usr/share/icons/crystalsvg/48x48/actions/identity.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/actions/indent.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/actions/kde.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/launch.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/actions/lock.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/actions/mail_new.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/actions/mail_post_to.png
@@ -3658,6 +3661,7 @@
 debian/tmp/usr/share/icons/crystalsvg/scalable/actions/frameprint.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/actions/gohome.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/actions/info.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/launch.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/actions/lock.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/actions/mail_generic.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/actions/mail_get.svgz

Deleted: trunk/packages/kdelibs/debian/kdelibs4c2.docs

Deleted: trunk/packages/kdelibs/debian/kdelibs4c2.install

Deleted: trunk/packages/kdelibs/debian/kdelibs4c2.presubj

Copied: trunk/packages/kdelibs/debian/kdelibs4c2a.docs (from rev 2385, trunk/packages/kdelibs/debian/kdelibs4c2.docs)

Copied: trunk/packages/kdelibs/debian/kdelibs4c2a.install (from rev 2385, trunk/packages/kdelibs/debian/kdelibs4c2.install)

Copied: trunk/packages/kdelibs/debian/kdelibs4c2a.presubj (from rev 2385, trunk/packages/kdelibs/debian/kdelibs4c2.presubj)

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2005-11-28 17:13:16 UTC (rev 2394)
+++ trunk/packages/kdelibs/debian/rules	2005-11-28 17:17:13 UTC (rev 2395)
@@ -19,11 +19,11 @@
 	usr/bin/kgrantpty	\
 	usr/bin/kpac_dhcp_helper
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs4c2
+DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs4c2a
 
-PACKAGES_WITH_LIBS := kdelibs4c2
+PACKAGES_WITH_LIBS := kdelibs4c2a
 
-DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2 := -V'kdelibs4c2 (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a := -V'kdelibs4c2a (>= 4:3.5-rc1-1)'
 
 ###