[Pkg-xfce-commits] r7180 - goodies/branches/experimental/parole/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-10-07 08:49:08 +0000 (Sun, 07 Oct 2012)
New Revision: 7180

Modified:
   goodies/branches/experimental/parole/debian/changelog
   goodies/branches/experimental/parole/debian/compat
   goodies/branches/experimental/parole/debian/control
   goodies/branches/experimental/parole/debian/parole.install
   goodies/branches/experimental/parole/debian/rules
Log:
  - update debhelper build-dep to 9 and dpkg-dev one to 1.16.1
  - drop hardening-includes build-dep.
* debian/rules:
  - use debhelper 9 / dpkg-dev 1.16.1 hardening support.
  - use multiarch paths.
* debian/compat bumped to 9.
* debian/parole.install:
  - update paths for multiarch.

Modified: goodies/branches/experimental/parole/debian/changelog
===================================================================
--- goodies/branches/experimental/parole/debian/changelog	2012-10-07 07:46:02 UTC (rev 7179)
+++ goodies/branches/experimental/parole/debian/changelog	2012-10-07 08:49:08 UTC (rev 7180)
@@ -14,6 +14,14 @@
   [ Yves-Alexis Perez ]
   * debian/control:
     - update standards version to 3.9.3.
+    - update debhelper build-dep to 9 and dpkg-dev one to 1.16.1
+    - drop hardening-includes build-dep.
+  * debian/rules:
+    - use debhelper 9 / dpkg-dev 1.16.1 hardening support.
+    - use multiarch paths.
+  * debian/compat bumped to 9.
+  * debian/parole.install:
+    - update paths for multiarch.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 15 Aug 2012 13:42:36 +0200
 

Modified: goodies/branches/experimental/parole/debian/compat
===================================================================
--- goodies/branches/experimental/parole/debian/compat	2012-10-07 07:46:02 UTC (rev 7179)
+++ goodies/branches/experimental/parole/debian/compat	2012-10-07 08:49:08 UTC (rev 7180)
@@ -1 +1 @@
-7
+9

Modified: goodies/branches/experimental/parole/debian/control
===================================================================
--- goodies/branches/experimental/parole/debian/control	2012-10-07 07:46:02 UTC (rev 7179)
+++ goodies/branches/experimental/parole/debian/control	2012-10-07 08:49:08 UTC (rev 7180)
@@ -4,11 +4,11 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
  Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config, 
+Build-Depends: debhelper (>= 9), intltool, pkg-config, 
  libgtk2.0-dev (>= 2.20), libgstreamer0.10-dev, 
  libgstreamer-plugins-base0.10-dev, libdbus-1-dev, libdbus-glib-1-dev,
  libxfce4ui-1-dev, libnotify-dev, libtagc0-dev,
- hardening-includes
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/projects/applications/parole
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/parole/

Modified: goodies/branches/experimental/parole/debian/parole.install
===================================================================
--- goodies/branches/experimental/parole/debian/parole.install	2012-10-07 07:46:02 UTC (rev 7179)
+++ goodies/branches/experimental/parole/debian/parole.install	2012-10-07 08:49:08 UTC (rev 7180)
@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/parole-0/*.so
+usr/lib/*/parole-0/*.so
 usr/share

Modified: goodies/branches/experimental/parole/debian/rules
===================================================================
--- goodies/branches/experimental/parole/debian/rules	2012-10-07 07:46:02 UTC (rev 7179)
+++ goodies/branches/experimental/parole/debian/rules	2012-10-07 08:49:08 UTC (rev 7180)
@@ -1,19 +1,13 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-O1 -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@
 
 override_dh_makeshlibs:
-	dh_makeshlibs -X usr/lib/parole-0
+	dh_makeshlibs -X usr/lib/$(DEB_HOST_MULTIARCH)/parole-0
 
 override_dh_install:
 	find debian/tmp/usr/lib -name '*.la' -delete