This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit 08fad33d8b536c78de0f24b46e7b4d0b53547633 Author: Jens Reyer <[email protected]> Date: Thu Jul 28 18:16:52 2016 +0200 Drop development/winegcc.patch. No more needed with the alternatives system. --- debian/changelog | 2 ++ debian/patches/development/winegcc.patch | 53 -------------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 54 deletions(-) diff --git a/debian/changelog b/debian/changelog index 536ffb2..71f8515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ wine-development (1.9.15-2) UNRELEASED; urgency=medium * Add removal instructions for binfmt support to README.debian. * Add Recommends g++ or g++-multilib to the -tools (see: #832041). + * Implement the Debian alternatives system. + - Drop now obsolete development/winegcc.patch. -- Jens Reyer <[email protected]> Thu, 28 Jul 2016 15:14:47 +0200 diff --git a/debian/patches/development/winegcc.patch b/debian/patches/development/winegcc.patch deleted file mode 100644 index 9f09244..0000000 --- a/debian/patches/development/winegcc.patch +++ /dev/null @@ -1,53 +0,0 @@ -description: call wineDEBSUFFIX instead of wine from the winegcc shell script -author: Michael Gilbert <[email protected]> -author: Jens Reyer <[email protected]> - ---- a/tools/winegcc/Makefile.in -+++ b/tools/winegcc/Makefile.in -@@ -2,6 +2,8 @@ PROGRAMS = winegcc - - MANPAGES = winegcc.man.in - -+EXTRADEFS = -DDEBSUFFIX="\"${DEBSUFFIX}\"" -+ - winegcc_SYMLINKS = winecpp wineg++ - - C_SRCS = \ ---- a/tools/winegcc/winegcc.c -+++ b/tools/winegcc/winegcc.c -@@ -98,6 +98,8 @@ - - #include "utils.h" - -+static const char wine_debsuffix[] = "wine" DEBSUFFIX; -+ - static const char* app_loader_template = - "#!/bin/sh\n" - "\n" -@@ -131,7 +133,7 @@ static const char* app_loader_template = - "fi\n" - "\n" - "# determine the WINELOADER\n" -- "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"wine\"; fi\n" -+ "if [ ! -x \"$WINELOADER\" ]; then WINELOADER=\"%s\"; fi\n" - "\n" - "# and try to start the app\n" - "exec \"$WINELOADER\" \"$apppath\" \"$@\"\n" -@@ -791,7 +793,7 @@ static void build(struct options* opts) - /* 'winegcc -o app xxx.exe.so' only creates the load script */ - if (opts->files->size == 1 && strendswith(opts->files->base[0], ".exe.so")) - { -- create_file(output_file, 0755, app_loader_template, opts->files->base[0]); -+ create_file(output_file, 0755, app_loader_template, opts->files->base[0], wine_debsuffix); - return; - } - -@@ -1192,7 +1194,7 @@ static void build(struct options* opts) - - /* create the loader script */ - if (generate_app_loader) -- create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name)); -+ create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name), wine_debsuffix); - } - - diff --git a/debian/patches/series b/debian/patches/series index d7c7a62..8be8ecb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,7 +13,6 @@ generate/opengl.patch generate/unicode.patch generate/request.patch -development/winegcc.patch development/winemenubuilder.patch glu32.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
