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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-09-13 21:46:59 +0000 (Tue, 13 Sep 2011)
New Revision: 6024

Added:
   desktop/trunk/xfce4-session/debian/postrm
   desktop/trunk/xfce4-session/debian/preinst
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/postinst
   desktop/trunk/xfce4-session/debian/rules
Log:
* debian/rules, debian/preinst, debian/postinst, debian/postrm:
  - don't start tips by default, they're completely outdated. closes: #640984

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2011-09-13 21:28:55 UTC (rev 6023)
+++ desktop/trunk/xfce4-session/debian/changelog	2011-09-13 21:46:59 UTC (rev 6024)
@@ -7,6 +7,8 @@
     - 03_dont-die-on-dbus-disconnect dropped, included upstream.
     - 02_fix-fortune-path, 04_fix-missing-lm and 
       05_force-xfsettingsd-start refreshed.
+  * debian/rules, debian/preinst, debian/postinst, debian/postrm:
+    - don't start tips by default, they're completely outdated. closes: #640984
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 13 Sep 2011 23:21:31 +0200
 

Modified: desktop/trunk/xfce4-session/debian/postinst
===================================================================
--- desktop/trunk/xfce4-session/debian/postinst	2011-09-13 21:28:55 UTC (rev 6023)
+++ desktop/trunk/xfce4-session/debian/postinst	2011-09-13 21:46:59 UTC (rev 6024)
@@ -7,6 +7,9 @@
     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

Added: desktop/trunk/xfce4-session/debian/postrm
===================================================================
--- desktop/trunk/xfce4-session/debian/postrm	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/postrm	2011-09-13 21:46:59 UTC (rev 6024)
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+dpkg-maintscript-helper rm_conffile \
+  /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4 -- "$@"
+
+#DEBHELPER#
+
+exit 0

Added: desktop/trunk/xfce4-session/debian/preinst
===================================================================
--- desktop/trunk/xfce4-session/debian/preinst	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/preinst	2011-09-13 21:46:59 UTC (rev 6024)
@@ -0,0 +1,8 @@
+#!/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/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules	2011-09-13 21:28:55 UTC (rev 6023)
+++ desktop/trunk/xfce4-session/debian/rules	2011-09-13 21:46:59 UTC (rev 6024)
@@ -32,6 +32,7 @@
 	cat debian/debian-tips >> debian/tmp/usr/share/xfce4/tips/tips
 	strfile debian/tmp/usr/share/xfce4/tips/tips \
 		debian/tmp/usr/share/xfce4/tips/tips.dat
+	rm -f debian/tmp/etc/xdg/autostart/xfce4-tips-autostart.desktop
 	dh_install --fail-missing
 
 override_dh_shlibdeps: