[pkg-wine-party] [wine] 01/15: Use minimal wineapploader script, instead of patching the upstream one.

[Jens Reyer]

This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch stretch
in repository wine.

commit 22f52b1c7f167c8407b5885be4e1d1fca79a4a71
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Wed Feb 24 14:58:48 2016 +0100

    Use minimal wineapploader script, instead of patching the upstream one.
    
    Source:
    commit ddf4fe2363874f6aa0436681b83133e23a67a4aa
    Author: Michael Gilbert <mgilbert at debian.org>
    Date:   Mon Feb 1 02:36:04 2016 +0000
    
        release 1.9.0-1
---
 debian/patches/development/apploader.patch | 44 ------------------------------
 debian/patches/series                      |  1 -
 debian/scripts/wineapploader               |  7 +++++
 debian/wineVERSION.install                 |  2 +-
 4 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/debian/patches/development/apploader.patch b/debian/patches/development/apploader.patch
deleted file mode 100644
index 91fb0ff..0000000
--- a/debian/patches/development/apploader.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-description: correctly call suffixed wine launcher in wineapploader
-author: Michael Gilbert <mgilbert at debian.org>
-
---- a/tools/wineapploader.in
-+++ b/tools/wineapploader.in
-@@ -20,33 +20,13 @@
- #
- 
- # determine the app Winelib library name
--appname=`basename "$0" .exe`.exe
-+app=$(basename "$0" .exe)
-+name=$(echo $app | cut -d- -f1)
-+suffix=$(echo $app | sed s/$name//)
-+appname=$name.exe
- 
- # first try explicit WINELOADER
- if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi
- 
--# then default bin directory
--if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine" "$appname" "$@"; fi
--
--# now try the directory containing $0
--appdir=""
--case "$0" in
--  */*)
--    # $0 contains a path, use it
--    appdir=`dirname "$0"`
--    ;;
--  *)
--    # no directory in $0, search in PATH
--    saved_ifs=$IFS
--    IFS=:
--    for d in $PATH
--    do
--      IFS=$saved_ifs
--      if [ -x "$d/$0" ]; then appdir="$d"; break; fi
--    done
--    ;;
--esac
--if [ -x "$appdir/wine" ]; then exec "$appdir/wine" "$appname" "$@"; fi
--
- # finally look in PATH
--exec wine "$appname" "$@"
-+exec wine$suffix "$appname" "$@"
diff --git a/debian/patches/series b/debian/patches/series
index b89fa1b..2031aec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ generate/opengl.patch
 generate/unicode.patch
 generate/request.patch
 
-# development/apploader.patch
 # development/winegcc.patch
 # development/winemenubuilder.patch
 
diff --git a/debian/scripts/wineapploader b/debian/scripts/wineapploader
new file mode 100755
index 0000000..d0c98d8
--- /dev/null
+++ b/debian/scripts/wineapploader
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+appname=$(basename "$0" .exe)
+name=$(echo $appname | cut -d- -f1)
+suffix=$(echo $appname | sed s/$name//)
+
+exec wine$suffix "$name.exe" "$@"
diff --git a/debian/wineVERSION.install b/debian/wineVERSION.install
index d36aa65..3d3d7c9 100644
--- a/debian/wineVERSION.install
+++ b/debian/wineVERSION.install
@@ -1,4 +1,4 @@
 debian/tmp/wineVERSION usr/bin
 debian/tmp/wineserverVERSION usr/bin
 
-tools/wineapploader usr/lib/wineVERSION
+debian/scripts/wineapploader usr/lib/wineVERSION

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git