[Pkg-xfce-commits] r6547 - desktop/branches/experimental/xfconf/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-03-31 11:20:06 +0000 (Sat, 31 Mar 2012)
New Revision: 6547

Modified:
   desktop/branches/experimental/xfconf/debian/changelog
   desktop/branches/experimental/xfconf/debian/compat
   desktop/branches/experimental/xfconf/debian/control
   desktop/branches/experimental/xfconf/debian/libxfconf-0-2.install
   desktop/branches/experimental/xfconf/debian/libxfconf-0-dev.install
   desktop/branches/experimental/xfconf/debian/rules
   desktop/branches/experimental/xfconf/debian/xfconf.install
Log:
  - update debhelper build-dep to 9.
  - add build-dep on dpkg-dev 1.16.1.
  - drop build-dep on hardening-includes.
  - add depend on ${misc:Pre-Depends} on lib package for multi-arch.
* debian/rules:
  - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
  - update paths for multi-arch.
* debian/compat bumped to 9.
* debian/*.install:
  - update paths for multi-arch.

Modified: desktop/branches/experimental/xfconf/debian/changelog
===================================================================
--- desktop/branches/experimental/xfconf/debian/changelog	2012-03-31 11:14:30 UTC (rev 6546)
+++ desktop/branches/experimental/xfconf/debian/changelog	2012-03-31 11:20:06 UTC (rev 6547)
@@ -1,7 +1,17 @@
 xfconf (4.9.0-1) UNRELEASED; urgency=low
 
   * New upstream development release.
-    - update libxfce4util build-dep for 4.9. 
+    - update libxfce4util build-dep for 4.9.
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+    - drop build-dep on hardening-includes.
+    - add depend on ${misc:Pre-Depends} on lib package for multi-arch.
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+    - update paths for multi-arch.
+  * debian/compat bumped to 9.
+  * debian/*.install:
+    - update paths for multi-arch.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 31 Mar 2012 10:00:03 +0200
 

Modified: desktop/branches/experimental/xfconf/debian/compat
===================================================================
--- desktop/branches/experimental/xfconf/debian/compat	2012-03-31 11:14:30 UTC (rev 6546)
+++ desktop/branches/experimental/xfconf/debian/compat	2012-03-31 11:20:06 UTC (rev 6547)
@@ -1 +1 @@
-7
+9

Modified: desktop/branches/experimental/xfconf/debian/control
===================================================================
--- desktop/branches/experimental/xfconf/debian/control	2012-03-31 11:14:30 UTC (rev 6546)
+++ desktop/branches/experimental/xfconf/debian/control	2012-03-31 11:20:06 UTC (rev 6547)
@@ -4,10 +4,10 @@
 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~), libxfce4util6-dev, 
+Build-Depends: debhelper (>= 9), libxfce4util6-dev, 
  libdbus-1-dev, libdbus-glib-1-dev, libextutils-pkgconfig-perl, 
- libextutils-depends-perl, libglib-perl, intltool, hardening-includes
-Standards-Version: 3.9.2
+ libextutils-depends-perl, libglib-perl, intltool, dpkg-dev (>= 1.16.1.)
+Standards-Version: 3.9.3
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfconf/
@@ -29,6 +29,7 @@
 Package: libxfconf-0-2
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, xfconf
 Description: Client library for Xfce4 configure interface
  This package contains a library which can be used by every

Modified: desktop/branches/experimental/xfconf/debian/libxfconf-0-2.install
===================================================================
--- desktop/branches/experimental/xfconf/debian/libxfconf-0-2.install	2012-03-31 11:14:30 UTC (rev 6546)
+++ desktop/branches/experimental/xfconf/debian/libxfconf-0-2.install	2012-03-31 11:20:06 UTC (rev 6547)
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: desktop/branches/experimental/xfconf/debian/libxfconf-0-dev.install
===================================================================
--- desktop/branches/experimental/xfconf/debian/libxfconf-0-dev.install	2012-03-31 11:14:30 UTC (rev 6546)
+++ desktop/branches/experimental/xfconf/debian/libxfconf-0-dev.install	2012-03-31 11:20:06 UTC (rev 6547)
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/pkgconfig
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/pkgconfig
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
 usr/share/gtk-doc

Modified: desktop/branches/experimental/xfconf/debian/rules
===================================================================
--- desktop/branches/experimental/xfconf/debian/rules	2012-03-31 11:14:30 UTC (rev 6546)
+++ desktop/branches/experimental/xfconf/debian/rules	2012-03-31 11:20:06 UTC (rev 6547)
@@ -1,14 +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
 
-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
-
 %:
 	dh $@
 
@@ -18,7 +12,7 @@
 override_dh_auto_test:
 
 override_dh_install:
-	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfconf-0.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libxfconf-0.la
 	dh_install --fail-missing --sourcedir=debian/tmp
 
 override_dh_strip:

Modified: desktop/branches/experimental/xfconf/debian/xfconf.install
===================================================================
--- desktop/branches/experimental/xfconf/debian/xfconf.install	2012-03-31 11:14:30 UTC (rev 6546)
+++ desktop/branches/experimental/xfconf/debian/xfconf.install	2012-03-31 11:20:06 UTC (rev 6547)
@@ -1,4 +1,4 @@
 usr/share/dbus-1
 usr/share/locale
 usr/bin
-usr/lib/xfce4/xfconf/xfconfd
+usr/lib/*/xfce4/xfconf/xfconfd