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

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-17 17:15:59 +0100 (Thu, 17 Mar 2005)
New Revision: 821

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kdm.prerm
Log:
Add kdm.prerm fix from BTS.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2005-03-17 14:56:28 UTC (rev 820)
+++ trunk/packages/kdebase/debian/changelog	2005-03-17 16:15:59 UTC (rev 821)
@@ -8,6 +8,11 @@
     inclusion, include an updated German po-debconf translation sent by
     Florian Ernst, and agreed upon several translators. (Closes: #291954)
 
+  +++ Changes by Christopher Martin:
+
+  * Add small kdm.prerm fix from Sylvain Ferriol, preventing failure
+    if default-x-display-manager doesn't exist. (Closes: #299913)
+
  -- 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/kdm.prerm
===================================================================
--- trunk/packages/kdebase/debian/kdm.prerm	2005-03-17 14:56:28 UTC (rev 820)
+++ trunk/packages/kdebase/debian/kdm.prerm	2005-03-17 16:15:59 UTC (rev 821)
@@ -100,7 +100,7 @@
 if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
   if [ -n "$HAVE_DEBCONF" ]; then
     # disown this question
-    db_unregister shared/default-x-display-manager
+    db_unregister shared/default-x-display-manager || true
     # does the question still exist?
     if db_get shared/default-x-display-manager; then
       if db_metaget shared/default-x-display-manager owners; then