[Pkg-xfce-commits] r5303 - in goodies/trunk/xfce4-quicklauncher-plugin: . debian debian/patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sat Apr 2 10:27:04 UTC 2011 

Author: mrpouit-guest
Date: 2011-04-02 22:27:03 +0000 (Sat, 02 Apr 2011)
New Revision: 5303

Added:
   goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/series
   goodies/trunk/xfce4-quicklauncher-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-quicklauncher-plugin/
   goodies/trunk/xfce4-quicklauncher-plugin/debian/changelog
   goodies/trunk/xfce4-quicklauncher-plugin/debian/control
   goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/01_fix-multiscreen.patch
   goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/02_fix-parameters-launcher.patch
   goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/03_save-settings.patch
   goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/04_fix-missing-english-translation.patch
   goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/fix-4.6-load.patch
   goodies/trunk/xfce4-quicklauncher-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-quicklauncher-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-quicklauncher-plugin:4344-5302
/goodies/tags/xfce4-quicklauncher-plugin/1.9.4-8:3859-4343

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/changelog	2011-04-02 22:25:56 UTC (rev 5302)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/changelog	2011-04-02 22:27:03 UTC (rev 5303)
@@ -1,3 +1,17 @@
+xfce4-quicklauncher-plugin (1.9.4-9) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add build-dep on libxfcegui4-dev now that it's not pulled by
+      xfce4-panel-dev.
+    - add build-dep on hardening-includes.
+  * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs, --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 15:35:34 +0100
+
 xfce4-quicklauncher-plugin (1.9.4-8) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/control	2011-04-02 22:25:56 UTC (rev 5302)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/control	2011-04-02 22:27:03 UTC (rev 5303)
@@ -5,7 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: autotools-dev, cdbs, debhelper (>=7), libgtk2.0-dev, 
  xfce4-panel-dev (>= 4.4.2), libxml2-dev, libstartup-notification0-dev, 
- libxml-parser-perl
+ libxml-parser-perl, libxfcegui4-dev, hardening-includes
 Standards-Version: 3.8.4
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-quicklauncher-plugin/

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/01_fix-multiscreen.patch
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/01_fix-multiscreen.patch	2011-04-02 22:25:56 UTC (rev 5302)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/01_fix-multiscreen.patch	2011-04-02 22:27:03 UTC (rev 5303)
@@ -1,5 +1,9 @@
---- panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
-+++ panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
+Description: fix multi-screen support in “zaphod mode”
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=481085
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6941
+Author: David Mohr <bugs at da.mcbf.net>
+--- a/panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
++++ b/panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
 @@ -148,6 +148,7 @@
  	t_qck_launcher_opt_dlg* dlg;
  	xfce_panel_plugin_block_menu(plugin);

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/02_fix-parameters-launcher.patch
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/02_fix-parameters-launcher.patch	2011-04-02 22:25:56 UTC (rev 5302)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/02_fix-parameters-launcher.patch	2011-04-02 22:27:03 UTC (rev 5303)
@@ -1,3 +1,6 @@
+Description: fix default quicklauncher plugin, replace xfce-setting-show (4.4) by xfce4-settings-manager (4.6)
+Author: Yves-Alexis Perez <corsac at debian.org>
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6942
 diff --git a/panel-plugin/main.c b/panel-plugin/main.c
 index 191124e..1ad7222 100644
 --- a/panel-plugin/main.c

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/03_save-settings.patch
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/03_save-settings.patch	2011-04-02 22:25:56 UTC (rev 5302)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/03_save-settings.patch	2011-04-02 22:27:03 UTC (rev 5303)
@@ -1,9 +1,13 @@
-Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c
-===================================================================
---- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3779)
-+++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3780)
-@@ -150,6 +150,7 @@
- 	dlg = create_qck_launcher_dlg();
+Description: correctly save the plugin settings whenm quiting preferences
+Author: Masse Nicolas <masse_nicolas at yahoo.fr>
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=3782
+Applied-Upstream: 1.9.3, http://git.xfce.org/panel-plugins/xfce4-quicklauncher-plugin/commit/?id=b84c6896be6834c7def97c812db0937e8588b618
+diff --git a/panel-plugin/main.c b/panel-plugin/main.c
+index 49484c7..c325d12 100644
+--- a/panel-plugin/main.c
++++ b/panel-plugin/main.c
+@@ -151,6 +151,7 @@ quicklauncher_configure(XfcePanelPlugin *plugin, t_quicklauncher *quicklauncher)
+         gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
  	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
  	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
 +	quicklauncher_save(plugin, quicklauncher);

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/04_fix-missing-english-translation.patch
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/04_fix-missing-english-translation.patch	2011-04-02 22:25:56 UTC (rev 5302)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/04_fix-missing-english-translation.patch	2011-04-02 22:27:03 UTC (rev 5303)
@@ -1,3 +1,8 @@
+Description: add missing English translation
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525931
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xfce4-quicklauncher-plugin/+bug/179917
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525931
+Applied-Upstream: 1.9.5, http://git.xfce.org/panel-plugins/xfce4-quicklauncher-plugin/commit/?id=b84c6896be6834c7def97c812db0937e8588b618
 diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure
 --- xfce4-quicklauncher-plugin-1.9.4/configure	2007-06-27 21:07:14.000000000 +0200
 +++ xfce4-quicklauncher-plugin-1.9.4.new/configure	2008-03-04 22:11:23.000000000 +0100

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/fix-4.6-load.patch
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/fix-4.6-load.patch	2011-04-02 22:25:56 UTC (rev 5302)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/fix-4.6-load.patch	2011-04-02 22:27:03 UTC (rev 5303)
@@ -1,3 +1,7 @@
+Description: fix loading on Xfce 4.6 panel
+Author: Yves-Alexis Perez <corsac at debian.org>
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=3540
+Applied-Upstream: 1.9.3, http://git.xfce.org/panel-plugins/xfce4-quicklauncher-plugin/commit/?id=570e0b4d661098beb17da327617e52c4a7b231c3
 Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in
 ===================================================================
 --- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/quicklauncher.desktop.in.in	2009-03-06 10:24:24.000000000 +0100

Copied: goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/series (from rev 5302, goodies/branches/experimental/xfce4-quicklauncher-plugin/debian/patches/series)
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/series	2011-04-02 22:27:03 UTC (rev 5303)
@@ -0,0 +1,5 @@
+01_fix-multiscreen.patch
+02_fix-parameters-launcher.patch
+03_save-settings.patch
+04_fix-missing-english-translation.patch
+fix-4.6-load.patch

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/rules	2011-04-02 22:25:56 UTC (rev 5302)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/rules	2011-04-02 22:27:03 UTC (rev 5303)
@@ -1,8 +1,18 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
+#PIE doesn't seem to work :(
+DEB_BUILD_HARDENING_PIE:=0
+
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
 makebuilddir/xfce4-quicklauncher-plugin::
 	-rm -f config.log

More information about the Pkg-xfce-commits mailing list