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

[Yves-Alexis Perez]

Author: corsac
Date: 2013-05-25 20:22:37 +0000 (Sat, 25 May 2013)
New Revision: 7667

Added:
   goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/05_fix-version-in-configure.ac
Modified:
   goodies/trunk/xfce4-quicklauncher-plugin/debian/changelog
   goodies/trunk/xfce4-quicklauncher-plugin/debian/compat
   goodies/trunk/xfce4-quicklauncher-plugin/debian/control
   goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/series
   goodies/trunk/xfce4-quicklauncher-plugin/debian/rules
Log:
* debian/rules:
  - switch to dh rules.
  - enable all hardening flags but disable PIE.
* debian/control:
  - update debhelper build-dep to 9.
  - drop cdbs and hardening-includes build-dep, we now uses dpkg/debhelper
    hardening support.
* debian/compat bumped to 9.
* debian/patches:
  - 05_fix-version-in-configure added, fix version macro in configure.ac

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/changelog	2013-05-25 19:54:53 UTC (rev 7666)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/changelog	2013-05-25 20:22:37 UTC (rev 7667)
@@ -1,3 +1,18 @@
+xfce4-quicklauncher-plugin (1.9.4-10) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - switch to dh rules.
+    - enable all hardening flags but disable PIE.
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - drop cdbs and hardening-includes build-dep, we now uses dpkg/debhelper
+      hardening support.
+  * debian/compat bumped to 9.
+  * debian/patches:
+    - 05_fix-version-in-configure added, fix version macro in configure.ac
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 25 May 2013 21:25:03 +0200
+
 xfce4-quicklauncher-plugin (1.9.4-9) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/compat	2013-05-25 19:54:53 UTC (rev 7666)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/compat	2013-05-25 20:22:37 UTC (rev 7667)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/control	2013-05-25 19:54:53 UTC (rev 7666)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/control	2013-05-25 20:22:37 UTC (rev 7667)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: autotools-dev, cdbs, debhelper (>=7), libgtk2.0-dev,
+Build-Depends: autotools-dev, debhelper (>=9), libgtk2.0-dev,
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libstartup-notification0-dev,
- libxml-parser-perl, libxfcegui4-dev, hardening-includes
+ libxml-parser-perl, libxfcegui4-dev
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-quicklauncher-plugin/

Added: goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/05_fix-version-in-configure.ac
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/05_fix-version-in-configure.ac	                        (rev 0)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/05_fix-version-in-configure.ac	2013-05-25 20:22:37 UTC (rev 7667)
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@ dnl version info
+ m4_define([xfce4_quicklauncher_version],[1.9.4])
+ 
+ dnl init autoconf
+-AC_INIT([xfce4-quicklauncher-plugin], [xfce4_quicklauncher_version()], [masse_nicolas at yahoo.fr])
++AC_INIT([xfce4-quicklauncher-plugin], [xfce4_quicklauncher_version], [masse_nicolas at yahoo.fr])
+ AC_CONFIG_SRCDIR([configure])
+ 
+ dnl init automake

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/series	2013-05-25 19:54:53 UTC (rev 7666)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/patches/series	2013-05-25 20:22:37 UTC (rev 7667)
@@ -3,3 +3,4 @@
 03_save-settings.patch
 04_fix-missing-english-translation.patch
 fix-4.6-load.patch
+05_fix-version-in-configure.ac

Modified: goodies/trunk/xfce4-quicklauncher-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-quicklauncher-plugin/debian/rules	2013-05-25 19:54:53 UTC (rev 7666)
+++ goodies/trunk/xfce4-quicklauncher-plugin/debian/rules	2013-05-25 20:22:37 UTC (rev 7667)
@@ -1,21 +1,20 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.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
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
-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)
+%:
+	dh $@ --parallel
 
-export CFLAGS LDFLAGS
+override_dh_auto_configure:
+	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
+	find .pc -type f -name '*.in' -exec echo '{}' >> po/POTFILES.skip \;
+	dh_auto_configure -- --disable-static
 
-makebuilddir/xfce4-quicklauncher-plugin::
-	-rm -f config.log
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
 
-binary-post-install/xfce4-quicklauncher-plugin::
-	-rm -rf debian/xfce4-quicklauncher-plugin/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/xfce4-quicklauncher-plugin/usr/lib/xfce4/panel-plugins/*.la
+override_dh_auto_install:
+	dh_auto_install
+	find debian/xfce4-quicklauncher-plugin -name '*.la' -delete