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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-09-29 09:34:59 +0000 (Thu, 29 Sep 2011)
New Revision: 6071

Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
   goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
Log:
* debian/lightdm-{gtk,qt}-greeter.postinst:
  - use variable for multi-arch path instead of *.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-09-29 09:32:17 UTC (rev 6070)
+++ goodies/trunk/lightdm/debian/changelog	2011-09-29 09:34:59 UTC (rev 6071)
@@ -3,6 +3,8 @@
   * debian/rules:
     - correctly enable pie and bindnow.
     - use a variable for multi-arch path instead of *.
+  * debian/lightdm-{gtk,qt}-greeter.postinst:
+    - use variable for multi-arch path instead of *.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Sep 2011 10:52:54 +0200
 

Modified: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst	2011-09-29 09:32:17 UTC (rev 6070)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst	2011-09-29 09:34:59 UTC (rev 6071)
@@ -6,13 +6,14 @@
 
 # using this greeter?
 GREETER=
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 if db_get shared/lightdm-greeter; then
   GREETER="$RET"
 fi
 
 if [ -n "${GREETER}" ];
 then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm-set-defaults
+  LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm-set-defaults
   if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
   then
     "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"

Modified: goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst	2011-09-29 09:32:17 UTC (rev 6070)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst	2011-09-29 09:34:59 UTC (rev 6071)
@@ -6,13 +6,14 @@
 
 # using this greeter?
 GREETER=
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 if db_get shared/lightdm-greeter; then
   GREETER="$RET"
 fi
 
 if [ -n "${GREETER}" ];
 then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm-set-defaults
+  LIGHTDM_SET_DEFAULTS=/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm-set-defaults
   if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
   then
     "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"