[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1.45.6-2-26-g7813046
Stephane Glondu
steph at glondu.net
Mon May 24 17:32:20 UTC 2010
The following commit has been merged in the master branch:
commit 6138a8e49d50175f43a3d73671160c41a4c3b401
Author: Stephane Glondu <steph at glondu.net>
Date: Mon May 24 19:19:25 2010 +0200
Refresh patches and switch to 3.0 (quilt)
diff --git a/debian/control b/debian/control
index 4ca418c..37ebef6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ralf Treinen <treinen at debian.org>,
Stefano Zacchiroli <zack at debian.org>,
Samuel Mimram <smimram at debian.org>,
Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 4.0), dpatch
+Build-Depends: debhelper (>= 4.0)
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/tuareg-mode.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/tuareg-mode.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..6c7ed3b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,3 @@
[DEFAULT]
pristine-tar = True
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
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
new file mode 100644
index 0000000..4bcb8b0
--- /dev/null
+++ b/debian/patches/0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
@@ -0,0 +1,19 @@
+From: Ralf Treinen <treinen at 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(-)
+
+diff --git a/append-tuareg.el b/append-tuareg.el
+index 596ce4b..51951f8 100644
+--- a/append-tuareg.el
++++ b/append-tuareg.el
+@@ -3,4 +3,4 @@
+
+ (add-to-list 'auto-mode-alist '("\\.ml\\w?" . 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)
+--
diff --git a/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch b/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
new file mode 100644
index 0000000..015609d
--- /dev/null
+++ b/debian/patches/0002-Use-locally-installed-documentation-when-possible.patch
@@ -0,0 +1,35 @@
+From: Ralf Treinen <treinen at 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(-)
+
+diff --git a/tuareg.el b/tuareg.el
+index f614ea0..bf11e54 100644
+--- a/tuareg.el
++++ b/tuareg.el
+@@ -368,7 +368,11 @@ them to the Caml toplevel."
+ "*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)
+
+@@ -377,7 +381,7 @@ them to the Caml toplevel."
+ 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-autoload-pattern-down-to-what-is-really-neede.patch b/debian/patches/0003-Narrow-autoload-pattern-down-to-what-is-really-neede.patch
new file mode 100644
index 0000000..3fb28b7
--- /dev/null
+++ b/debian/patches/0003-Narrow-autoload-pattern-down-to-what-is-really-neede.patch
@@ -0,0 +1,21 @@
+From: Ralf Treinen <treinen at debian.org>
+Date: Mon, 24 May 2010 19:17:07 +0200
+Subject: [PATCH] Narrow autoload pattern down to what is really needed
+
+---
+ append-tuareg.el | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/append-tuareg.el b/append-tuareg.el
+index 51951f8..dd3c321 100644
+--- a/append-tuareg.el
++++ b/append-tuareg.el
+@@ -1,6 +1,6 @@
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
+
+-(add-to-list 'auto-mode-alist '("\\.ml\\w?" . 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)
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 483a9a7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_camldebug
-02_localdoc
-03_autoload_pattern
diff --git a/debian/patches/01_camldebug.dpatch b/debian/patches/01_camldebug.dpatch
deleted file mode 100755
index b0020c5..0000000
--- a/debian/patches/01_camldebug.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 01_camldebug.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: camldebug of tuareg-mode is renamed to camldebug-tuareg
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/tuareg-mode/trunk/tuareg-mode-1.41.4/append-tuareg.el tuareg-mode-1.41.4/append-tuareg.el
---- /home/rt/debian/pkg-ocaml-maint/packages/tuareg-mode/trunk/tuareg-mode-1.41.4/append-tuareg.el 2004-03-09 16:57:20.000000000 +0100
-+++ tuareg-mode-1.41.4/append-tuareg.el 2004-03-19 20:24:00.000000000 +0100
-@@ -3,7 +3,7 @@
-
- (setq auto-mode-alist (cons '("\\.ml\\w?" . tuareg-mode) auto-mode-alist))
- (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)
-
- (if (and (boundp 'window-system) window-system)
- (when (string-match "XEmacs" emacs-version)
diff --git a/debian/patches/02_localdoc.dpatch b/debian/patches/02_localdoc.dpatch
deleted file mode 100755
index a1b6f33..0000000
--- a/debian/patches/02_localdoc.dpatch
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh -e
-## 02_localdoc.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use locally installed documentation when possible.
-## DP: fix location of ocal lib.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/rt/debian/pkg-ocaml-maint/packages/tuareg-mode/trunk/tuareg-mode-1.41.4/tuareg.el tuareg-mode-1.41.4/tuareg.el
---- /home/rt/debian/pkg-ocaml-maint/packages/tuareg-mode/trunk/tuareg-mode-1.41.4/tuareg.el 2004-03-09 16:58:34.000000000 +0100
-+++ tuareg-mode-1.41.4/tuareg.el 2004-03-19 20:27:22.000000000 +0100
-@@ -311,7 +311,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)
-
-@@ -321,7 +325,7 @@
- and `tuareg-xemacs-w3-manual' (XEmacs only)."
- :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/03_autoload_pattern.dpatch b/debian/patches/03_autoload_pattern.dpatch
deleted file mode 100755
index 5aa5bce..0000000
--- a/debian/patches/03_autoload_pattern.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_autoload_pattern.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: narrow autoload pattern down to what is really needed.
-
- at DPATCH@
---- ./append-tuareg.el
-+++ /tmp/dpep-work.U6Ew9c/trunk/append-tuareg.el
-@@ -1,7 +1,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
-
--(setq auto-mode-alist (cons '("\\.ml\\w?" . tuareg-mode) auto-mode-alist))
-+(setq auto-mode-alist (cons '("\\.ml[iylp]?\\'" . tuareg-mode) auto-mode-alist))
- (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
- (autoload 'camldebug "camldebug" "Run the Caml debugger" t)
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1db43da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-camldebug-of-tuareg-mode-is-renamed-to-camldebug-tua.patch
+0002-Use-locally-installed-documentation-when-possible.patch
+0003-Narrow-autoload-pattern-down-to-what-is-really-neede.patch
diff --git a/debian/rules b/debian/rules
index 9b08f3d..d8275e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,13 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
# elisp dirs
export TUAREGELDIR=debian/tuareg-mode/usr/share/emacs/site-lisp/tuareg-mode
export TUAREGXELDIR=debian/tuareg-mode/usr/share/xemacs/site-lisp/tuareg-mode
-build: patch
+build:
-clean: unpatch
+clean:
dh_testdir
dh_testroot
dh_clean
@@ -46,4 +44,4 @@ binary-indep: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
tuareg-mode packaging
More information about the Pkg-ocaml-maint-commits
mailing list