[Pkg-xfce-commits] r6552 - desktop/branches/experimental/exo/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-03-31 12:16:53 +0000 (Sat, 31 Mar 2012)
New Revision: 6552

Modified:
   desktop/branches/experimental/exo/debian/changelog
   desktop/branches/experimental/exo/debian/control
   desktop/branches/experimental/exo/debian/rules
Log:
  - update debhelper build-dep to 9.
  - add build-dep on dpkg-dev 1.16.1.
  - drop build-dep on hardening-includes.
  - make libexo-helpers Multi-Arch: foreign.
* debian/compat bumped to 9.
* debian/rules:
  - use debhelper 9 and dpkg-dev 1.16.1 hardening support.

Modified: desktop/branches/experimental/exo/debian/changelog
===================================================================
--- desktop/branches/experimental/exo/debian/changelog	2012-03-31 12:16:53 UTC (rev 6551)
+++ desktop/branches/experimental/exo/debian/changelog	2012-03-31 12:16:53 UTC (rev 6552)
@@ -15,6 +15,13 @@
   * debian/control:
     - update libxfce4util build-dep to libxfce4util6-dev.
     - update standards version to 3.9.3.
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+    - drop build-dep on hardening-includes.
+    - make libexo-helpers Multi-Arch: foreign.
+  * debian/compat bumped to 9.
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 01 Jan 2012 18:55:29 +0100
 

Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control	2012-03-31 12:16:53 UTC (rev 6551)
+++ desktop/branches/experimental/exo/debian/control	2012-03-31 12:16:53 UTC (rev 6552)
@@ -4,10 +4,9 @@
 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 (>= 8.1.3), libxfce4util6-dev,
+Build-Depends: debhelper (>= 9), libxfce4util6-dev, dpkg-dev (>= 1.16.1),
  libxfce4ui-1-dev (>= 4.9.0), liburi-perl, chrpath, intltool, 
- hardening-includes, libglib2.0-dev (>= 2.27),
- xfce4-dev-tools, libtool, gtk-doc-tools
+ libglib2.0-dev (>= 2.27), xfce4-dev-tools, libtool, gtk-doc-tools
 Standards-Version: 3.9.3
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/
@@ -88,11 +87,12 @@
 Replaces: libexo-0.3-0 (<< 0.3.104-3)
 Description: libexo common files
  This package contains the common files in use by exo library. It ships
- various helpers, desktop files and documentation.
+ desktop files and documentation.
 
 Package: libexo-helpers
 Section: libs
 Architecture: any
+Multi-arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libexo-0.3-0 (<< 0.3.104-3), libexo-common (<< 0.6.2-3)
 Description: libexo helpers

Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules	2012-03-31 12:16:53 UTC (rev 6551)
+++ desktop/branches/experimental/exo/debian/rules	2012-03-31 12:16:53 UTC (rev 6552)
@@ -1,16 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 EXO_LIBNAME=1
 EXO_SOVERSION=0
 EXO_SONAME=libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION)