[Pkg-xfce-commits] r6523 - desktop/branches/experimental/libxfce4ui/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-03-30 20:02:03 +0000 (Fri, 30 Mar 2012)
New Revision: 6523

Modified:
   desktop/branches/experimental/libxfce4ui/debian/changelog
   desktop/branches/experimental/libxfce4ui/debian/compat
   desktop/branches/experimental/libxfce4ui/debian/control
   desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install
   desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install
   desktop/branches/experimental/libxfce4ui/debian/rules
Log:
  - update debhelper build-dep to 9.
  - add build-dep on dpkg-dev 1.16.1.
  - drop hardening-includes build-dep.
* debian/rules:
  - use hardening support in debhelper 9 and dpkg-dev 1.16.1
  - multi-archify the paths. 
* debian/*.install:
  - multi-archify the paths. 

Modified: desktop/branches/experimental/libxfce4ui/debian/changelog
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/changelog	2012-03-30 19:48:58 UTC (rev 6522)
+++ desktop/branches/experimental/libxfce4ui/debian/changelog	2012-03-30 20:02:03 UTC (rev 6523)
@@ -16,6 +16,14 @@
   [ Yves-Alexis Perez ]
   * debian/control:
     - update standards version to 3.9.3.
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+    - drop hardening-includes build-dep.
+  * debian/rules:
+    - use hardening support in debhelper 9 and dpkg-dev 1.16.1
+    - multi-archify the paths. 
+  * debian/*.install:
+    - multi-archify the paths. 
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 22 Jan 2012 00:15:53 +0100
 

Modified: desktop/branches/experimental/libxfce4ui/debian/compat
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/compat	2012-03-30 19:48:58 UTC (rev 6522)
+++ desktop/branches/experimental/libxfce4ui/debian/compat	2012-03-30 20:02:03 UTC (rev 6523)
@@ -1 +1 @@
-7
+9

Modified: desktop/branches/experimental/libxfce4ui/debian/control
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/control	2012-03-30 19:48:58 UTC (rev 6522)
+++ desktop/branches/experimental/libxfce4ui/debian/control	2012-03-30 20:02:03 UTC (rev 6523)
@@ -4,9 +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 (>= 7.0.50~), intltool (>= 0.31), pkg-config,
+Build-Depends: debhelper (>= 9), intltool (>= 0.31), pkg-config,
  libgtk2.0-dev, libstartup-notification0-dev, libglade2-dev, libgladeui-1-dev,
- libxfce4util-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), hardening-includes
+ libxfce4util-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/branches/experimental/libxfce4ui

Modified: desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install	2012-03-30 19:48:58 UTC (rev 6522)
+++ desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install	2012-03-30 20:02:03 UTC (rev 6523)
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
 usr/share/locale/

Modified: desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install	2012-03-30 19:48:58 UTC (rev 6522)
+++ desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install	2012-03-30 20:02:03 UTC (rev 6523)
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gtk-doc/*

Modified: desktop/branches/experimental/libxfce4ui/debian/rules
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/rules	2012-03-30 19:48:58 UTC (rev 6522)
+++ desktop/branches/experimental/libxfce4ui/debian/rules	2012-03-30 20:02:03 UTC (rev 6523)
@@ -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
-
 XFVENDOR=Debian
 ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
 	XFVENDOR=Xubuntu
@@ -21,7 +15,7 @@
 	dh_auto_configure -- --with-vendor-info=$(XFVENDOR)
 
 override_dh_install:
-	rm $(CURDIR)/debian/tmp/usr/lib/*.la
+	rm $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 	rm $(CURDIR)/debian/tmp/usr/lib/glade3/modules/*.la
 	rm $(CURDIR)/debian/tmp/usr/share/glade3/catalogs/libxfce4ui.xml.in
 	dh_install --fail-missing