[Pkg-xfce-commits] r2049 - desktop/trunk/xfce4-session/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-05-18 16:07:10 +0000 (Sun, 18 May 2008)
New Revision: 2049

Removed:
   desktop/trunk/xfce4-session/debian/postinst
   desktop/trunk/xfce4-session/debian/prerm
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/control
Log:
* switch to triggers:
  - debian/{postinst,prerm} dropped.
  - debian/control: conflict against non-triggers-enabled xfce4-mcs-manager. 

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2008-05-18 16:04:09 UTC (rev 2048)
+++ desktop/trunk/xfce4-session/debian/changelog	2008-05-18 16:07:10 UTC (rev 2049)
@@ -1,3 +1,11 @@
+xfce4-session (4.4.2-5) UNRELEASED; urgency=low
+
+  * switch to triggers:
+    - debian/{postinst,prerm} dropped.
+    - debian/control: conflict against non-triggers-enabled xfce4-mcs-manager. 
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 May 2008 17:54:42 +0200
+
 xfce4-session (4.4.2-4) unstable; urgency=low
 
   * debian/patches: 06_rephrase-tip added.                      closes: #399694

Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control	2008-05-18 16:04:09 UTC (rev 2048)
+++ desktop/trunk/xfce4-session/debian/control	2008-05-18 16:07:10 UTC (rev 2049)
@@ -15,7 +15,7 @@
 Recommends: xbase-clients, xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, dbus-x11
 Suggests: sudo
 Provides: x-session-manager
-Conflicts: xfce4-toys, desktop-base (<< 0.3.20)
+Conflicts: xfce4-toys, desktop-base (<< 0.3.20), xfce-mcs-manager (<< 4.4.2-3)
 Replaces: xfce4-toys
 Description: Xfce4 Session Manager
  xfce4-session is an X11-compliant "session manager" designed for use with

Deleted: desktop/trunk/xfce4-session/debian/postinst
===================================================================
--- desktop/trunk/xfce4-session/debian/postinst	2008-05-18 16:04:09 UTC (rev 2048)
+++ desktop/trunk/xfce4-session/debian/postinst	2008-05-18 16:07:10 UTC (rev 2049)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = configure ]; then
-  update-alternatives --install /usr/bin/x-session-manager \
-    x-session-manager /usr/bin/xfce4-session 50 \
-    --slave /usr/share/man/man1/x-session-manager.1.gz \
-    x-session-manager.1.gz /usr/share/man/man1/xfce4-session.1.gz 
-
-  	# Get xfce-mcs-manager to reinit
-	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
-	
-fi
-
-#DEBHELPER#
-
-exit 0

Deleted: desktop/trunk/xfce4-session/debian/prerm
===================================================================
--- desktop/trunk/xfce4-session/debian/prerm	2008-05-18 16:04:09 UTC (rev 2048)
+++ desktop/trunk/xfce4-session/debian/prerm	2008-05-18 16:07:10 UTC (rev 2049)
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ] || [ "$1" = upgrade ]; then
-  update-alternatives --remove x-session-manager /usr/bin/xfce4-session 
-fi
-
-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