[Pkg-xfce-commits] r327 - desktop/trunk/xfce4-utils/debian

[Simon Huggins]

Author: huggie-guest
Date: 2005-11-27 12:15:36 +0000 (Sun, 27 Nov 2005)
New Revision: 327

Added:
   desktop/trunk/xfce4-utils/debian/preinst
Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/rules
Log:
Move /etc/X11/xdg/xfce4 -> /etc/xdg/xfce4 as per rest of the packages


Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2005-11-27 12:08:54 UTC (rev 326)
+++ desktop/trunk/xfce4-utils/debian/changelog	2005-11-27 12:15:36 UTC (rev 327)
@@ -1,9 +1,12 @@
 xfce4-utils (4.2.3-1) unstable; urgency=low
 
-  * New Upstream Release
-  * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin.
+  * Yves-Alexis Perez
+   * New Upstream Release
+   * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin.
+  * Simon Huggins
+   * Move sysconfdir to /etc/xdg as per rest of the packages
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 06 Nov 2005 22:01:12 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 27 Nov 2005 11:58:10 +0000
 
 xfce4-utils (4.2.2-1) unstable; urgency=low
 

Added: desktop/trunk/xfce4-utils/debian/preinst
===================================================================
--- desktop/trunk/xfce4-utils/debian/preinst	2005-11-27 12:08:54 UTC (rev 326)
+++ desktop/trunk/xfce4-utils/debian/preinst	2005-11-27 12:15:36 UTC (rev 327)
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+	# Move the old config files before dpkg checks them.
+	if [ -d /etc/X11/xdg/xfce4 ]; then
+		mkdir -p /etc/xdg/xfce4 || true
+		mv /etc/X11/xdg/xfce4/* /etc/xdg/xfce4 || true
+		rmdir /etc/X11/xdg/xfce4 || true
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0


Property changes on: desktop/trunk/xfce4-utils/debian/preinst
___________________________________________________________________
Name: svn:executable
   + *

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2005-11-27 12:08:54 UTC (rev 326)
+++ desktop/trunk/xfce4-utils/debian/rules	2005-11-27 12:15:36 UTC (rev 327)
@@ -18,7 +18,7 @@
 configure-stamp: 
 	
 	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc/X11  --with-browser=sensible-browser --enable-final
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc  --with-browser=sensible-browser --enable-final
 	touch configure-stamp
 
 build: patch configure-stamp build-stamp