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

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Thu Feb 16 09:35:33 UTC 2012


Author: mrpouit-guest
Date: 2012-02-16 21:35:33 +0000 (Thu, 16 Feb 2012)
New Revision: 6418

Added:
   desktop/trunk/xfce4-session/debian/maintscript
Removed:
   desktop/trunk/xfce4-session/debian/postrm
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/control
   desktop/trunk/xfce4-session/debian/postinst
   desktop/trunk/xfce4-session/debian/preinst
Log:
Use maintscript support in dh_installdeb rather than writing out
dpkg-maintscript-helper commands by hand.  This adds a Pre-Dependency on
a sufficient version of dpkg. Thanks Colin Watson for the patch.
Closes: #659890

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2012-02-16 21:25:35 UTC (rev 6417)
+++ desktop/trunk/xfce4-session/debian/changelog	2012-02-16 21:35:33 UTC (rev 6418)
@@ -1,3 +1,12 @@
+xfce4-session (4.8.3-2) UNRELEASED; urgency=low
+
+  * Use maintscript support in dh_installdeb rather than writing out
+    dpkg-maintscript-helper commands by hand.  This adds a Pre-Dependency on
+    a sufficient version of dpkg. Thanks Colin Watson for the patch.
+                                                                Closes: #659890
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 16 Feb 2012 22:29:06 +0100
+
 xfce4-session (4.8.3-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control	2012-02-16 21:25:35 UTC (rev 6417)
+++ desktop/trunk/xfce4-session/debian/control	2012-02-16 21:35:33 UTC (rev 6418)
@@ -16,7 +16,7 @@
 Package: xfce4-session
 Section: xfce
 Architecture: any
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}, multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings, xfconf
 Recommends: xfwm4, xfce4-utils, xfdesktop4, ${shlibs:Recommends}, consolekit, upower,
  dbus-x11, x11-xserver-utils

Added: desktop/trunk/xfce4-session/debian/maintscript
===================================================================
--- desktop/trunk/xfce4-session/debian/maintscript	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/maintscript	2012-02-16 21:35:33 UTC (rev 6418)
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4

Modified: desktop/trunk/xfce4-session/debian/postinst
===================================================================
--- desktop/trunk/xfce4-session/debian/postinst	2012-02-16 21:25:35 UTC (rev 6417)
+++ desktop/trunk/xfce4-session/debian/postinst	2012-02-16 21:35:33 UTC (rev 6418)
@@ -7,9 +7,6 @@
     x-session-manager.1.gz /usr/share/man/man1/xfce4-session.1.gz 
 fi
 
-dpkg-maintscript-helper rm_conffile \
-  /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4 -- "$@"
-
 #DEBHELPER#
 
 exit 0

Deleted: desktop/trunk/xfce4-session/debian/postrm
===================================================================
--- desktop/trunk/xfce4-session/debian/postrm	2012-02-16 21:25:35 UTC (rev 6417)
+++ desktop/trunk/xfce4-session/debian/postrm	2012-02-16 21:35:33 UTC (rev 6418)
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-dpkg-maintscript-helper rm_conffile \
-  /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4 -- "$@"
-
-#DEBHELPER#
-
-exit 0

Modified: desktop/trunk/xfce4-session/debian/preinst
===================================================================
--- desktop/trunk/xfce4-session/debian/preinst	2012-02-16 21:25:35 UTC (rev 6417)
+++ desktop/trunk/xfce4-session/debian/preinst	2012-02-16 21:35:33 UTC (rev 6418)
@@ -1,8 +1,5 @@
 #!/bin/sh -e
 
-dpkg-maintscript-helper rm_conffile \
-  /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4 -- "$@"
-
 # Remove symlink for el, replaced by a folder in 4.8.2-1
 case "$1" in
 install|upgrade)




More information about the Pkg-xfce-commits mailing list