[pkg-wine-party] [PATCH 7/8] Remove debian/tmp prefix from *.install-*

[Hilko Bengen]

---
 debian/gen-alternatives.sh           |    4 ++-
 debian/libwine-bin.install-common    |   20 ++++++-------
 debian/libwine-dev.install-common    |   51 +++++++++++++++++-----------------
 debian/libwine.install-common        |   14 +++++-----
 debian/libwine.install-platform      |    6 ++--
 debian/prep-install.sh               |   13 +++++----
 debian/wine-bin.install-alternatives |   38 ++++++++++++-------------
 debian/wine-bin.install-common       |   19 ++++++-------
 8 files changed, 85 insertions(+), 80 deletions(-)
 mode change 100644 => 100755 debian/gen-alternatives.sh

diff --git a/debian/gen-alternatives.sh b/debian/gen-alternatives.sh
old mode 100644
new mode 100755
index c7c2dd3..1e63857
--- a/debian/gen-alternatives.sh
+++ b/debian/gen-alternatives.sh
@@ -4,12 +4,14 @@ ARCH="$2"
 PRIORITY="$3"
 SUFFIX="$ARCH$VSUFFIX"
 
+set -e
+
 function generate_postinst
 {
   echo "update-alternatives \\"
   echo -n "  --install /usr/bin/wine wine /usr/bin/wine$SUFFIX $PRIORITY"
   for bin in $(cat debian/wine-bin.install-alternatives); do
-    dname=$(echo $bin|sed -n 's,debian/tmp/\(.*\),/\1,p')
+    dname=$bin
     sname=$(echo $dname|sed -n "s,\(.*/[^./]*\)\(\.[0-9]+\)\?,\1$SUFFIX\2,p")
     mv debian/tmp/$dname debian/tmp/$sname
 
diff --git a/debian/libwine-bin.install-common b/debian/libwine-bin.install-common
index f604391..dbd4a70 100644
--- a/debian/libwine-bin.install-common
+++ b/debian/libwine-bin.install-common
@@ -1,10 +1,10 @@
-debian/tmp/usr/share/man/man1/msiexec.1
-debian/tmp/usr/share/man/man1/notepad.1
-debian/tmp/usr/share/man/man1/regedit.1
-debian/tmp/usr/share/man/man1/regsvr32.1
-debian/tmp/usr/share/man/man1/wineboot.1
-debian/tmp/usr/share/man/man1/winecfg.1
-debian/tmp/usr/share/man/man1/wineconsole.1
-debian/tmp/usr/share/man/man1/winefile.1
-debian/tmp/usr/share/man/man1/winemine.1
-debian/tmp/usr/share/man/man1/winepath.1
+/usr/share/man/man1/msiexec.1
+/usr/share/man/man1/notepad.1
+/usr/share/man/man1/regedit.1
+/usr/share/man/man1/regsvr32.1
+/usr/share/man/man1/wineboot.1
+/usr/share/man/man1/winecfg.1
+/usr/share/man/man1/wineconsole.1
+/usr/share/man/man1/winefile.1
+/usr/share/man/man1/winemine.1
+/usr/share/man/man1/winepath.1
diff --git a/debian/libwine-dev.install-common b/debian/libwine-dev.install-common
index 2561b73..75327b9 100644
--- a/debian/libwine-dev.install-common
+++ b/debian/libwine-dev.install-common
@@ -1,25 +1,26 @@
-debian/tmp/usr/lib/libwine*.so
-debian/tmp/usr/lib/wine/*.a
-debian/tmp/usr/lib/wine/*.def
-debian/tmp/usr/bin/widl
-debian/tmp/usr/bin/winebuild
-debian/tmp/usr/bin/winecpp
-debian/tmp/usr/bin/winedump
-debian/tmp/usr/bin/winegcc
-debian/tmp/usr/bin/wineg++
-debian/tmp/usr/bin/winemaker
-debian/tmp/usr/bin/wmc
-debian/tmp/usr/bin/wrc
-debian/tmp/usr/include
-debian/tmp/usr/share/man/man1/widl.1
-debian/tmp/usr/share/man/man1/winebuild.1
-debian/tmp/usr/share/man/man1/winecpp.1
-debian/tmp/usr/share/man/man1/winedump.1
-debian/tmp/usr/share/man/man1/wineg++.1
-debian/tmp/usr/share/man/man1/winegcc.1
-debian/tmp/usr/share/man/*/man1/winemaker.1
-debian/tmp/usr/share/man/man1/winemaker.1
-debian/tmp/usr/share/man/man1/wmc.1
-debian/tmp/usr/share/man/man1/wrc.1
-debian/tmp/usr/share/man/man3
-debian/tmp/usr/share/doc/wine/README.winedump usr/share/doc/libwine-dev
+/usr/lib/libwine*.so
+/usr/lib/wine/*.a
+/usr/lib/wine/*.def
+/usr/bin/widl
+/usr/bin/winebuild
+/usr/bin/winecpp
+/usr/bin/winedump
+/usr/bin/winegcc
+/usr/bin/wineg++
+/usr/bin/winemaker
+/usr/bin/wmc
+/usr/bin/wrc
+/usr/include
+/usr/share/man/man1/widl.1
+/usr/share/man/man1/winebuild.1
+/usr/share/man/man1/winecpp.1
+/usr/share/man/man1/winedump.1
+/usr/share/man/man1/wineg++.1
+/usr/share/man/man1/winegcc.1
+/usr/share/man/*/man1/winemaker.1
+/usr/share/man/man1/winemaker.1
+/usr/share/man/man1/wmc.1
+/usr/share/man/man1/wrc.1
+/usr/share/man/man3
+
+/usr/share/doc/wine/README.winedump usr/share/doc/libwine-dev
diff --git a/debian/libwine.install-common b/debian/libwine.install-common
index 1f32820..57ddf24 100644
--- a/debian/libwine.install-common
+++ b/debian/libwine.install-common
@@ -1,7 +1,7 @@
-debian/tmp/usr/lib/libwine*.so.*
-debian/tmp/usr/lib/wine/wine.bin
-debian/tmp/usr/lib/wine/wineserver
-debian/tmp/usr/share/wine/generic.ppd
-debian/tmp/usr/share/wine/fonts
-debian/tmp/usr/share/man/man1/wineserver.1
-debian/tmp/usr/share/man/*/man1/wineserver.1
+/usr/lib/libwine*.so.*
+/usr/lib/wine/wine.bin
+/usr/lib/wine/wineserver
+/usr/share/wine/generic.ppd
+/usr/share/wine/fonts
+/usr/share/man/man1/wineserver.1
+/usr/share/man/*/man1/wineserver.1
diff --git a/debian/libwine.install-platform b/debian/libwine.install-platform
index 7f7eeb6..62af0f9 100644
--- a/debian/libwine.install-platform
+++ b/debian/libwine.install-platform
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/wine/wine-kthread
-debian/tmp/usr/lib/wine/wine-pthread
-debian/tmp/usr/lib/wine/wine-preloader
+/usr/lib/wine/wine-kthread
+/usr/lib/wine/wine-pthread
+/usr/lib/wine/wine-preloader
diff --git a/debian/prep-install.sh b/debian/prep-install.sh
index 1aa8b70..2d30966 100755
--- a/debian/prep-install.sh
+++ b/debian/prep-install.sh
@@ -41,12 +41,12 @@ function expand_platform
     return
   fi
   for bin in $(replace_paths_full $1 < debian/$package.${ext}-platform); do
-    [ ! -f "$bin" ] || echo "$bin" >> debian/$package$SUFFIX.${ext}
+    [ ! -f "debian/tmp/$bin" ] || echo "$bin" >> debian/$package$SUFFIX.${ext}
   done
   shift
   while [ -n "$1" ]; do
     for bin in $(replace_paths_partial $1 < debian/$package.${ext}-platform); do
-      [ ! -f "$bin" ] || echo "$bin" >> debian/$package$SUFFIX.${ext}
+      [ ! -f "debian/tmp/$bin" ] || echo "$bin" >> debian/$package$SUFFIX.${ext}
     done
     shift
   done
@@ -59,8 +59,11 @@ function expand_modules
   fi
   while [ -n "$1" ]; do
     for mod in $(cat debian/$package.${ext}-modules); do
-      for bin in debian/tmp/$1/wine$SUFFIX/$mod.so debian/tmp/$1/wine$SUFFIX/$mod debian/tmp/$1/wine$SUFFIX/fakedlls/$mod; do
-        [ ! -f "$bin" ] || echo "$bin" >> debian/$package$SUFFIX.${ext}
+      for bin in \
+        debian/tmp/$1/wine$SUFFIX/$mod.so \
+        debian/tmp/$1/wine$SUFFIX/$mod \
+        debian/tmp/$1/wine$SUFFIX/fakedlls/$mod; do
+        [ ! -f "$bin" ] || echo "$bin" | sed -e 's,^debian/tmp/,/,' >> debian/$package$SUFFIX.${ext}
       done
     done
     shift
@@ -76,7 +79,7 @@ function expand_alternatives
     bin32=$(echo "$bin"|sed -n "s,\(.*/[^./]*\)\(\.[0-9]+\)\?,\132$SUFFIX\2,p")
     bin64=$(echo "$bin"|sed -n "s,\(.*/[^./]*\)\(\.[0-9]+\)\?,\164$SUFFIX\2,p")
     for tbin in $bin32 $bin64; do
-      [ ! -f "$tbin" ] || echo "$tbin" >> debian/$package$SUFFIX.${ext}
+      [ ! -f "debian/tmp/$tbin" ] || echo "$tbin" >> debian/$package$SUFFIX.${ext}
     done
   done
 }
