[Pkg-xfce-commits] r6156 - goodies/trunk/xfce4-clipman-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-24 15:16:01 +0000 (Mon, 24 Oct 2011)
New Revision: 6156

Modified:
   goodies/trunk/xfce4-clipman-plugin/debian/changelog
   goodies/trunk/xfce4-clipman-plugin/debian/compat
   goodies/trunk/xfce4-clipman-plugin/debian/control
   goodies/trunk/xfce4-clipman-plugin/debian/rules
Log:
  - update debhelper build-dep to 8.9.4 for hardening support.
  - add a build-dep on dpkg-dev 1.16.1 for hardening support.
  - drop build-dep on hardening-includes
* debian/rules:
  - use debhelper 9 hardening support
* debian/compat bumped to 9.

Modified: goodies/trunk/xfce4-clipman-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/changelog	2011-10-24 15:09:42 UTC (rev 6155)
+++ goodies/trunk/xfce4-clipman-plugin/debian/changelog	2011-10-24 15:16:01 UTC (rev 6156)
@@ -7,8 +7,14 @@
     - 01_fix-symlink-doc-creation added, fix target symlinks in documentation.
   * debian/control:
     - move libxfcegui4-dev build-dep to libxfce4ui-1-dev.
+    - update debhelper build-dep to 8.9.4 for hardening support.
+    - add a build-dep on dpkg-dev 1.16.1 for hardening support.
+    - drop build-dep on hardening-includes
   * debian/xfce4-clipman.install:
     - documentation is now in /u/s/doc
+  * debian/rules:
+    - use debhelper 9 hardening support
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 24 Oct 2011 16:09:05 +0200
 

Modified: goodies/trunk/xfce4-clipman-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/compat	2011-10-24 15:09:42 UTC (rev 6155)
+++ goodies/trunk/xfce4-clipman-plugin/debian/compat	2011-10-24 15:16:01 UTC (rev 6156)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-clipman-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/control	2011-10-24 15:09:42 UTC (rev 6155)
+++ goodies/trunk/xfce4-clipman-plugin/debian/control	2011-10-24 15:16:01 UTC (rev 6156)
@@ -5,11 +5,10 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>,
  Mike Massonnet <mmassonnet at gmail.com>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~),
+Build-Depends: autotools-dev, debhelper (>= 8.9.4), dpkg-dev (>= 1.16.1),
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl, intltool,
  libx11-dev, pkg-config, libgtk2.0-dev, libexo-1-dev, 
  libxfconf-0-dev (>= 4.8.0), libglade2-dev, libunique-dev, libxfce4ui-1-dev,
- hardening-includes
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-clipman-plugin/

Modified: goodies/trunk/xfce4-clipman-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/rules	2011-10-24 15:09:42 UTC (rev 6155)
+++ goodies/trunk/xfce4-clipman-plugin/debian/rules	2011-10-24 15:16:01 UTC (rev 6156)
@@ -1,18 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+= -fPIC $(HARDENING_CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
+#CFLAGS+= -fPIC $(HARDENING_CFLAGS)
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@
 
 override_dh_auto_install:
-	-rm -rf debian/xfce4-clipman-plugin/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/xfce4-clipman-plugin/usr/lib/xfce4/panel-plugins/*.la
+	-rm -rf debian/xfce4-clipman-plugin/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.a
+	-rm -rf debian/xfce4-clipman-plugin/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.la
 	dh_auto_install