[pkg-wine-party] [wine] 07/18: Rename sources of generated scripts and remove executable bit.

[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 b86d119db63ceaab7181809f5035ce71bf18501a
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Jun 23 01:14:49 2016 +0200

    Rename sources of generated scripts and remove executable bit.
    
    # Conflicts:
    #	debian/changelog
---
 debian/changelog                                   | 2 ++
 debian/rules                                       | 2 +-
 debian/scripts/{wine => wine.in}                   | 0
 debian/scripts/{wineapploader => wineapploader.in} | 0
 debian/scripts/{winegcc => winegcc.in}             | 0
 debian/scripts/{wineserver => wineserver.in}       | 0
 6 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7e41b86..45523fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ wine (1.8.3-3) UNRELEASED; urgency=medium
     Partly cherrypicked from master:
     - Replace VERSION (value is empty or '-development') with DEBSUFFIX
       ('-stable' or '-development') in user exposed files.
+    - Generate scripts (wine, wineserver, wineapploader, winegcc) with
+      hardcoded paths/names instead of runtime detection.
 
  -- Jens Reyer <jre.winesim at gmail.com>  Thu, 28 Jul 2016 17:33:38 +0200
 
diff --git a/debian/rules b/debian/rules
index aa4b28b..08d8dee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,7 +149,7 @@ override_dh_auto_install-arch: $(INSTALLS)
 	cp ANNOUNCE debian/tmp/changelog
 	cp tools/winedump/README debian/tmp/README.winedump
 	cp server/wineserver debian/tmp/wineserver$(DEB_BUILD_ARCH_BITS)
-	sed "s|BINDIR|$(BINDIR)|g" debian/scripts/winegcc > debian/tmp/winegcc$(DEBSUFFIX)
+	sed "s|BINDIR|$(BINDIR)|g" debian/scripts/winegcc.in > debian/tmp/winegcc$(DEBSUFFIX)
 	dh_auto_install
 	for file in $$(find . ! -path "./debian/*" -name \*.man); do \
 	    rename=$$(basename $$file | sed "s/\\./$(DEBSUFFIX)./;s/UTF-8\\.//"); \
diff --git a/debian/scripts/wine b/debian/scripts/wine.in
old mode 100755
new mode 100644
similarity index 100%
rename from debian/scripts/wine
rename to debian/scripts/wine.in
diff --git a/debian/scripts/wineapploader b/debian/scripts/wineapploader.in
old mode 100755
new mode 100644
similarity index 100%
rename from debian/scripts/wineapploader
rename to debian/scripts/wineapploader.in
diff --git a/debian/scripts/winegcc b/debian/scripts/winegcc.in
similarity index 100%
rename from debian/scripts/winegcc
rename to debian/scripts/winegcc.in
diff --git a/debian/scripts/wineserver b/debian/scripts/wineserver.in
old mode 100755
new mode 100644
similarity index 100%
rename from debian/scripts/wineserver
rename to debian/scripts/wineserver.in

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