diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/changelog xfce4-quicklauncher-plugin-1.9.4/debian/changelog --- xfce4-quicklauncher-plugin-1.9.4/debian/changelog 2011-05-29 22:12:44.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/changelog 2011-04-19 21:23:53.000000000 +0000 @@ -1,24 +1,24 @@ -xfce4-quicklauncher-plugin (1.9.4-8ubuntu2) natty; urgency=low +xfce4-quicklauncher-plugin (1.9.4-9) unstable; urgency=low - * No-change rebuild against new xfce4-panel abi for external plugins. - * Bump xfce4-panel-dev b-dep to >= 4.7.7 to force using the new version. - - -- Lionel Le Folgoc Tue, 04 Jan 2011 20:51:04 +0100 - -xfce4-quicklauncher-plugin (1.9.4-8ubuntu1) natty; urgency=low - - * Rebuild against xfce4-panel 4.7. + [ Yves-Alexis Perez ] * debian/control: - - bump xfce4-panel b-dep to >= 4.7.0 to pick the correct version - - add missing explicit b-dep on libxfcegui4-dev, fixes FTBFS. - - -- Lionel Le Folgoc Wed, 08 Dec 2010 19:36:31 +0100 - -xfce4-quicklauncher-plugin (1.9.4-8build1) maverick; urgency=low + - add build-dep on libxfcegui4-dev now that it's not pulled by + xfce4-panel-dev. + - add build-dep on hardening-includes. + - update standards version to 3.9.2. + * 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. - * Rebuild against updated xfce4-panel shlibs. + [ Lionel Le Folgoc ] + * debian/control: + - add myself to Uploaders. + - remove Simon and Emanuele from uploaders, thanks to them. + - bump xfce4-panel-dev b-dep to (>= 4.8.0). - -- Lionel Le Folgoc Sat, 12 Jun 2010 12:30:26 +0200 + -- Yves-Alexis Perez Tue, 19 Apr 2011 23:21:32 +0200 xfce4-quicklauncher-plugin (1.9.4-8) unstable; urgency=low diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/control xfce4-quicklauncher-plugin-1.9.4/debian/control --- xfce4-quicklauncher-plugin-1.9.4/debian/control 2011-05-29 22:12:44.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/control 2011-04-19 21:21:24.000000000 +0000 @@ -1,13 +1,12 @@ Source: xfce4-quicklauncher-plugin Section: xfce Priority: optional -Maintainer: Xubuntu Developers -XSBC-Original-Maintainer: Debian Xfce Maintainers -Uploaders: Emanuele Rocca , Simon Huggins , Yves-Alexis Perez -Build-Depends: autotools-dev, cdbs, debhelper (>=7), libgtk2.0-dev, - xfce4-panel-dev (>= 4.7.7), libxml2-dev, libstartup-notification0-dev, - libxml-parser-perl, libxfcegui4-dev -Standards-Version: 3.8.4 +Maintainer: Debian Xfce Maintainers +Uploaders: Yves-Alexis Perez , Lionel Le Folgoc +Build-Depends: autotools-dev, cdbs, debhelper (>=7), libgtk2.0-dev, + xfce4-panel-dev (>= 4.8.0), libxml2-dev, libstartup-notification0-dev, + libxml-parser-perl, libxfcegui4-dev, hardening-includes +Standards-Version: 3.9.2 Homepage: http://goodies.xfce.org/ Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-quicklauncher-plugin/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-quicklauncher-plugin/ diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/patches/01_fix-multiscreen.patch xfce4-quicklauncher-plugin-1.9.4/debian/patches/01_fix-multiscreen.patch --- xfce4-quicklauncher-plugin-1.9.4/debian/patches/01_fix-multiscreen.patch 2011-05-29 22:12:44.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/patches/01_fix-multiscreen.patch 2011-04-02 22:27:03.000000000 +0000 @@ -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 +--- 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); diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/patches/02_fix-parameters-launcher.patch xfce4-quicklauncher-plugin-1.9.4/debian/patches/02_fix-parameters-launcher.patch --- xfce4-quicklauncher-plugin-1.9.4/debian/patches/02_fix-parameters-launcher.patch 2011-05-29 22:12:44.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/patches/02_fix-parameters-launcher.patch 2011-04-02 22:27:03.000000000 +0000 @@ -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 +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 diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/patches/03_save-settings.patch xfce4-quicklauncher-plugin-1.9.4/debian/patches/03_save-settings.patch --- xfce4-quicklauncher-plugin-1.9.4/debian/patches/03_save-settings.patch 2011-05-29 22:12:44.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/patches/03_save-settings.patch 2011-04-02 22:27:03.000000000 +0000 @@ -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 +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); diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/patches/04_fix-missing-english-translation.patch xfce4-quicklauncher-plugin-1.9.4/debian/patches/04_fix-missing-english-translation.patch --- xfce4-quicklauncher-plugin-1.9.4/debian/patches/04_fix-missing-english-translation.patch 2011-05-29 22:12:44.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/patches/04_fix-missing-english-translation.patch 2011-04-02 22:27:03.000000000 +0000 @@ -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 diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/patches/fix-4.6-load.patch xfce4-quicklauncher-plugin-1.9.4/debian/patches/fix-4.6-load.patch --- xfce4-quicklauncher-plugin-1.9.4/debian/patches/fix-4.6-load.patch 2011-05-29 22:12:44.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/patches/fix-4.6-load.patch 2011-04-02 22:27:03.000000000 +0000 @@ -1,3 +1,7 @@ +Description: fix loading on Xfce 4.6 panel +Author: Yves-Alexis Perez +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 diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/patches/series xfce4-quicklauncher-plugin-1.9.4/debian/patches/series --- xfce4-quicklauncher-plugin-1.9.4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/patches/series 2011-04-02 22:27:03.000000000 +0000 @@ -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 diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/rules xfce4-quicklauncher-plugin-1.9.4/debian/rules --- xfce4-quicklauncher-plugin-1.9.4/debian/rules 2011-05-29 22:12:44.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/rules 2011-04-02 22:27:03.000000000 +0000 @@ -1,7 +1,17 @@ #!/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 diff -Nru xfce4-quicklauncher-plugin-1.9.4/debian/source/format xfce4-quicklauncher-plugin-1.9.4/debian/source/format --- xfce4-quicklauncher-plugin-1.9.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-quicklauncher-plugin-1.9.4/debian/source/format 2011-05-29 22:12:44.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)