The following commit has been merged in the master branch:
commit ddf570c5bcb48a54a05296d6fc502554230b807c
Author: Ralf Treinen <trei...@free.fr>
Date:   Mon May 28 21:29:38 2012 +0200

    adapt patches and install target in debian/rules to new upstream release

diff --git a/debian/changelog b/debian/changelog
index 7aa225b..f1ee0da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,17 @@ tuareg-mode (1:2.0.6-1) UNRELEASED; urgency=low
 
   * New upstream version
   * debian/watch: also accept .tar.gz files
-
- -- Ralf Treinen <trei...@debian.org>  Sat, 26 May 2012 12:19:06 +0200
+  * upstream does noy longe distribute append-tuareg.el. Put our own version.
+    Drop patches to append-tuareg.el that arte hence no longer necessary:
+     0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
+     0003-narrow-down-auto-alist
+  * Drop patch 0002-Use-locally-installed-documentation which is no longer
+    relevant as we do not have any local documentation
+  * Add patch ocaml-path to fix ocaml librart path according to the 
+    debian ocaml policy.
+  * debian/rules: no more files custom-tuareg.el or sym-lock.el to install
+
+ -- Ralf Treinen <trei...@debian.org>  Mon, 28 May 2012 21:33:11 +0200
 
 tuareg-mode (1:2.0.4-4) unstable; urgency=low
 
