rev 3825 - trunk/packages/kdelibs/debian

Christopher Martin chrsmrtn at costa.debian.org
Sun May 28 14:48:17 UTC 2006 

Author: chrsmrtn
Date: 2006-05-28 14:48:14 +0000 (Sun, 28 May 2006)
New Revision: 3825

Added:
   trunk/packages/kdelibs/debian/kdelibs4c2a.lintian
   trunk/packages/kdelibs/debian/kdelibs4c2a.manpages
Removed:
   trunk/packages/kdelibs/debian/kdelibs-bin.install
   trunk/packages/kdelibs/debian/kdelibs-bin.lintian
   trunk/packages/kdelibs/debian/kdelibs-bin.manpages
   trunk/packages/kdelibs/debian/kdelibs-bin.presubj
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs4c2a.install
Log:
OK, let's merge the -merge branch.

kdelibs4c2a should now include kdelibs-bin.

I'll do a test build today, to make sure
all is OK.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-05-27 22:49:50 UTC (rev 3824)
+++ trunk/packages/kdelibs/debian/changelog	2006-05-28 14:48:14 UTC (rev 3825)
@@ -7,6 +7,30 @@
 
   * remove branch pulls patches.
 
+  +++ Changes by Christopher Martin:
+
+  * Eliminate the kdelibs-bin package, merging it completely into kdelibs4c2a.
+
+    There existed a (necessary) circular dependency between kdelibs-bin and
+    kdelibs4c2a. kdelibs-bin is linked to kdelibs4c2a. Also, every KDE
+    application needs the binaries in kdelibs-bin to function properly, yet
+    virtually none depend on it. So to break the circular dependency by
+    removing kdelibs4c2a's dependency on kdelibs-bin would require that all
+    KDE packages be re-uploaded. And every KDE-using system would still need
+    both kdelibs-bin and kdelibs4c2a.
+
+    So we'll simply merge them. The general practice of separating libraries
+    and programs makes no sense for kdelibs, given the close ties between the
+    two. Multiple versions of the KDE libraries can't be installed
+    side-by-side in any case.
+
+    For the rare package which depends on kdelibs-bin, kdelibs4c2a will still
+    "Provides: kdelibs-bin".
+
+    The removal of the circular dependency should make future transitions
+    easier for users, avoiding difficulties such as those encountered during
+    Woody to Sarge upgrades.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 May 2006 11:53:24 +0200
 
 kdelibs (4:3.5.2-2) unstable; urgency=low

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2006-05-27 22:49:50 UTC (rev 3824)
+++ trunk/packages/kdelibs/debian/control	2006-05-28 14:48:14 UTC (rev 3825)
@@ -10,7 +10,7 @@
 Package: kdelibs
 Section: libs
 Architecture: all
-Depends: kdelibs4c2a (>= ${Source-Version}), kdelibs-bin (>= ${Source-Version}), kdelibs-data (>= ${Source-Version})
+Depends: kdelibs4c2a (>= ${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,
@@ -21,22 +21,6 @@
  needed by virtually all KDE applications. It does not include
  development files.
 
-Package: kdelibs-bin
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, menu-xdg, perl
-Recommends: perl-suid
-Replaces: kcontrol (<< 4:3.4.0)
-Description: core binaries for all KDE applications
- This package contains all the common binaries with are used by KDE
- applications. You need these binaries to run KDE applications.
- .
- Several scripts included in kdebase-bin, related to the handling of SMB
- and NFS shares, require the perl-suid package to work properly.
- .
- This package is part of KDE, and a component of the KDE libraries module.
- See the 'kde' and 'kdelibs' packages for more information.
-
 Package: kdelibs-data
 Section: libs
 Architecture: all
@@ -54,14 +38,20 @@
 Package: kdelibs4c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (>> ${KDE-Version3}), kdelibs-data (<< ${KDE-Version2}.90), xbase-clients
+Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}), kdelibs-data (<< ${KDE-Next-Version3}), menu-xdg, perl, xbase-clients
+Recommends: perl-suid
 Suggests: fam
