[Pkg-xfce-commits] r1155 - in desktop/trunk/xfce4-panel/debian: . patches

Yves-Alexis Perez corsac-guest at alioth.debian.org
Mon Mar 12 20:11:29 CET 2007


Author: corsac-guest
Date: 2007-03-12 19:11:28 +0000 (Mon, 12 Mar 2007)
New Revision: 1155

Added:
   desktop/trunk/xfce4-panel/debian/patches/
   desktop/trunk/xfce4-panel/debian/patches/01_lower-margins-in-launchers.patch
   desktop/trunk/xfce4-panel/debian/patches/series
Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/control
   desktop/trunk/xfce4-panel/debian/rules
Log:
add versionned build-dep on gtk 2.10.
ship a patch which reduce margins in launcher plugin


Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2007-03-12 19:10:01 UTC (rev 1154)
+++ desktop/trunk/xfce4-panel/debian/changelog	2007-03-12 19:11:28 UTC (rev 1155)
@@ -1,3 +1,10 @@
+xfce4-panel (4.4.0-3) UNRELEASED; urgency=low
+
+  * debian/patch: added patch to reduce margin size of launchers.
+  * debian/control: added versionned build-dep against gtk 2.10. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 12 Mar 2007 20:10:23 +0100
+
 xfce4-panel (4.4.0-2) experimental; urgency=low
 
   * debian/rules: remove /usr/lib/libxfce4panel.la from the package.

Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control	2007-03-12 19:10:01 UTC (rev 1154)
+++ desktop/trunk/xfce4-panel/debian/control	2007-03-12 19:11:28 UTC (rev 1155)
@@ -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.0.0), libgtk2.0-dev, bison, libxft-dev, libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.0), chrpath
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.10.9), bison, libxft-dev, libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.0), chrpath, quilt
 Standards-Version: 3.7.2
 
 Package: xfce4-panel

Added: desktop/trunk/xfce4-panel/debian/patches/01_lower-margins-in-launchers.patch
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/01_lower-margins-in-launchers.patch	2007-03-12 19:10:01 UTC (rev 1154)
+++ desktop/trunk/xfce4-panel/debian/patches/01_lower-margins-in-launchers.patch	2007-03-12 19:11:28 UTC (rev 1155)
@@ -0,0 +1,15 @@
+Index: xfce4-panel-4.4.0/plugins/launcher/launcher.c
+===================================================================
+--- xfce4-panel-4.4.0.orig/plugins/launcher/launcher.c	2007-03-11 19:28:38.000000000 +0100
++++ xfce4-panel-4.4.0/plugins/launcher/launcher.c	2007-03-12 10:30:36.000000000 +0100
+@@ -728,9 +728,7 @@
+     
+     entry = g_ptr_array_index (launcher->entries, 0);
+ 
+-    size = xfce_panel_plugin_get_size (XFCE_PANEL_PLUGIN (launcher->plugin)) 
+-           - 2 - 2 * MAX (launcher->iconbutton->style->xthickness,
+-                          launcher->iconbutton->style->ythickness);
++    size = xfce_panel_plugin_get_size (XFCE_PANEL_PLUGIN (launcher->plugin));
+     
+     pb = launcher_icon_load_pixbuf (launcher->image, &(entry->icon), size);
+     gtk_image_set_from_pixbuf (GTK_IMAGE (launcher->image), pb);

Added: desktop/trunk/xfce4-panel/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/series	2007-03-12 19:10:01 UTC (rev 1154)
+++ desktop/trunk/xfce4-panel/debian/patches/series	2007-03-12 19:11:28 UTC (rev 1155)
@@ -0,0 +1 @@
+01_lower-margins-in-launchers.patch

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2007-03-12 19:10:01 UTC (rev 1154)
+++ desktop/trunk/xfce4-panel/debian/rules	2007-03-12 19:11:28 UTC (rev 1155)
@@ -11,7 +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=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final --libexecdir=\$${prefix}/lib
@@ -23,7 +35,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	
 	dh_testdir
 	dh_testroot




More information about the Pkg-xfce-commits mailing list