[Pkg-xfce-commits] r995 - in desktop/trunk: libxfce4util/debian xfce4-session/debian

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-11-20 12:56:08 +0100 (Mon, 20 Nov 2006)
New Revision: 995

Modified:
   desktop/trunk/libxfce4util/debian/changelog
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/rules
Log:
xfce4-session: don't ship xfce4-session.rc so it can use files from
desktop-base.

libxfce4util: don't bump package revision because package is not already in archive


Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog	2006-11-20 11:46:23 UTC (rev 994)
+++ desktop/trunk/libxfce4util/debian/changelog	2006-11-20 11:56:08 UTC (rev 995)
@@ -1,16 +1,11 @@
-libxfce4util (4.3.99.2-2) unstable; urgency=low
+libxfce4util (4.3.99.2-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * 01_add-desktop-base-in-config-dirs: enable use of config files provided
     by desktop-base package. Quick & dirty patch for Etch.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Fri, 17 Nov 2006 15:33:01 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 20 Nov 2006 12:54:53 +0100
 
-libxfce4util (4.3.99.2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 16 Nov 2006 13:52:05 +0100
-
 libxfce4util (4.3.99.1-1) unstable; urgency=low
 
   * New upstream release 

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2006-11-20 11:46:23 UTC (rev 994)
+++ desktop/trunk/xfce4-session/debian/changelog	2006-11-20 11:56:08 UTC (rev 995)
@@ -1,10 +1,12 @@
-xfce4-session (4.3.99.2-1) unstable; urgency=low
+xfce4-session (4.3.99.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2).
   * Added a patch to disable shadows in simple engine.
+  * debian/rules: remove xfce4-session.rc from package so it uses by default
+    files from desktop-base if present.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 16 Nov 2006 16:14:07 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 20 Nov 2006 12:49:44 +0100
 
 xfce4-session (4.3.99.1-1) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules	2006-11-20 11:46:23 UTC (rev 994)
+++ desktop/trunk/xfce4-session/debian/rules	2006-11-20 11:56:08 UTC (rev 995)
@@ -82,6 +82,10 @@
 	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
 	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/*.la
 
+	#Don't ship systemwide defaults as they will override desktop-base
+	#settings. We'll need something cleaner for post-etch.
+	rm -f $(CURDIR)/debian/xfce4-session/etc/xdg/xfce4-session/xfce4-session.rc
+
 	chrpath -d -k `pwd`/debian/xfce4-session/usr/bin/* \
 		`pwd`/debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \
 		`pwd`/debian/xfce4-session/usr/lib/xfce4/*/*so \