diff -Nru exo-0.6.2/debian/changelog exo-0.6.2/debian/changelog --- exo-0.6.2/debian/changelog 2012-02-14 17:17:01.000000000 +0000 +++ exo-0.6.2/debian/changelog 2012-02-19 16:34:11.000000000 +0000 @@ -1,11 +1,21 @@ -exo (0.6.2-3ubuntu1) precise; urgency=low +exo (0.6.2-4) unstable; urgency=low + [ Lionel Le Folgoc ] * Use maintscript support in dh_installdeb rather than writing out dpkg-maintscript-helper commands by hand. We now simply Pre-Depend on a new enough version of dpkg rather than using 'dpkg-maintscript-helper supports' guards, leading to more predictable behaviour on upgrades. + Thanks Colin Watson for the patch. Closes: #659901 + + [ Yves-Alexis Perez ] + * debian/rules: + - use debhelper 9 hardening support. + * debian/control: + - update debhelper build-dep to 9. + - drop build-dep on hardening-includes. + - add build-dep on dpkg-dev 1.16.1 for hardening support. - -- Colin Watson Tue, 14 Feb 2012 17:17:00 +0000 + -- Lionel Le Folgoc Sun, 19 Feb 2012 17:34:08 +0100 exo (0.6.2-3) unstable; urgency=low diff -Nru exo-0.6.2/debian/control exo-0.6.2/debian/control --- exo-0.6.2/debian/control 2012-02-14 17:16:59.000000000 +0000 +++ exo-0.6.2/debian/control 2012-02-19 16:34:04.000000000 +0000 @@ -1,13 +1,12 @@ Source: exo Section: xfce Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Xfce Maintainers +Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc -Build-Depends: debhelper (>= 8.1.3), libxfce4util-dev (>= 4.8.0), +Build-Depends: debhelper (>= 9), libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), liburi-perl, chrpath, intltool, - hardening-includes, libglib2.0-dev (>= 2.27), + dpkg-dev (>= 1.16.1), libglib2.0-dev (>= 2.27), xfce4-dev-tools, libtool, gtk-doc-tools Standards-Version: 3.9.2 Homepage: http://www.xfce.org diff -Nru exo-0.6.2/debian/rules exo-0.6.2/debian/rules --- exo-0.6.2/debian/rules 2011-09-06 05:24:47.000000000 +0000 +++ exo-0.6.2/debian/rules 2012-02-19 16:34:04.000000000 +0000 @@ -1,15 +1,7 @@ #!/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 -CFLAGS+=$(HARDENING_CFLAGS) - -export CFLAGS LDFLAGS - -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs +export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow EXO_LIBNAME=1 EXO_SOVERSION=0