[Pkg-xfce-commits] r6070 - goodies/trunk/lightdm/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-09-29 09:32:17 +0000 (Thu, 29 Sep 2011)
New Revision: 6070

Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/rules
Log:
* debian/rules:
  - correctly enable pie and bindnow.
  - use a variable for multi-arch path instead of *.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-09-29 08:06:18 UTC (rev 6069)
+++ goodies/trunk/lightdm/debian/changelog	2011-09-29 09:32:17 UTC (rev 6070)
@@ -1,3 +1,11 @@
+lightdm (1.0.0-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - correctly enable pie and bindnow.
+    - use a variable for multi-arch path instead of *.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Sep 2011 10:52:54 +0200
+
 lightdm (1.0.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: goodies/trunk/lightdm/debian/rules
===================================================================
--- goodies/trunk/lightdm/debian/rules	2011-09-29 08:06:18 UTC (rev 6069)
+++ goodies/trunk/lightdm/debian/rules	2011-09-29 09:32:17 UTC (rev 6070)
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow"
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 override_dh_auto_configure:
 	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession
 
@@ -11,7 +13,7 @@
 
 override_dh_install:
 	find debian/tmp -name '*.la' -delete
-	rm debian/tmp/usr/lib/*/lightdm/gdmflexiserver
+	rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/gdmflexiserver
 	dh_install --fail-missing
 
 %: