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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-09-29 20:22:00 +0000 (Thu, 29 Sep 2011)
New Revision: 6082

Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
   goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm
   goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
   goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm
Log:
don't use dpkg-architecture since it's in dpkg-dev.       closes: #643792

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-09-29 18:03:34 UTC (rev 6081)
+++ goodies/trunk/lightdm/debian/changelog	2011-09-29 20:22:00 UTC (rev 6082)
@@ -1,7 +1,7 @@
 lightdm (1.0.0-3) UNRELEASED; urgency=low
 
   * debian/lightdm-{gtk,qt}.{postinst,prerm}:
-    - fix DEB_HOST_MULTIARCH variable use ${} instead of $()
+    - don't use dpkg-architecture since it's in dpkg-dev.       closes: #643792
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Sep 2011 20:02:17 +0200
 

Modified: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst	2011-09-29 18:03:34 UTC (rev 6081)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst	2011-09-29 20:22:00 UTC (rev 6082)
@@ -6,14 +6,13 @@
 
 # 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/${DEB_HOST_MULTIARCH}/lightdm/lightdm-set-defaults
+  LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
   if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
   then
     "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"

Modified: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm	2011-09-29 18:03:34 UTC (rev 6081)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm	2011-09-29 20:22:00 UTC (rev 6082)
@@ -9,8 +9,7 @@
 set -e
 
 THIS_PACKAGE="lightdm-gtk-greeter"
-DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-LIGHTDM_SET_DEFAULTS=/usr/lib/${DEB_HOST_MULTIARCH}/lightdm/lightdm-set-defaults
+LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
 
 if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
   if [ -e /usr/share/debconf/confmodule ]; then

Modified: goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst	2011-09-29 18:03:34 UTC (rev 6081)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst	2011-09-29 20:22:00 UTC (rev 6082)
@@ -6,14 +6,13 @@
 
 # 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/${DEB_HOST_MULTIARCH}/lightdm/lightdm-set-defaults
+  LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
   if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
   then
     "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"

Modified: goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm	2011-09-29 18:03:34 UTC (rev 6081)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm	2011-09-29 20:22:00 UTC (rev 6082)
@@ -9,8 +9,7 @@
 set -e
 
 THIS_PACKAGE="lightdm-qt-greeter"
-DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-LIGHTDM_SET_DEFAULTS=/usr/lib/${DEB_HOST_MULTIARCH}/lightdm/lightdm-set-defaults
+LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
 
 if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
   if [ -e /usr/share/debconf/confmodule ]; then