[Pkg-xfce-commits] r6072 - desktop/trunk/thunar/debian

Yves-Alexis Perez corsac at alioth.debian.org
Thu Sep 29 09:36:53 UTC 2011 

Author: corsac
Date: 2011-09-29 09:36:53 +0000 (Thu, 29 Sep 2011)
New Revision: 6072

Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/compat
   desktop/trunk/thunar/debian/control
   desktop/trunk/thunar/debian/libthunarx-2-0.install
   desktop/trunk/thunar/debian/libthunarx-2-dev.install
   desktop/trunk/thunar/debian/rules
   desktop/trunk/thunar/debian/thunar.install
Log:
* debian/rules:
  - switch hardening to use dh9 mode
* debian/compat: use mode 9.
* debian/control:
  - drop build-dep on hardening-includes
  - bump debhelper build-dep to 8.9.4 for dh9 compat mode.
* debian/rules:
  - use multi-arch path in various rules.
* debian/libthunarx-2-dev.install, debian/libthunarx-2-0.install,
  thunar.install:
  - use multi-arch path.

Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2011-09-29 09:34:59 UTC (rev 6071)
+++ desktop/trunk/thunar/debian/changelog	2011-09-29 09:36:53 UTC (rev 6072)
@@ -1,5 +1,6 @@
 thunar (1.2.3-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * New upstream release, including:
     - Prevent falling back to an unexpected locale.                 lp: #557255
     - Fix regression in 1.2.2 wrt SMB shares.      Closes: #633772, lp: #846907
@@ -7,6 +8,19 @@
     - 01_retrieve-the-translated-desktop-file-name.patch,
       04_fix-maxpathlen-hurd.patch: dropped, included upstream.
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - switch hardening to use dh9 mode
+  * debian/compat: use mode 9.
+  * debian/control:
+    - drop build-dep on hardening-includes
+    - bump debhelper build-dep to 8.9.4 for dh9 compat mode.
+  * debian/rules:
+    - use multi-arch path in various rules.
+  * debian/libthunarx-2-dev.install, debian/libthunarx-2-0.install,
+    thunar.install:
+    - use multi-arch path.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 20 Sep 2011 23:53:31 +0200
 
 thunar (1.2.2-1) unstable; urgency=low

Modified: desktop/trunk/thunar/debian/compat
===================================================================
--- desktop/trunk/thunar/debian/compat	2011-09-29 09:34:59 UTC (rev 6071)
+++ desktop/trunk/thunar/debian/compat	2011-09-29 09:36:53 UTC (rev 6072)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control	2011-09-29 09:34:59 UTC (rev 6071)
+++ desktop/trunk/thunar/debian/control	2011-09-29 09:36:53 UTC (rev 6072)
@@ -4,12 +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.4.2~), libexo-1-dev (>= 0.5.1), libxml-parser-perl,
+Build-Depends: debhelper (>= 8.9.4), libexo-1-dev (>= 0.5.1), libxml-parser-perl,
  libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), chrpath,
  libpcre3-dev, libjpeg-dev, libstartup-notification0-dev (>= 0.4), intltool,
  libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), libnotify-dev, 
- libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.8.0), hardening-includes, 
- libtdb-dev
+ libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.8.0), libtdb-dev
 Standards-Version: 3.9.2
 Homepage: http://thunar.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/

Modified: desktop/trunk/thunar/debian/libthunarx-2-0.install
===================================================================
--- desktop/trunk/thunar/debian/libthunarx-2-0.install	2011-09-29 09:34:59 UTC (rev 6071)
+++ desktop/trunk/thunar/debian/libthunarx-2-0.install	2011-09-29 09:36:53 UTC (rev 6072)
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
-usr/lib/thunarx-2/*
+usr/lib/*/lib*.so.*
+usr/lib/*/thunarx-2/*

Modified: desktop/trunk/thunar/debian/libthunarx-2-dev.install
===================================================================
--- desktop/trunk/thunar/debian/libthunarx-2-dev.install	2011-09-29 09:34:59 UTC (rev 6071)
+++ desktop/trunk/thunar/debian/libthunarx-2-dev.install	2011-09-29 09:36:53 UTC (rev 6072)
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*

Modified: desktop/trunk/thunar/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules	2011-09-29 09:34:59 UTC (rev 6071)
+++ desktop/trunk/thunar/debian/rules	2011-09-29 09:36:53 UTC (rev 6072)
@@ -1,15 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@
 
@@ -21,19 +16,19 @@
 override_dh_auto_test:
 
 override_dh_install:
-	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
-	rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*/*.la
 	# install sendto stuff
 	install -m 0644 $(CURDIR)/debian/bluetooth-sendto.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
 	install -m 0644 $(CURDIR)/debian/gnome-obex-send.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
 	install -m 0644 $(CURDIR)/debian/xfprint.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
 	# rpath
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
-		$(CURDIR)/debian/tmp/usr/lib/Thunar/thunar-* \
-		$(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*0 \
-		$(CURDIR)/debian/tmp/usr/lib/thunarx-2/thunar-apr.so \
-		$(CURDIR)/debian/tmp/usr/lib/xfce4/panel/plugins/libthunar-tpa.so
-	dh_install --fail-missing --sourcedir=debian/tmp -X usr/lib/xfce4/panel/plugins/libthunar-tpa.la
+		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/Thunar/thunar-* \
+		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libthunar*.so.*0 \
+		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2/thunar-apr.so \
+		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so
+	dh_install --fail-missing --sourcedir=debian/tmp -X usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.la
 
 override_dh_installdocs:
 	dh_installdocs -p libthunarx-2-dev -p libthunarx-2-0 -p thunar --link-doc=thunar-data
@@ -43,8 +38,8 @@
 	dh_strip --dbg-package=thunar-dbg
 
 override_dh_shlibdeps:
-	dh_shlibdeps -X debian/thunar/usr/lib/xfce4/panel/plugins/libthunar-tpa.so -- \
-    -dRecommends debian/thunar/usr/lib/xfce4/panel/plugins/libthunar-tpa.so -dDepends
+	dh_shlibdeps -X debian/thunar/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so -- \
+    -dRecommends debian/thunar/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so -dDepends
 
 override_dh_makeshlibs:
-	dh_makeshlibs -p libthunarx-2-0 -X debian/libthunarx-2-0/usr/lib/thunarx-2
+	dh_makeshlibs -p libthunarx-2-0 -X debian/libthunarx-2-0/usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2

Modified: desktop/trunk/thunar/debian/thunar.install
===================================================================
--- desktop/trunk/thunar/debian/thunar.install	2011-09-29 09:34:59 UTC (rev 6071)
+++ desktop/trunk/thunar/debian/thunar.install	2011-09-29 09:36:53 UTC (rev 6072)
@@ -1,6 +1,6 @@
 usr/bin/*
-usr/lib/Thunar/*
+usr/lib/*/Thunar/*
 usr/share/applications/*
 usr/share/man
-usr/lib/xfce4/panel/plugins/libthunar-tpa.so
+usr/lib/*/xfce4/panel/plugins/libthunar-tpa.so
 usr/share/xfce4/panel-plugins/thunar-tpa.desktop

More information about the Pkg-xfce-commits mailing list