[Pkg-kde-commits] rev 817 - trunk/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-17 15:26:48 +0100 (Thu, 17 Mar 2005)
New Revision: 817

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/kdebase-bin.install
   trunk/packages/kdebase/debian/kdm.install
Log:
Revert the kgreeter widget move...


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2005-03-17 00:58:44 UTC (rev 816)
+++ trunk/packages/kdebase/debian/changelog	2005-03-17 14:26:48 UTC (rev 817)
@@ -1,19 +1,13 @@
 kdebase (4:3.3.2-2) unstable; urgency=low
 
+  * KDE_3_3_BRANCH update.
+
   +++ Changes by Adeodato Simó:
 
   * After clearing up some issues with multiple de.po files being sent for
     inclusion, include an updated German po-debconf translation sent by
     Florian Ernst, and agreed upon several translators. (Closes: #291954)
 
-  +++ Changes by Christopher Martin:
-
-  * KDE_3_3_BRANCH update.
-
-  * Move greeter widgets from kdebase-bin to kdm, adding Replaces and
-    Conflicts as necessary. This was the reason that kdm depended on
-    kdebase-bin, and perhaps the reason behind the segfaults in #243590.
-
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
 
 kdebase (4:3.3.2-1) unstable; urgency=low

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2005-03-17 00:58:44 UTC (rev 816)
+++ trunk/packages/kdebase/debian/control	2005-03-17 14:26:48 UTC (rev 817)
@@ -88,7 +88,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter
-Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.3.2-2)
+Conflicts: kdebase-libs (<< 4:3.0.0)
 Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0)
 Description: KDE Base (binaries)
  KDE is a powerful Open Source graphical desktop environment
@@ -215,10 +215,9 @@
 Package: kdm
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.9), libpam-runtime (>= 0.76-14), xbase-clients
+Depends: ${shlibs:Depends}, kdebase-bin, debconf (>= 1.2.9), libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate
 Suggests: khelpcenter, menu
-Replaces: kdebase-bin (<< 4:3.3.2-2)
 Provides: x-display-manager
 Description: KDE Display Manager
  KDE is a powerful Open Source graphical desktop environment

Modified: trunk/packages/kdebase/debian/kdebase-bin.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-bin.install	2005-03-17 00:58:44 UTC (rev 816)
+++ trunk/packages/kdebase/debian/kdebase-bin.install	2005-03-17 14:26:48 UTC (rev 817)
@@ -24,6 +24,8 @@
 debian/tmp/usr/lib/kde3/kcm_khotkeys.so
 debian/tmp/usr/lib/kde3/kcminit.la
 debian/tmp/usr/lib/kde3/kcminit.so
+debian/tmp/usr/lib/kde3/kgreet_classic.la
+debian/tmp/usr/lib/kde3/kgreet_classic.so
 debian/tmp/usr/lib/kde3/khotkeys.la
 debian/tmp/usr/lib/kde3/khotkeys.so
 debian/tmp/usr/lib/kde3/kxkb.la

Modified: trunk/packages/kdebase/debian/kdm.install
===================================================================
--- trunk/packages/kdebase/debian/kdm.install	2005-03-17 00:58:44 UTC (rev 816)
+++ trunk/packages/kdebase/debian/kdm.install	2005-03-17 14:26:48 UTC (rev 817)
@@ -15,8 +15,6 @@
 debian/tmp/usr/bin/kdm_greet
 debian/tmp/usr/bin/kdmctl
 debian/tmp/usr/bin/krootimage
-debian/tmp/usr/lib/kde3/kgreet_classic.la
-debian/tmp/usr/lib/kde3/kgreet_classic.so
 debian/tmp/usr/share/apps/kdm/pics/kdeflower.png
 debian/tmp/usr/share/apps/kdm/pics/kdelogo.png
 debian/tmp/usr/share/apps/kdm/pics/users/default1.png