This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository tuareg-mode.
commit 1d451924d8e23d345e566bc1e2f6aa09adb84e4b
Author: Ralf Treinen <trei...@free.fr>
Date: Sat Jul 16 20:44:58 2016 +0200
use opam toplevel only when ~/.opam exists
---
debian/changelog | 4 +++-
debian/patches/opam | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5e12bf5..2e9f04b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ tuareg-mode (1:2.0.10-1) unstable; urgency=medium
* new upstream release.
* emacsen-startup: autoload tuareg-run-ocaml. Thanks to Sameer Bagwhat
for the patch (closes: #522058)
+ * patch opam: set tuareg-interactive-program to opam only when opam is
+ installed, and the user has an .opam directory (closes: #788456)
* d/rules: install all tuareg*.el files
* standards-version 3.9.8 (no change)
* d/control: dropped depricated XS-Testsuite
@@ -10,7 +12,7 @@ tuareg-mode (1:2.0.10-1) unstable; urgency=medium
* d/control: capitalisation in short description
* d/control: updated Homepage
- -- Ralf Treinen <trei...@debian.org> Sat, 16 Jul 2016 11:08:21 +0200
+ -- Ralf Treinen <trei...@debian.org> Sat, 16 Jul 2016 20:43:36 +0200
tuareg-mode (1:2.0.9-2) unstable; urgency=low
diff --git a/debian/patches/opam b/debian/patches/opam
new file mode 100644
index 0000000..2a98585
--- /dev/null
+++ b/debian/patches/opam
@@ -0,0 +1,22 @@
+Author: Ralf Treinen <trei...@debian.org>
+Description: set tuareg-interactive-program to opam only when opam is
+ installed, and the user has an .opam directory
+Debian-bug: #88456
+
+Index: tuareg-mode/tuareg.el
+===================================================================
+--- tuareg-mode.orig/tuareg.el 2016-07-16 20:36:23.576386723 +0200
++++ tuareg-mode/tuareg.el 2016-07-16 20:39:43.441323983 +0200
+@@ -2378,7 +2378,11 @@
+ (if (and opam (file-executable-p opam)) opam)))) ; or nil
+ "The full path of the opam executable.")
+
+-(when tuareg-opam
++(defvar tuareg-configured
++ (if (file-directory-p "~/.opam") t nil)
++ "Flag indicating presence of ~/.opam")
++
++(when (and tuareg-opam tuareg-configured)
+ (setq tuareg-interactive-program
+ (concat tuareg-opam " config exec -- ocaml"))
+
diff --git a/debian/patches/series b/debian/patches/series
index 93fb398..e0340b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
ocaml-path
+opam
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/tuareg-mode.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
