[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.33-2-709-g594d443

[Ove Kåven]

The following commit has been merged in the master branch:
commit 2017945a18c3e5f5240b93e321640d0bfa45eb36
Author: Ove Kåven <ovek at arcticnet.no>
Date:   Mon Aug 15 04:08:52 2011 +0200

    Better fix for lintian override paths (doesn't break multiarch paths).

diff --git a/debian/libwine.lintian-overrides-common b/debian/libwine.lintian-overrides-common
index 3245c40..1986fcc 100644
--- a/debian/libwine.lintian-overrides-common
+++ b/debian/libwine.lintian-overrides-common
@@ -1,8 +1,8 @@
 # the preloader is a self-contained binary on purpose
-libwine binary: statically-linked-binary usr/lib/wine at SUFFIX@/wine-preloader
+libwine binary: statically-linked-binary usr/lib/wine/wine-preloader
 # specially linked binaries, leaving them unstripped for now,
 # as dh_strip is currently unable to handle them properly
-libwine binary: unstripped-binary-or-object usr/lib/wine at SUFFIX@/wine-preloader
-libwine binary: unstripped-binary-or-object usr/lib/wine at SUFFIX@/wine-kthread
-libwine binary: unstripped-binary-or-object usr/lib/wine at SUFFIX@/wine-pthread
-libwine binary: unstripped-binary-or-object usr/lib/wine at SUFFIX@/wine.bin
+libwine binary: unstripped-binary-or-object usr/lib/wine/wine-preloader
+libwine binary: unstripped-binary-or-object usr/lib/wine/wine-kthread
+libwine binary: unstripped-binary-or-object usr/lib/wine/wine-pthread
+libwine binary: unstripped-binary-or-object usr/lib/wine/wine.bin
diff --git a/debian/prep-install.sh b/debian/prep-install.sh
index 4ad3930..06d37ec 100644
--- a/debian/prep-install.sh
+++ b/debian/prep-install.sh
@@ -4,8 +4,8 @@ LIBDIRS="$2"
 
 function replace_paths_full
 {
-  sed "s,/usr/lib,/$1,g" | \
-  sed "s,/$1/wine,&$SUFFIX,g" | \
+  sed "s,\([ /]\)usr/lib,\\1$1,g" | \
+  sed "s,[ /]$1/wine,&$SUFFIX,g" | \
   sed "s,/usr/share/wine,&$SUFFIX,g" | \
   sed "s,usr/share/doc/$package,&$SUFFIX,g" | \
   ([ "$ext" != "lintian-overrides" ] && cat || sed "s,^$package,&$SUFFIX,g" ) | \

-- 
Debian Wine packaging