[Pkg-xfce-commits] r2085 - desktop/trunk/xfdesktop4/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-05-19 06:31:39 +0000 (Mon, 19 May 2008)
New Revision: 2085

Removed:
   desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm
Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/control
   desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst
Log:
* switch to triggers:
  - debian/xfdesktop4.postinst: don't refresh xfce-mcs-manager.
  - debian/xfdesktop4.prerm dropped.
  - debian/control: conflicts against non-triggers-enabled xfce4-mcs-manager.

Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2008-05-19 06:21:37 UTC (rev 2084)
+++ desktop/trunk/xfdesktop4/debian/changelog	2008-05-19 06:31:39 UTC (rev 2085)
@@ -1,3 +1,12 @@
+xfdesktop4 (4.4.2-7) UNRELEASED; urgency=low
+
+  * switch to triggers:
+    - debian/xfdesktop4.postinst: don't refresh xfce-mcs-manager.
+    - debian/xfdesktop4.prerm dropped.
+    - debian/control: conflicts against non-triggers-enabled xfce4-mcs-manager.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 19 May 2008 08:31:15 +0200
+
 xfdesktop4 (4.4.2-6) unstable; urgency=low
 
   * debian/control: replace dbus by dbus-x11 to make sure dbus users have a

Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control	2008-05-19 06:21:37 UTC (rev 2084)
+++ desktop/trunk/xfdesktop4/debian/control	2008-05-19 06:31:39 UTC (rev 2085)
@@ -20,7 +20,7 @@
 Depends: ${shlibs:Depends}, xfce4-mcs-manager, xfce4-utils, xfdesktop4-data (= ${source:Version}), exo-utils
 Recommends: dbus-x11, librsvg2-common
 Suggests: menu
-Conflicts: menu (<<2.1.12)
+Conflicts: menu (<<2.1.12), xfce4-mcs-manager (<< 4.4.2-3)
 Description: Provides desktop background and root menu
  This package contains a tool that allows you to switch the background image
  and a root menu.  Additionally, it contains dialogs to change the  number

Modified: desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst	2008-05-19 06:21:37 UTC (rev 2084)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst	2008-05-19 06:31:39 UTC (rev 2085)
@@ -9,10 +9,6 @@
 -->
 EOF
 	fi
-
-	# Get xfce-mcs-manager to reinit
-	kill -s USR1 `pidof xfce-mcs-manager` > /dev/null 2>&1|| true
-
 fi
 
 #DEBHELPER#

Deleted: desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm	2008-05-19 06:21:37 UTC (rev 2084)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm	2008-05-19 06:31:39 UTC (rev 2085)
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ]; then
-	# Get xfce-mcs-manager to reinit
-	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
-fi
-
-#DEBHELPER#
-
-exit 0