-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.
+Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin
+Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0), kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1)
+Provides: kdelibs-bin
+Description: core libraries and binaries for all KDE applications
+ This package contains all the shared libraries and common core binaries
+ used by all KDE applications. You need these libraries and binaries to
+ run KDE applications.
  .
+ Several scripts included in kdebase-bin, related to the handling of SMB
+ and NFS shares, require the perl-suid package to work properly.
+ .
  If you are working with remote filesystems, you may find that fam
  is helpful in tracking filesystem updates. If you work only with local
  filesystems, then avoid fam (and gamin), since if they are not installed,
@@ -74,7 +64,7 @@
 Package: kdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: kdelibs4c2a (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev | libgamin-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, libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4)
+Depends: kdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libfam-dev | libgamin-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, libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4)
 Provides: kdelibs-dev
 Replaces: kdebase-dev (<< 4:3.4.0)
 Description: development files for the KDE core libraries

Deleted: trunk/packages/kdelibs/debian/kdelibs-bin.install

Deleted: trunk/packages/kdelibs/debian/kdelibs-bin.lintian

Deleted: trunk/packages/kdelibs/debian/kdelibs-bin.manpages

Deleted: trunk/packages/kdelibs/debian/kdelibs-bin.presubj

Modified: trunk/packages/kdelibs/debian/kdelibs4c2a.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs4c2a.install	2006-05-27 22:49:50 UTC (rev 3824)
+++ trunk/packages/kdelibs/debian/kdelibs4c2a.install	2006-05-28 14:48:14 UTC (rev 3825)
@@ -1,3 +1,65 @@
+debian/tmp/etc/kde3/khotnewstuffrc
+debian/tmp/usr/bin/artsmessage
+debian/tmp/usr/bin/cupsdconf
+debian/tmp/usr/bin/cupsdoprint
+debian/tmp/usr/bin/dcop
+debian/tmp/usr/bin/dcopclient
+debian/tmp/usr/bin/dcopfind
+debian/tmp/usr/bin/dcopobject
+debian/tmp/usr/bin/dcopquit
+debian/tmp/usr/bin/dcopref
+debian/tmp/usr/bin/dcopserver
+debian/tmp/usr/bin/dcopserver_shutdown
+debian/tmp/usr/bin/dcopstart
+debian/tmp/usr/bin/filesharelist
+debian/tmp/usr/bin/fileshareset
+debian/tmp/usr/bin/imagetops
+debian/tmp/usr/bin/kab2kabc
+debian/tmp/usr/bin/kaddprinterwizard
+debian/tmp/usr/bin/kbuildsycoca
+debian/tmp/usr/bin/kcmshell
+debian/tmp/usr/bin/kconfig_compiler
+debian/tmp/usr/bin/kconf_update
+debian/tmp/usr/bin/kcookiejar
+debian/tmp/usr/bin/kde-config
+debian/tmp/usr/bin/kded
+debian/tmp/usr/bin/kdeinit
+debian/tmp/usr/bin/kdeinit_shutdown
+debian/tmp/usr/bin/kdeinit_wrapper
+debian/tmp/usr/bin/kde-menu
+debian/tmp/usr/bin/kdesu_stub
+debian/tmp/usr/bin/kdontchangethehostname
+debian/tmp/usr/bin/kdostartupconfig
+debian/tmp/usr/bin/kfile
+debian/tmp/usr/bin/kfmexec
+debian/tmp/usr/bin/kgrantpty
+debian/tmp/usr/bin/khotnewstuff
+debian/tmp/usr/bin/kinstalltheme
+debian/tmp/usr/bin/kioexec
+debian/tmp/usr/bin/kio_http_cache_cleaner
+debian/tmp/usr/bin/kioslave
+debian/tmp/usr/bin/kio_uiserver
+debian/tmp/usr/bin/klauncher
+debian/tmp/usr/bin/kmailservice
+debian/tmp/usr/bin/kpac_dhcp_helper
+debian/tmp/usr/bin/ksendbugmail
+debian/tmp/usr/bin/kshell
+debian/tmp/usr/bin/kstartupconfig
+debian/tmp/usr/bin/ksvgtopng
+debian/tmp/usr/bin/ktelnetservice
+debian/tmp/usr/bin/ktradertest
+debian/tmp/usr/bin/kunittestmodrunner
+debian/tmp/usr/bin/kwrapper
+debian/tmp/usr/bin/lnusertemp
+debian/tmp/usr/bin/make_driver_db_cups
+debian/tmp/usr/bin/make_driver_db_lpr
+debian/tmp/usr/bin/makekdewidgets
+debian/tmp/usr/bin/meinproc
+debian/tmp/usr/bin/preparetips
+debian/tmp/usr/lib/kde3/cupsdconf.la
+debian/tmp/usr/lib/kde3/cupsdconf.so
+debian/tmp/usr/lib/kde3/dcopserver.la
+debian/tmp/usr/lib/kde3/dcopserver.so
 debian/tmp/usr/lib/kde3/kabc_dir.la
 debian/tmp/usr/lib/kde3/kabc_dir.so
 debian/tmp/usr/lib/kde3/kabc_file.la
