This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository tuareg-mode.
commit ab361d912a76b58b0aeb9ad29728330227e1ae42
Author: Ralf Treinen <trei...@free.fr>
Date: Wed Nov 22 21:22:43 2017 +0100
drop patch opam
---
debian/changelog | 3 ++-
debian/patches/opam | 22 ----------------------
debian/patches/series | 1 -
3 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c90e95c..b99f56a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ tuareg-mode (1:2.1.0-1) unstable; urgency=medium
* New upstream version
- refresh patch ocaml-path
+ - drop patch opam, issue is resolved by upstream
* debian/gbp.conf: drop field cleaner
- -- Ralf Treinen <trei...@debian.org> Wed, 22 Nov 2017 21:08:54 +0100
+ -- Ralf Treinen <trei...@debian.org> Wed, 22 Nov 2017 21:22:18 +0100
tuareg-mode (1:2.0.10-1) unstable; urgency=medium
diff --git a/debian/patches/opam b/debian/patches/opam
deleted file mode 100644
index 2a98585..0000000
--- a/debian/patches/opam
+++ /dev/null
@@ -1,22 +0,0 @@
-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 46edf2e..93fb398 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
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
