[Pkg-xfce-commits] r1019 - in desktop/trunk/xfdesktop4/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-12-18 14:20:52 +0100 (Mon, 18 Dec 2006)
New Revision: 1019

Added:
   desktop/trunk/xfdesktop4/debian/patches/
   desktop/trunk/xfdesktop4/debian/patches/01_show-backdrop-by-default.patch
   desktop/trunk/xfdesktop4/debian/patches/series
Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/control
   desktop/trunk/xfdesktop4/debian/rules
Log:
show default backdrop even if it has been taken from source code and not from
(maybe inexistent on debian without desktop-base) config file


Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2006-12-18 13:19:43 UTC (rev 1018)
+++ desktop/trunk/xfdesktop4/debian/changelog	2006-12-18 13:20:52 UTC (rev 1019)
@@ -2,8 +2,10 @@
 
   * Added xfce4-popup-menu manpage, thanks François Wendling. 	closes: #399198
   * debian/control: recommends dbus.				closes: #402420
+  * 01_show-backdrop-by-default.patch: enable backdrop even if none is 
+    configured in config file (a default image is taken).
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 11 Dec 2006 23:32:37 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 18 Dec 2006 13:05:22 +0100
 
 xfdesktop4 (4.3.99.2-1) unstable; urgency=low
 

Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control	2006-12-18 13:19:43 UTC (rev 1018)
+++ desktop/trunk/xfdesktop4/debian/control	2006-12-18 13:20:52 UTC (rev 1019)
@@ -3,7 +3,7 @@
 Priority: optional
 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.1.26), libgtk2.0-dev, libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.3.99.2), libthunar-vfs-1-dev (>= 0.4.0rc1-1), chrpath, libdbus-glib-1-dev
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.3.99.2), libthunar-vfs-1-dev (>= 0.4.0rc1-1), chrpath, libdbus-glib-1-dev, quilt
 Standards-Version: 3.7.2
 
 Package: xfdesktop4

Added: desktop/trunk/xfdesktop4/debian/patches/01_show-backdrop-by-default.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/01_show-backdrop-by-default.patch	2006-12-18 13:19:43 UTC (rev 1018)
+++ desktop/trunk/xfdesktop4/debian/patches/01_show-backdrop-by-default.patch	2006-12-18 13:20:52 UTC (rev 1019)
@@ -0,0 +1,14 @@
+--- xfdesktop4/settings/appearance-settings.c.orig	2006-11-05 11:57:02.000000000 +0100
++++ xfdesktop4/settings/appearance-settings.c	2006-12-18 12:58:11.000000000 +0100
+@@ -275,9 +275,9 @@
+             if(setting)
+                 bp->show_image = setting->data.v_int == 0 ? FALSE : TRUE;
+             else {
+-                bp->show_image = FALSE;
++                bp->show_image = TRUE;
+                 mcs_manager_set_int(mcs_plugin->manager, setting_name,
+-                        BACKDROP_CHANNEL, 0);
++                        BACKDROP_CHANNEL, 1);
+             }
+             
+             /* the color style */

Added: desktop/trunk/xfdesktop4/debian/patches/series
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/series	2006-12-18 13:19:43 UTC (rev 1018)
+++ desktop/trunk/xfdesktop4/debian/patches/series	2006-12-18 13:20:52 UTC (rev 1019)
@@ -0,0 +1 @@
+01_show-backdrop-by-default.patch

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2006-12-18 13:19:43 UTC (rev 1018)
+++ desktop/trunk/xfdesktop4/debian/rules	2006-12-18 13:20:52 UTC (rev 1019)
@@ -11,8 +11,19 @@
 	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 --mandir=/usr/share/man --disable-rpath --libexecdir=\$${prefix}/lib --enable-final
 
@@ -23,7 +34,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 
 	dh_testdir
 	dh_testroot