diff --git a/debian/wine-bin.install-alternatives b/debian/wine-bin.install-alternatives
index d790def..98c3d24 100644
--- a/debian/wine-bin.install-alternatives
+++ b/debian/wine-bin.install-alternatives
@@ -1,19 +1,19 @@
-debian/tmp/usr/bin/fnt2bdf
-debian/tmp/usr/bin/msiexec
-debian/tmp/usr/bin/notepad
-debian/tmp/usr/bin/regedit
-debian/tmp/usr/bin/regsvr32
-debian/tmp/usr/bin/wine
-debian/tmp/usr/bin/wine-font-convert
-debian/tmp/usr/bin/wineboot
-debian/tmp/usr/bin/winecfg
-debian/tmp/usr/bin/winedbg
-debian/tmp/usr/bin/wineconsole
-debian/tmp/usr/bin/winefile
-debian/tmp/usr/bin/winemine 
-debian/tmp/usr/bin/winepath
-debian/tmp/usr/share/man/man1/wine.1
-debian/tmp/usr/share/man/man1/winedbg.1
-debian/tmp/usr/share/man/fr.UTF-8/man1/wine.1
-debian/tmp/usr/share/man/de.UTF-8/man1/wine.1
-debian/tmp/usr/share/man/pl.UTF-8/man1/wine.1
+/usr/bin/fnt2bdf
+/usr/bin/msiexec
+/usr/bin/notepad
+/usr/bin/regedit
+/usr/bin/regsvr32
+/usr/bin/wine
+/usr/bin/wine-font-convert
+/usr/bin/wineboot
+/usr/bin/winecfg
+/usr/bin/winedbg
+/usr/bin/wineconsole
+/usr/bin/winefile
+/usr/bin/winemine
+/usr/bin/winepath
+/usr/share/man/man1/wine.1
+/usr/share/man/man1/winedbg.1
+/usr/share/man/fr.UTF-8/man1/wine.1
+/usr/share/man/de.UTF-8/man1/wine.1
+/usr/share/man/pl.UTF-8/man1/wine.1
diff --git a/debian/wine-bin.install-common b/debian/wine-bin.install-common
index 719de48..1d1fbf6 100644
--- a/debian/wine-bin.install-common
+++ b/debian/wine-bin.install-common
@@ -1,10 +1,9 @@
-debian/tmp/usr/share/binfmts
-debian/tmp/usr/share/mime-info
-debian/tmp/usr/share/applications/wine.desktop
-debian/tmp/usr/share/wine/wine.inf
-debian/tmp/usr/share/wine/l_intl.nls
-debian/wine.svg usr/share/pixmaps
-debian/uninstaller.desktop usr/share/applications
-debian/winecfg.desktop usr/share/applications
-debian/tmp/usr/share/man/man1/winedbg32.1
-debian/tmp/usr/share/man/man1/wine32.1
+/usr/share/binfmts
+/usr/share/mime-info
+/usr/share/applications/wine.desktop
+/usr/share/wine/wine.inf
+/usr/share/wine/l_intl.nls
+
+debian/wine.svg             usr/share/pixmaps
+debian/uninstaller.desktop  usr/share/applications
+debian/winecfg.desktop      usr/share/applications
-- 
1.7.10.4