[Pkg-xfce-commits] r994 - in desktop/trunk/libxfce4util/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-11-20 12:46:23 +0100 (Mon, 20 Nov 2006)
New Revision: 994

Added:
   desktop/trunk/libxfce4util/debian/patches/
   desktop/trunk/libxfce4util/debian/patches/01_add-desktop-base-in-config-dirs.patch
   desktop/trunk/libxfce4util/debian/patches/series
Modified:
   desktop/trunk/libxfce4util/debian/changelog
   desktop/trunk/libxfce4util/debian/control
   desktop/trunk/libxfce4util/debian/rules
Log:
use files from desktop-base package if they exist


Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog	2006-11-19 11:05:08 UTC (rev 993)
+++ desktop/trunk/libxfce4util/debian/changelog	2006-11-20 11:46:23 UTC (rev 994)
@@ -1,3 +1,10 @@
+libxfce4util (4.3.99.2-2) unstable; urgency=low
+
+  * 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
+
 libxfce4util (4.3.99.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/libxfce4util/debian/control
===================================================================
--- desktop/trunk/libxfce4util/debian/control	2006-11-19 11:05:08 UTC (rev 993)
+++ desktop/trunk/libxfce4util/debian/control	2006-11-20 11:46:23 UTC (rev 994)
@@ -3,7 +3,7 @@
 Section: libs
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at corsac.net>
-Build-Depends: debhelper (>> 4.0.0), libglib2.0-dev, chrpath
+Build-Depends: debhelper (>> 4.0.0), libglib2.0-dev, chrpath, quilt
 Standards-Version: 3.7.2
 
 Package: libxfce4util-dev

Added: desktop/trunk/libxfce4util/debian/patches/01_add-desktop-base-in-config-dirs.patch
===================================================================
--- desktop/trunk/libxfce4util/debian/patches/01_add-desktop-base-in-config-dirs.patch	2006-11-19 11:05:08 UTC (rev 993)
+++ desktop/trunk/libxfce4util/debian/patches/01_add-desktop-base-in-config-dirs.patch	2006-11-20 11:46:23 UTC (rev 994)
@@ -0,0 +1,17 @@
+Index: libxfce4util-4.3.99.2/libxfce4util/xfce-resource.c
+===================================================================
+--- libxfce4util-4.3.99.2.orig/libxfce4util/xfce-resource.c	2006-11-17 15:31:52.000000000 +0100
++++ libxfce4util-4.3.99.2/libxfce4util/xfce-resource.c	2006-11-17 15:32:08.000000000 +0100
+@@ -184,6 +184,12 @@
+   _res_split_and_append (dirs, XFCE_RESOURCE_CONFIG);
+   _res_split_and_append (SYSCONFDIR "/xdg", XFCE_RESOURCE_CONFIG);
+ 
++  /* add desktop-base config files to the list. quick and dirty
++   * patch for Etch
++   */
++  _res_split_and_append ("/usr/share/desktop-base/profiles/xdg-config", 
++		  XFCE_RESOURCE_CONFIG);
++
+   /*
+    * Icons dirs
+    */

Added: desktop/trunk/libxfce4util/debian/patches/series
===================================================================
--- desktop/trunk/libxfce4util/debian/patches/series	2006-11-19 11:05:08 UTC (rev 993)
+++ desktop/trunk/libxfce4util/debian/patches/series	2006-11-20 11:46:23 UTC (rev 994)
@@ -0,0 +1 @@
+01_add-desktop-base-in-config-dirs.patch

Modified: desktop/trunk/libxfce4util/debian/rules
===================================================================
--- desktop/trunk/libxfce4util/debian/rules	2006-11-19 11:05:08 UTC (rev 993)
+++ desktop/trunk/libxfce4util/debian/rules	2006-11-20 11:46:23 UTC (rev 994)
@@ -11,7 +11,18 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
+
+unpatch:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc patch-stamp
+
+config.status: configure patch-stamp
 	
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --enable-final
@@ -23,7 +34,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	
 	dh_testdir
 	dh_testroot