[Pkg-cli-apps-commits] [fsharp] 06/17: Refreshed debian/patches/debian-cli-policy.patch

[Jo Shields]

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

directhex pushed a commit to annotated tag debian/4.0.0.4+dfsg2-1
in repository fsharp.

commit 45ae32d2125a861b06f705aa7a3afff377c17609
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Tue Dec 1 15:20:57 2015 +0000

    Refreshed debian/patches/debian-cli-policy.patch
---
 debian/patches/debian-cli-policy.patch | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/patches/debian-cli-policy.patch b/debian/patches/debian-cli-policy.patch
index cfc0d3e..948ae37 100644
--- a/debian/patches/debian-cli-policy.patch
+++ b/debian/patches/debian-cli-policy.patch
@@ -1,22 +1,26 @@
---- a/launcher.in
-+++ b/launcher.in
-@@ -21,4 +21,4 @@
+Index: fsharp/launcher.in
+===================================================================
+--- fsharp.orig/launcher.in
++++ fsharp/launcher.in
+@@ -21,4 +21,4 @@ fi
  # location of the default FSharp install in order to find the FSharp compiler binaries (see 
  # fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerLocationUtils.fs). That's a pretty unfortunate
  # way of finding those binaries. And really should be changed.
--$EXEC mono $DEBUG $MONO_OPTIONS @DIR@/@TOOL@ --exename:$(basename $0) "$@"
-+SILLY_ENV_HACK_FOR_REGEX=mono $EXEC cli $DEBUG $MONO_OPTIONS @DIR@/@TOOL@ --exename:$(basename $0) "$@"
---- a/src/fsharp/targets.make
-+++ b/src/fsharp/targets.make
-@@ -127,9 +127,11 @@
+-$EXEC @MONOBINDIR@/mono $DEBUG $MONO_OPTIONS @DIR@/@TOOL@ --exename:$(basename "$0") "$@"
++SILLY_ENV_HACK_FOR_REGEX=mono $EXEC cli $DEBUG $MONO_OPTIONS @DIR@/@TOOL@ --exename:$(basename "$0") "$@"
+Index: fsharp/src/fsharp/targets.make
+===================================================================
+--- fsharp.orig/src/fsharp/targets.make
++++ fsharp/src/fsharp/targets.make
+@@ -184,9 +184,11 @@ install-lib-net40:
  
- # The binaries fsc.exe and fsi.exe only get installed for Mono 4.0 profile
+ # The binaries fsc.exe and fsi.exe only get installed for Mono 4.5 profile
  # This also installs 'fsharpc' and 'fsharpi'
 +#
 +# Debian patch - Point fsharpc and fsharpi at our install paths, not the GAC.
  install-bin:
  	chmod +x $(outdir)$(ASSEMBLY)
--	sed -e 's,[@]DIR[@],$(gacdir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))
+-	sed -e 's,[@]DIR[@],$(gacdir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' -e 's,[@]MONOBINDIR[@],$(monobindir),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))
 +	sed -e "s,[@]DIR[@],/usr/lib/cli/fsharp,g" -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))
  	chmod +x $(outdir)$(subst fs,fsharp,$(NAME))
  	@mkdir -p $(DESTDIR)$(gacdir)/$(TARGET)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git