[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.26-1-458-g614609b

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 89a778508fa9ad9e2844e5449240ca48ed41d737
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Aug 8 20:34:18 2009 +0200

    Automatically substitute the current library paths into the lintian overrides.

diff --git a/debian/clean-install.sh b/debian/clean-install.sh
index 6a1ca26..7cf7a2c 100644
--- a/debian/clean-install.sh
+++ b/debian/clean-install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 SUFFIX="$1"
 
-for ext in install links mime config preinst postinst prerm postrm docs manpages; do
+for ext in install links mime config preinst postinst prerm postrm docs manpages lintian-overrides; do
   for inst in debian/*.${ext}-common; do
     package="$(basename "$inst" .${ext}-common)"
     rm -f debian/$package$SUFFIX.${ext}
diff --git a/debian/libwine.lintian-overrides b/debian/libwine.lintian-overrides-common
similarity index 100%
rename from debian/libwine.lintian-overrides
rename to debian/libwine.lintian-overrides-common
diff --git a/debian/prep-install.sh b/debian/prep-install.sh
index 45d39ea..3efe35a 100644
--- a/debian/prep-install.sh
+++ b/debian/prep-install.sh
@@ -4,12 +4,12 @@ LIBDIRS="$2"
 
 function expand_common
 {
-  sed "s,/usr/lib,/$1," debian/$package.install-common | \
+  sed "s,/usr/lib,/$1," debian/$package.${ext}-common | \
   sed "s,usr/share/doc/$package,&$SUFFIX," \
-   > debian/$package$SUFFIX.install
+   > debian/$package$SUFFIX.${ext}
   shift
   while [ -n "$1" ]; do
-    sed -n "s,/usr/lib,/$1,p" debian/$package.install-common >> debian/$package$SUFFIX.install
+    sed -n "s,/usr/lib,/$1,p" debian/$package.${ext}-common >> debian/$package$SUFFIX.${ext}
     shift
   done
 }
@@ -18,32 +18,27 @@ function expand_common
 # if they were compiled on the current one, install them
 function expand_platform
 {
-  if [ ! -f debian/$package.install-platform ]; then
+  if [ ! -f debian/$package.${ext}-platform ]; then
     return
   fi
-  for bin in $(sed "s,/usr/lib,/$1," debian/$package.install-platform); do
-    [ ! -f $bin ] || echo $bin >> debian/$package$SUFFIX.install
+  for bin in $(sed "s,/usr/lib,/$1," debian/$package.${ext}-platform); do
+    [ ! -f $bin ] || echo $bin >> debian/$package$SUFFIX.${ext}
   done
   shift
   while [ -n "$1" ]; do
-    for bin in $(sed -n "s,/usr/lib,/$1,p" debian/$package.install-platform); do
-      [ ! -f $bin ] || echo $bin >> debian/$package$SUFFIX.install
+    for bin in $(sed -n "s,/usr/lib,/$1,p" debian/$package.${ext}-platform); do
+      [ ! -f $bin ] || echo $bin >> debian/$package$SUFFIX.${ext}
     done
     shift
   done
 }
 
-for inst in debian/*.install-common; do
-  package="$(basename "$inst" .install-common)"
-  expand_common $LIBDIRS
-  expand_platform $LIBDIRS
-done
-
-for ext in links mime config preinst postinst prerm postrm docs manpages; do
+for ext in install links mime config preinst postinst prerm postrm docs manpages lintian-overrides; do
   for inst in debian/*.${ext}-common; do
     if [ -f "$inst" ]; then
       package="$(basename "$inst" .${ext}-common)"
-      cat debian/$package.${ext}-common > debian/$package$SUFFIX.${ext}
+      expand_common $LIBDIRS
+      expand_platform $LIBDIRS
     fi
   done
 done
diff --git a/debian/rules b/debian/rules
index 100121b..6e0ccc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -346,7 +346,7 @@ binary-arch: install-arch-stamp
 	rm -rf debian/libwine-dbg$(VERSUFFIX)/usr/lib/debug/usr/bin
 
 	# debhelper 6 has dh_lintian, but I don't want to depend on it yet...
-	install -D -m 644 debian/libwine.lintian-overrides debian/libwine$(VERSUFFIX)/usr/share/lintian/overrides/libwine$(VERSUFFIX)
+	install -D -m 644 debian/libwine$(VERSUFFIX).lintian-overrides debian/libwine$(VERSUFFIX)/usr/share/lintian/overrides/libwine$(VERSUFFIX)
 
 	dh_desktop -s
 

-- 
Debian Wine packaging