[DHG_packages] 02/02: refresh debian/patches/do-no-use-SHELL, as it got out of sync with the upstream source and only applied with fuzz (dpkg-source doesn't like that).

[Sven Bartscher]

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

kritzefitz pushed a commit to branch experimental
in repository DHG_packages.

commit 7d6525df994664dc546cd1740d52ad6cb90fc4e2
Author: Sven Bartscher <kritzefitz at debian.org>
Date:   Sat Jul 9 20:14:48 2016 +0200

    refresh debian/patches/do-no-use-SHELL, as it got out of sync with the
    upstream source and only applied with fuzz (dpkg-source doesn't like
    that).
---
 p/ghc/debian/patches/do-not-use-SHELL | 42 ++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/p/ghc/debian/patches/do-not-use-SHELL b/p/ghc/debian/patches/do-not-use-SHELL
index d811bd0..540efa9 100644
--- a/p/ghc/debian/patches/do-not-use-SHELL
+++ b/p/ghc/debian/patches/do-not-use-SHELL
@@ -3,10 +3,12 @@ Description: Do not use $SHELL
  leak into the wrapper scripts.
 Author: Joachim Breitner <nomeata at debian.org>
 
---- ghc-7.10.3.orig/driver/ghci/ghc.mk
-+++ ghc-7.10.3/driver/ghci/ghc.mk
-@@ -21,7 +21,7 @@ install_driver_ghci:
- 	$(call INSTALL_DIR,"$(DESTDIR)$(bindir)")
+Index: ghc/driver/ghci/ghc.mk
+===================================================================
+--- ghc.orig/driver/ghci/ghc.mk	2016-07-07 12:40:40.690866042 +0200
++++ ghc/driver/ghci/ghc.mk	2016-07-07 12:40:40.686863966 +0200
+@@ -21,7 +21,7 @@
+ 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
  	$(call removeFiles,                                "$(WRAPPER)")
  	$(CREATE_SCRIPT)                                   "$(WRAPPER)"
 -	echo '#!$(SHELL)'                               >> "$(WRAPPER)"
@@ -14,28 +16,30 @@ Author: Joachim Breitner <nomeata at debian.org>
  	echo 'exec "$(bindir)/ghc-$(ProjectVersion)" --interactive "$$@"' >> "$(WRAPPER)"
  	$(EXECUTABLE_FILE)                                 "$(WRAPPER)"
  	$(call removeFiles,"$(DESTDIR)$(bindir)/ghci")
-@@ -56,7 +56,7 @@ install_driver_ghcii: GHCII_SCRIPT_VERSI
+@@ -56,7 +56,7 @@
  install_driver_ghcii:
- 	$(call INSTALL_DIR,$(DESTDIR)$(bindir))
+ 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
  	$(call removeFiles,"$(GHCII_SCRIPT)")
 -	echo "#!$(SHELL)"                                  >> $(GHCII_SCRIPT)
 +	echo "#!/bin/sh"                                        >> $(GHCII_SCRIPT)
  	echo 'exec "$$(dirname "$$0")"/ghc --interactive "$$@"' >> $(GHCII_SCRIPT)
  	$(EXECUTABLE_FILE) $(GHCII_SCRIPT)
  	cp $(GHCII_SCRIPT) $(GHCII_SCRIPT_VERSIONED)
---- ghc-7.10.3.orig/rules/shell-wrapper.mk
-+++ ghc-7.10.3/rules/shell-wrapper.mk
-@@ -36,7 +36,7 @@ $$(INPLACE_WRAPPER): $$($1_$2_SHELL_WRAP
+Index: ghc/rules/shell-wrapper.mk
+===================================================================
+--- ghc.orig/rules/shell-wrapper.mk	2016-07-07 12:40:40.690866042 +0200
++++ ghc/rules/shell-wrapper.mk	2016-07-07 12:40:40.686863966 +0200
+@@ -41,7 +41,7 @@
  endif
- $$(INPLACE_WRAPPER): $$($1_$2_INPLACE)
+ $$($1_$2_INPLACE_WRAPPER): $$($1_$2_INPLACE)
  	$$(call removeFiles,                                                    $$@)
 -	echo '#!$$(SHELL)'                                                   >> $$@
 +	echo '#!/bin/sh'                                                     >> $$@
  	echo 'executablename="$$(TOP)/$$<"'                                  >> $$@
  	echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"'                             >> $$@
  	echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"'                              >> $$@
-@@ -74,7 +74,7 @@ install_$1_$2_wrapper:
- 	$$(call INSTALL_DIR,"$$(DESTDIR)$$(bindir)")
+@@ -80,7 +80,7 @@
+ 	$$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)"
  	$$(call removeFiles,                                        "$$(WRAPPER)")
  	$$(CREATE_SCRIPT)                                           "$$(WRAPPER)"
 -	echo '#!$$(SHELL)'                                       >> "$$(WRAPPER)"
@@ -43,7 +47,7 @@ Author: Joachim Breitner <nomeata at debian.org>
  	echo 'exedir="$$(ghclibexecdir)/bin"'                    >> "$$(WRAPPER)"
  	echo 'exeprog="$$($1_$2_PROG)"'                          >> "$$(WRAPPER)"
  	echo 'executablename="$$$$exedir/$$$$exeprog"'           >> "$$(WRAPPER)"
-@@ -99,7 +99,7 @@ BINDIST_EXTRAS += $$($1_$2_BINDIST_WRAPP
+@@ -106,7 +106,7 @@
  
  $$($1_$2_BINDIST_WRAPPER): $1/$2/build/tmp/$$($1_$2_PROG)
  	$$(call removeFiles,                                                  $$@)
@@ -52,11 +56,13 @@ Author: Joachim Breitner <nomeata at debian.org>
  ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES"
  	echo '$$(call prependLibraryPath,$$($1_$2_DEP_LIB_REL_DIRS_SEARCHPATH))' >> $$@
  endif
---- ghc-7.10.3.orig/utils/mkdirhier/ghc.mk
-+++ ghc-7.10.3/utils/mkdirhier/ghc.mk
-@@ -15,7 +15,7 @@ $(MKDIRHIER) : utils/mkdirhier/mkdirhier
- 	-mkdir $(INPLACE_BIN)
- 	-mkdir $(INPLACE_LIB)
+Index: ghc/utils/mkdirhier/ghc.mk
+===================================================================
+--- ghc.orig/utils/mkdirhier/ghc.mk	2016-07-07 12:40:40.690866042 +0200
++++ ghc/utils/mkdirhier/ghc.mk	2016-07-07 12:40:40.686863966 +0200
+@@ -14,7 +14,7 @@
+ 	mkdir -p $(INPLACE_BIN)
+ 	mkdir -p $(INPLACE_LIB)
  	$(call removeFiles,$@)
 -	echo '#!$(SHELL)'  		 >> $@
 +	echo '#!/bin/sh'		 >> $@

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