@@ -8,10 +70,20 @@
 debian/tmp/usr/lib/kde3/kabc_ldapkio.so
 debian/tmp/usr/lib/kde3/kabc_net.la
 debian/tmp/usr/lib/kde3/kabc_net.so
+debian/tmp/usr/lib/kde3/kaddprinterwizard.la
+debian/tmp/usr/lib/kde3/kaddprinterwizard.so
+debian/tmp/usr/lib/kde3/kbuildsycoca.la
+debian/tmp/usr/lib/kde3/kbuildsycoca.so
 debian/tmp/usr/lib/kde3/kbzip2filter.la
 debian/tmp/usr/lib/kde3/kbzip2filter.so
 debian/tmp/usr/lib/kde3/kcm_kresources.la
 debian/tmp/usr/lib/kde3/kcm_kresources.so
+debian/tmp/usr/lib/kde3/kcmshell.la
+debian/tmp/usr/lib/kde3/kcmshell.so
+debian/tmp/usr/lib/kde3/kconf_update.la
+debian/tmp/usr/lib/kde3/kconf_update.so
+debian/tmp/usr/lib/kde3/kcookiejar.la
+debian/tmp/usr/lib/kde3/kcookiejar.so
 debian/tmp/usr/lib/kde3/kded_kcookiejar.la
 debian/tmp/usr/lib/kde3/kded_kcookiejar.so
 debian/tmp/usr/lib/kde3/kded_kdeprintd.la
@@ -24,8 +96,10 @@
 debian/tmp/usr/lib/kde3/kded_kssld.so
 debian/tmp/usr/lib/kde3/kded_kwalletd.la
 debian/tmp/usr/lib/kde3/kded_kwalletd.so
+debian/tmp/usr/lib/kde3/kded.la
 debian/tmp/usr/lib/kde3/kded_proxyscout.la
 debian/tmp/usr/lib/kde3/kded_proxyscout.so
+debian/tmp/usr/lib/kde3/kded.so
 debian/tmp/usr/lib/kde3/kdeprint_cups.la
 debian/tmp/usr/lib/kde3/kdeprint_cups.so
 debian/tmp/usr/lib/kde3/kdeprint_ext.la
@@ -78,12 +152,18 @@
 debian/tmp/usr/lib/kde3/kio_ghelp.so
 debian/tmp/usr/lib/kde3/kio_help.la
 debian/tmp/usr/lib/kde3/kio_help.so
+debian/tmp/usr/lib/kde3/kio_http_cache_cleaner.la
+debian/tmp/usr/lib/kde3/kio_http_cache_cleaner.so
 debian/tmp/usr/lib/kde3/kio_http.la
 debian/tmp/usr/lib/kde3/kio_http.so
 debian/tmp/usr/lib/kde3/kio_metainfo.la
 debian/tmp/usr/lib/kde3/kio_metainfo.so
+debian/tmp/usr/lib/kde3/kio_uiserver.la
+debian/tmp/usr/lib/kde3/kio_uiserver.so
 debian/tmp/usr/lib/kde3/kjavaappletviewer.la
 debian/tmp/usr/lib/kde3/kjavaappletviewer.so