diff --git a/debian/emacsen-setloadpath b/debian/emacsen-setloadpath
deleted file mode 100644
index 846ccbe..0000000
--- a/debian/emacsen-setloadpath
+++ /dev/null
@@ -1,6 +0,0 @@
-(debian-pkg-add-load-path-item
- (concat "/usr/share/"
-        (symbol-name debian-emacs-flavor)
-        "/site-lisp/tuareg-mode"))
-
-
diff --git a/debian/emacsen-startup b/debian/emacsen-startup
new file mode 100644
index 0000000..2e1d58b
--- /dev/null
+++ b/debian/emacsen-startup
@@ -0,0 +1,15 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
+
+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . tuareg-mode))
+(autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
+(autoload 'camldebug "ocamldebug-tuareg" "Run the Caml debugger" t)
+(dolist (ext '(".cmo" ".cmx" ".cma" ".cmxa" ".cmi"))
+  (add-to-list 'completion-ignored-extensions ext))
+(debian-pkg-add-load-path-item
+ (concat "/usr/share/"
+        (symbol-name debian-emacs-flavor)
+        "/site-lisp/tuareg-mode"))
+
+
+
diff --git 
a/debian/patches/0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
 
b/debian/patches/0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
deleted file mode 100644
index 62c5c31..0000000
--- 
a/debian/patches/0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Ralf Treinen <trei...@debian.org>
-Date: Mon, 24 May 2010 19:13:53 +0200
-Subject: [PATCH] camldebug of tuareg-mode is renamed to camldebug-tuareg
-
----
- append-tuareg.el |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: tuareg-mode/append-tuareg.el
-===================================================================
---- tuareg-mode.orig/append-tuareg.el  2010-09-21 08:11:13.000000000 +0200
-+++ tuareg-mode/append-tuareg.el       2010-09-21 08:34:26.000000000 +0200
-@@ -3,6 +3,6 @@
- 
- (add-to-list 'auto-mode-alist '("\\.ml[iylp]?" . tuareg-mode))
- (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
--(autoload 'camldebug "camldebug" "Run the Caml debugger" t)
-+(autoload 'camldebug "camldebug-tuareg" "Run the Caml debugger" t)
- (dolist (ext '(".cmo" ".cmx" ".cma" ".cmxa" ".cmi"))
-   (add-to-list 'completion-ignored-extensions ext))
diff --git 
a/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch 
b/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
deleted file mode 100644
index 77fa678..0000000
--- 
a/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Ralf Treinen <trei...@debian.org>
-Date: Mon, 24 May 2010 19:16:03 +0200
-Subject: [PATCH] Use locally installed documentation when possible
-
----
- tuareg.el |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: tuareg-mode/tuareg.el
-===================================================================
---- tuareg-mode.orig/tuareg.el 2012-05-06 12:05:11.000000000 +0200
-+++ tuareg-mode/tuareg.el      2012-05-06 14:55:03.000000000 +0200
-@@ -366,7 +366,11 @@
-   "*Non nil means pop up the Caml toplevel when evaluating code."
-   :group 'tuareg :type 'boolean)
- 
--(defcustom tuareg-manual-url 
"http://pauillac.inria.fr/ocaml/htmlman/index.html";
-+(setq local-doc '"/usr/share/doc/ocaml-doc/docs/ocaml.html/index.html")
-+(defcustom tuareg-manual-url
-+  (if (file-readable-p local-doc)
-+      (concat "file:" local-doc)
-+      "http://pauillac.inria.fr/ocaml/htmlman/index.html";)
-   "*URL to the Caml reference manual."
-   :group 'tuareg :type 'string)
- 
-@@ -375,7 +379,7 @@
- Valid names are `browse-url', `browse-url-firefox', etc."
-   :group 'tuareg)
- 
--(defcustom tuareg-library-path "/usr/local/lib/ocaml/"
-+(defcustom tuareg-library-path "/usr/lib/ocaml/"
-   "*Path to the Caml library."
-   :group 'tuareg :type 'string)
- 
diff --git a/debian/patches/0003-narrow-down-auto-alist 
b/debian/patches/0003-narrow-down-auto-alist
deleted file mode 100644
index 535bfc2..0000000
--- a/debian/patches/0003-narrow-down-auto-alist
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Kevin Ryde <use...@zip.com.au>
-Description: narrow down auto-alist to match only at the end of a filename
-Debian-bug: #671558
-
-Index: tuareg-mode/append-tuareg.el
-===================================================================
---- tuareg-mode.orig/append-tuareg.el  2012-05-06 14:55:03.000000000 +0200
-+++ tuareg-mode/append-tuareg.el       2012-05-06 14:56:37.000000000 +0200
-@@ -1,7 +1,7 @@
- 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
- 
--(add-to-list 'auto-mode-alist '("\\.ml[iylp]?" . tuareg-mode))
-+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . tuareg-mode))
- (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
- (autoload 'camldebug "camldebug-tuareg" "Run the Caml debugger" t)
- (dolist (ext '(".cmo" ".cmx" ".cma" ".cmxa" ".cmi"))
diff --git a/debian/patches/ocaml-path b/debian/patches/ocaml-path
new file mode 100644
index 0000000..f82966b
--- /dev/null
+++ b/debian/patches/ocaml-path
@@ -0,0 +1,16 @@
+Author: Ralf Treinen <trei...@debian.org>
+Description: fix path of ocaml libraries to conform with debian 
+
+Index: tuareg-mode/tuareg.el
+===================================================================
+--- tuareg-mode.orig/tuareg.el 2012-05-28 21:24:46.000000000 +0200
++++ tuareg-mode/tuareg.el      2012-05-28 21:25:46.000000000 +0200
+@@ -441,7 +441,7 @@
+ Valid names are `browse-url', `browse-url-firefox', etc."
+   :group 'tuareg)
+ 
+-(defcustom tuareg-library-path "/usr/local/lib/ocaml/"
++(defcustom tuareg-library-path "/usr/lib/ocaml/"
+   "*Path to the OCaml library."
+   :group 'tuareg :type 'string)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3ffc710..93fb398 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
-0002-Use-locally-installed-documentation-when-possible.patch
-0003-narrow-down-auto-alist
+ocaml-path
diff --git a/debian/rules b/debian/rules
index 2b1c7c1..6a520de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,9 @@ export 
TUAREGXELDIR=debian/tuareg-mode/usr/share/xemacs/site-lisp/tuareg-mode
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-       mkdir -p $(TUAREGXELDIR) $(TUAREGELDIR)
-       cp tuareg.el custom-tuareg.el $(TUAREGELDIR)
-       cat append-tuareg.el debian/emacsen-setloadpath > \
-               debian/tuareg-mode.emacsen-startup
-       echo ";; empty dummy file" > $(TUAREGELDIR)/append-tuareg.el
-       cp sym-lock.el $(TUAREGXELDIR)
-       cp camldebug.el $(TUAREGELDIR)/camldebug-tuareg.el
+       mkdir -p $(TUAREGELDIR)
+       cp tuareg.el $(TUAREGELDIR)
+       cp ocamldebug.el $(TUAREGELDIR)/ocamldebug-tuareg.el
 
 .PHONY: override_dh_installemacsen
 override_dh_installemacsen:
@@ -25,7 +21,7 @@ override_dh_installemacsen:
 
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:
-       dh_installchangelogs HISTORY
+       dh_installchangelogs README
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:

-- 
tuareg-mode packaging

_______________________________________________
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

Reply via email to