[Pkg-xfce-commits] r7289 - goodies/trunk/xfce4-smartbookmark-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2013-01-21 09:03:46 +0000 (Mon, 21 Jan 2013)
New Revision: 7289

Modified:
   goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog
   goodies/trunk/xfce4-smartbookmark-plugin/debian/compat
   goodies/trunk/xfce4-smartbookmark-plugin/debian/control
   goodies/trunk/xfce4-smartbookmark-plugin/debian/rules
Log:
  - update debhelper build-dep to 9.
* debian/compat bumped to 9.
* debian/rules:
  - rewrite using dh
  - use integrated dpkg/debhelper hardening support
  - use --parallel.

Modified: goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog	2013-01-21 06:50:11 UTC (rev 7288)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/changelog	2013-01-21 09:03:46 UTC (rev 7289)
@@ -9,6 +9,12 @@
   * New upstream release.
   * debian/control:
     - replace libxfcegui4-dev by libxfce4ui-dev.
+    - update debhelper build-dep to 9.
+  * debian/compat bumped to 9.
+  * debian/rules:
+    - rewrite using dh
+    - use integrated dpkg/debhelper hardening support
+    - use --parallel.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 21 Jan 2013 07:44:25 +0100
 

Modified: goodies/trunk/xfce4-smartbookmark-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/compat	2013-01-21 06:50:11 UTC (rev 7288)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/compat	2013-01-21 09:03:46 UTC (rev 7289)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-smartbookmark-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/control	2013-01-21 06:50:11 UTC (rev 7288)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/control	2013-01-21 09:03:46 UTC (rev 7289)
@@ -4,7 +4,7 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Stefan Ott <stefan at ott.net>,
  Evgeni Golov <evgeni at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev, 
+Build-Depends: cdbs, debhelper (>= 9), libgtk2.0-dev, 
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl, libxt-dev,
  libxfce4ui-1-dev (>= 4.8.0), hardening-includes, intltool, xfce4-dev-tools,
  libtool

Modified: goodies/trunk/xfce4-smartbookmark-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-smartbookmark-plugin/debian/rules	2013-01-21 06:50:11 UTC (rev 7288)
+++ goodies/trunk/xfce4-smartbookmark-plugin/debian/rules	2013-01-21 09:03:46 UTC (rev 7289)
@@ -1,25 +1,6 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-include /usr/share/hardening-includes/hardening.make
-
-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
-
-post-patches::
-	NOCONFIGURE=1 xdt-autogen
-
-clean::
-	rm -f $$(find -name 'Makefile.in*')
-	rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
-	rm -f intltool-extract.in intltool-merge.in intltool-update.in ltmain.sh
-	rm -f missing mkinstalldirs
-
-binary-post-install/xfce4-smartbookmark-plugin::
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+%:
+	dh $@ --parallel