+debian/tmp/usr/lib/kde3/klauncher.la
+debian/tmp/usr/lib/kde3/klauncher.so
 debian/tmp/usr/lib/kde3/knotify.la
 debian/tmp/usr/lib/kde3/knotify.so
 debian/tmp/usr/lib/kde3/kspell_aspell.la
@@ -152,6 +232,17 @@
 debian/tmp/usr/lib/libkdefakes.so.4.2.0
 debian/tmp/usr/lib/libkdefx.so.4
 debian/tmp/usr/lib/libkdefx.so.4.2.0
+debian/tmp/usr/lib/libkdeinit_cupsdconf.so
+debian/tmp/usr/lib/libkdeinit_dcopserver.so
+debian/tmp/usr/lib/libkdeinit_kaddprinterwizard.so
+debian/tmp/usr/lib/libkdeinit_kbuildsycoca.so
+debian/tmp/usr/lib/libkdeinit_kcmshell.so
+debian/tmp/usr/lib/libkdeinit_kconf_update.so
+debian/tmp/usr/lib/libkdeinit_kcookiejar.so
+debian/tmp/usr/lib/libkdeinit_kded.so
+debian/tmp/usr/lib/libkdeinit_kio_http_cache_cleaner.so
+debian/tmp/usr/lib/libkdeinit_kio_uiserver.so
+debian/tmp/usr/lib/libkdeinit_klauncher.so
 debian/tmp/usr/lib/libkdeprint_management.so.4
 debian/tmp/usr/lib/libkdeprint_management.so.4.2.0
 debian/tmp/usr/lib/libkdeprint.so.4

Added: trunk/packages/kdelibs/debian/kdelibs4c2a.lintian
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs4c2a.lintian	2006-05-27 22:49:50 UTC (rev 3824)
+++ trunk/packages/kdelibs/debian/kdelibs4c2a.lintian	2006-05-28 14:48:14 UTC (rev 3825)
@@ -0,0 +1,14 @@
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kaddprinterwizard.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_cupsdconf.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_dcopserver.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kcmshell.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kio_http_cache_cleaner.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kbuildsycoca.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kded.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kcookiejar.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_klauncher.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kconf_update.so
+kdelibs4c2a binary: no-shlibs-control-file usr/lib/libkdeinit_kio_uiserver.so
+kdelibs4c2a binary: setuid-binary usr/bin/fileshareset 4755 root/root
+kdelibs4c2a binary: setuid-binary usr/bin/kgrantpty 4755 root/root
+kdelibs4c2a binary: setuid-binary usr/bin/kpac_dhcp_helper 4755 root/root

Added: trunk/packages/kdelibs/debian/kdelibs4c2a.manpages
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs4c2a.manpages	2006-05-27 22:49:50 UTC (rev 3824)
+++ trunk/packages/kdelibs/debian/kdelibs4c2a.manpages	2006-05-28 14:48:14 UTC (rev 3825)
@@ -0,0 +1,22 @@
+debian/man/out/artsmessage.1
+debian/man/out/cupsdconf.1
+debian/man/out/dcop.1
+debian/man/out/dcopfind.1
+debian/man/out/dcopserver.1
+debian/man/out/dcopstart.1
+debian/man/out/kaddprinterwizard.1
+debian/man/out/kbuildsycoca.1
+debian/man/out/kconf_update.1
+debian/man/out/kcookiejar.1
+debian/man/out/kde-config.1
+debian/man/out/kded.1
+debian/man/out/kdontchangethehostname.1
+debian/man/out/kfile.1
+debian/man/out/kinstalltheme.1
+debian/man/out/kio_http_cache_cleaner.1
+debian/man/out/kio_uiserver.1
+debian/man/out/kmailservice.1
+debian/man/out/ksendbugmail.1
+debian/man/out/ktelnetservice.1
+debian/man/out/lnusertemp.1
+debian/man/out/meinproc.1

More information about the pkg-kde-commits mailing list