[Pkg-xfce-commits] r6247 - goodies/trunk/xfce4-fsguard-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-12-03 19:21:00 +0000 (Sat, 03 Dec 2011)
New Revision: 6247

Modified:
   goodies/trunk/xfce4-fsguard-plugin/debian/changelog
   goodies/trunk/xfce4-fsguard-plugin/debian/compat
   goodies/trunk/xfce4-fsguard-plugin/debian/control
   goodies/trunk/xfce4-fsguard-plugin/debian/rules
Log:
* debian/rules:
  - use dpkg-dev 1.16.1 and dh9 hardening support
  - use multiarch paths
* debian/compat bumped to 9.
* debian/control:
  - drop build-dep on hardening-includes
  - add build-dep on debhelper 8.9.4 and dpkg-dev 1.16.1 for hardening
    support.
  - only set uploaders to Lionel and me, thanks to all the others for the
    past work!
* debian/compat bumped to 9.

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/changelog	2011-12-01 06:21:20 UTC (rev 6246)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/changelog	2011-12-03 19:21:00 UTC (rev 6247)
@@ -1,9 +1,23 @@
 xfce4-fsguard-plugin (1.0.0-3) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * debian/patches/01_fix-resource-file-loading.patch: updated, fix segfault
     when no config exists, and correctly initialize settings with default
     values.                                                     closes: #637160
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use dpkg-dev 1.16.1 and dh9 hardening support
+    - use multiarch paths
+  * debian/compat bumped to 9.
+  * debian/control:
+    - drop build-dep on hardening-includes
+    - add build-dep on debhelper 8.9.4 and dpkg-dev 1.16.1 for hardening
+      support.
+    - only set uploaders to Lionel and me, thanks to all the others for the
+      past work!
+  * debian/compat bumped to 9.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 14 Sep 2011 23:24:25 +0200
 
 xfce4-fsguard-plugin (1.0.0-2) unstable; urgency=low

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/compat	2011-12-01 06:21:20 UTC (rev 6246)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/compat	2011-12-03 19:21:00 UTC (rev 6247)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/control	2011-12-01 06:21:20 UTC (rev 6246)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/control	2011-12-03 19:21:00 UTC (rev 6247)
@@ -2,13 +2,11 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
- Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>,
- Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>,
+Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), xfce4-panel-dev (>= 4.8),
+Build-Depends: debhelper (>= 8.9.4), xfce4-panel-dev (>= 4.8),
  libxml2-dev, libxml-parser-perl, intltool, libx11-dev, pkg-config,
- libgtk2.0-dev, libxfcegui4-dev (>= 4.8), hardening-includes
+ libgtk2.0-dev, libxfcegui4-dev (>= 4.8), dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/rules	2011-12-01 06:21:20 UTC (rev 6246)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/rules	2011-12-03 19:21:00 UTC (rev 6247)
@@ -1,16 +1,11 @@
 #!/usr/bin/make -f
-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 DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 override_dh_install:
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+	-rm -rf debian/`dh_listpackages`/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.a
+	-rm -rf debian/`dh_listpackages`/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.la
 	dh_install --fail-missing
 
 override_dh_auto_test: