[Pkg-kde-commits] rev 818 - branches/kde-3.4.0/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-17 15:33:27 +0100 (Thu, 17 Mar 2005)
New Revision: 818

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
   branches/kde-3.4.0/packages/kdebase/debian/control
   branches/kde-3.4.0/packages/kdebase/debian/kdebase-bin.install
   branches/kde-3.4.0/packages/kdebase/debian/kdm.install
Log:
Revert greeter widget move in the 3.4 branch. Add Replaces for kdebase-bin on kdm (= 4:3.3.2-1b).


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-03-17 14:26:48 UTC (rev 817)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-03-17 14:33:27 UTC (rev 818)
@@ -1,4 +1,4 @@
-kdebase (4:3.4.0-0pre1) experimental; urgency=low
+kdebase (4:3.4.0-0pre2) experimental; urgency=low
 
   * New upstream release.
 

Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control	2005-03-17 14:26:48 UTC (rev 817)
+++ branches/kde-3.4.0/packages/kdebase/debian/control	2005-03-17 14:33:27 UTC (rev 818)
@@ -88,8 +88,8 @@
 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)
-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)
+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), kdm (= 4:3.3.2-1b)
 Description: core binaries for the KDE base module
  This package contains miscellaneous programs needed by other
  KDE applications, particularly those in the KDE base module.
@@ -192,10 +192,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 (>= 4:3.4.0), debconf (>= 1.2.9), libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate
 Suggests: khelpcenter
-Replaces: kdebase-bin (<< 4:3.3.2-2)
 Provides: x-display-manager
 Description: X display manager for KDE
  kdm manages a collection of X servers, which may be on the local host or

Modified: branches/kde-3.4.0/packages/kdebase/debian/kdebase-bin.install
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdebase-bin.install	2005-03-17 14:26:48 UTC (rev 817)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdebase-bin.install	2005-03-17 14:33:27 UTC (rev 818)
@@ -25,6 +25,10 @@
 debian/tmp/usr/lib/kde3/kcminit.so
 debian/tmp/usr/lib/kde3/kded_khotkeys.la
 debian/tmp/usr/lib/kde3/kded_khotkeys.so
+debian/tmp/usr/lib/kde3/kgreet_classic.la
+debian/tmp/usr/lib/kde3/kgreet_classic.so
+debian/tmp/usr/lib/kde3/kgreet_winbind.la
+debian/tmp/usr/lib/kde3/kgreet_winbind.so
 debian/tmp/usr/lib/kde3/khotkeys.la
 debian/tmp/usr/lib/kde3/khotkeys.so
 debian/tmp/usr/lib/kde3/kxkb.la

Modified: branches/kde-3.4.0/packages/kdebase/debian/kdm.install
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdm.install	2005-03-17 14:26:48 UTC (rev 817)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdm.install	2005-03-17 14:33:27 UTC (rev 818)
@@ -13,10 +13,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/lib/kde3/kgreet_winbind.la
-debian/tmp/usr/lib/kde3/kgreet_winbind.so
 debian/tmp/usr/share/apps/kdm/pics/kdelogo.png
 debian/tmp/usr/share/apps/kdm/pics/kdelogo-crystal.png
 debian/tmp/usr/share/apps/kdm/pics/shutdown.jpg