[Pkg-xfce-commits] r6386 - desktop/trunk/xfdesktop4/debian

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Tue Feb 7 07:46:02 UTC 2012


Author: mrpouit-guest
Date: 2012-02-07 19:46:02 +0000 (Tue, 07 Feb 2012)
New Revision: 6386

Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/compat
   desktop/trunk/xfdesktop4/debian/control
   desktop/trunk/xfdesktop4/debian/rules
Log:
* debian/rules:
  - drop obsolete configure option.
  - use debhelper 9 hardening support.
* debian/compat bumped to 9.
* debian/control:
  - drop hardening-includes build-dep.
  - update debhelper build-dep to 9 for hardening support.
  - add dpkg-dev 1.16.1 build-dep for hardening support.

Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2012-02-07 07:09:51 UTC (rev 6385)
+++ desktop/trunk/xfdesktop4/debian/changelog	2012-02-07 19:46:02 UTC (rev 6386)
@@ -1,6 +1,13 @@
 xfdesktop4 (4.8.3-2) UNRELEASED; urgency=low
 
-  * debian/rules: drop obsolete configure option.
+  * debian/rules:
+    - drop obsolete configure option.
+    - use debhelper 9 hardening support.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - drop hardening-includes build-dep.
+    - update debhelper build-dep to 9 for hardening support.
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 24 Jan 2012 22:05:42 +0100
 

Modified: desktop/trunk/xfdesktop4/debian/compat
===================================================================
--- desktop/trunk/xfdesktop4/debian/compat	2012-02-07 07:09:51 UTC (rev 6385)
+++ desktop/trunk/xfdesktop4/debian/compat	2012-02-07 19:46:02 UTC (rev 6386)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control	2012-02-07 07:09:51 UTC (rev 6385)
+++ desktop/trunk/xfdesktop4/debian/control	2012-02-07 19:46:02 UTC (rev 6386)
@@ -4,11 +4,11 @@
 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: debhelper (>= 7.0.50~), libglib2.0-dev (>= 2.18.0),
+Build-Depends: debhelper (>= 9), libglib2.0-dev (>= 2.18.0),
  libgtk2.0-dev (>= 2.14.0), libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0),
  libwnck-dev (>= 2.22), libxfconf-0-dev (>= 4.8.0), intltool, libdbus-glib-1-dev,
  libthunarx-2-dev (>= 1.2.0), libexo-1-dev (>= 0.6.0), libgarcon-1-0-dev (>= 0.1.2),
- libnotify-dev, chrpath, hardening-includes
+ libnotify-dev, chrpath, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2012-02-07 07:09:51 UTC (rev 6385)
+++ desktop/trunk/xfdesktop4/debian/rules	2012-02-07 19:46:02 UTC (rev 6386)
@@ -1,14 +1,8 @@
 #!/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)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
 override_dh_auto_configure:
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
 	dh_auto_configure -- --enable-thunarx --enable-exo \




More information about the Pkg-xfce-commits mailing list