[pkg-wine-party] [SCM] Debian Wine Gecko packaging branch, master, updated. debian/1.4+dfsg-1-13-g6f1c3ec

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 8c1bb3f44ab16d0030cb49d42a8938a4c5f6ef07
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Jun 16 19:15:01 2012 +0200

    Use multiarch paths for wineserver.

diff --git a/debian/changelog b/debian/changelog
index 6d4294f..e5deefa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ wine-gecko-1.4 (1.4+dfsg-2) UNRELEASED; urgency=low
   * Avoid ignoring errors in the debian/rules build-clean target.
   * wrap-and-sort debian/control and debian/copyright.
   * Drop unused lcab build-dependency.
+  * Use multiarch paths for wineserver.
 
  -- Stephen Kitt <steve at sk2.org>  Mon, 04 Jun 2012 23:40:29 +0200
 
diff --git a/debian/patches/config b/debian/patches/config
index 67b709e..086fd53 100644
--- a/debian/patches/config
+++ b/debian/patches/config
@@ -3,8 +3,8 @@ Author: Stephen Kitt <steve at sk2.org>
 Forwarded: not-needed
 Last-Update: 2012-05-16
 
---- wine-mozilla-1.4.orig/wine/mozconfig-common
-+++ wine-mozilla-1.4/wine/mozconfig-common
+--- wine-gecko.orig/wine/mozconfig-common
++++ wine-gecko/wine/mozconfig-common
 @@ -7,7 +7,7 @@
  if test -z "$WINE_GECKO_OBJDIR"
  then
@@ -14,8 +14,8 @@ Last-Update: 2012-05-16
  fi
  mk_add_options MOZ_OBJDIR=$WINE_GECKO_OBJDIR
  
---- wine-mozilla-1.4.orig/wine/make_package
-+++ wine-mozilla-1.4/wine/make_package
+--- wine-gecko.orig/wine/make_package
++++ wine-gecko/wine/make_package
 @@ -64,7 +64,7 @@
  src_dir=$(pwd)
  version=$(head -n 1 $src_dir/wine/VERSION)
@@ -25,20 +25,17 @@ Last-Update: 2012-05-16
  
  if [ "$force_build" = "yes" ]
  then
-@@ -222,7 +222,15 @@ msi)
-     if test -z "$WINE_BUILD_DIR"
+@@ -223,6 +223,13 @@
      then
          WINE=wine
--        WINESERVER=wineserver
-+        if test -x /usr/lib/wine-unstable/wineserver
-+        then
-+            WINESERVER=/usr/lib/wine-unstable/wineserver
-+        elif test -x /usr/lib/wine/wineserver
-+        then
-+            WINESERVER=/usr/lib/wine/wineserver
-+        else
-+            WINESERVER=wineserver
-+        fi
+         WINESERVER=wineserver
++        for variant in wine wine-unstable; do
++            for libpath in /usr/lib /usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH); do
++                if test -x ${libpath}/${variant}/wineserver; then
++                    WINESERVER=${libpath}/${variant}/wineserver
++                fi
++            done
++        done
      else
          WINE=$WINE_BUILD_DIR/wine
          WINESERVER=$WINE_BUILD_DIR/server/wineserver

-- 
Debian Wine Gecko packaging