[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.09.3-3-4-g1c3d202
Stephane Glondu
steph at glondu.net
Tue May 18 15:41:24 UTC 2010
The following commit has been merged in the master branch:
commit 7c4700d45a1c6f4c86a2601e27024cbd6bac102d
Author: Stephane Glondu <steph at glondu.net>
Date: Tue May 18 17:18:27 2010 +0200
Switch source package format to 3.0 (quilt)
diff --git a/debian/changelog b/debian/changelog
index ded3a39..6b76767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
otags (3.09.3-4) UNRELEASED; urgency=low
* Switch packaging to git
+ * Switch source package format to 3.0 (quilt)
-- Stéphane Glondu <glondu at debian.org> Tue, 18 May 2010 16:59:26 +0200
diff --git a/debian/control b/debian/control
index 0397167..a1ea42a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,11 @@ Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Mike Furr <mfurr at debian.org>, Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Build-Depends: ocaml-nox (>= 3.10.0), debhelper (>= 5.0.0), dh-ocaml (>= 0.4.1), dpatch, camlp5
+Build-Depends:
+ ocaml-nox (>= 3.10.0),
+ debhelper (>= 5.0.0),
+ dh-ocaml (>= 0.4.1),
+ camlp5
Standards-Version: 3.8.2
Homepage: http://www.cs.ru.nl/~tews/otags/
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/otags.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/10_Makefile.dpatch b/debian/patches/0001-Change-install-directory.patch
old mode 100755
new mode 100644
similarity index 57%
rename from debian/patches/10_Makefile.dpatch
rename to debian/patches/0001-Change-install-directory.patch
index 952d4c5..679ffd7
--- a/debian/patches/10_Makefile.dpatch
+++ b/debian/patches/0001-Change-install-directory.patch
@@ -1,13 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_Makefile.dpatch by Mike Furr <mfurr at debian.org>
-##
-## DP: Change install directory.
+From: Mike Furr <mfurr at debian.org>
+Date: Wed, 9 Nov 2005 03:24:34 +0000
+Subject: [PATCH] Change install directory
- at DPATCH@
-diff -urNad otags-3.09.0~/Makefile otags-3.09.0/Makefile
---- otags-3.09.0~/Makefile 2005-11-04 10:08:28.000000000 -0500
-+++ otags-3.09.0/Makefile 2005-11-08 22:15:01.864862679 -0500
-@@ -124,11 +124,11 @@
+---
+ Makefile | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 33c5898..6bf9e94 100644
+--- a/Makefile
++++ b/Makefile
+@@ -122,11 +122,11 @@ clean::
rm -f *.tar*
install: $(LIBS) $(OBJ)
@@ -23,3 +26,4 @@ diff -urNad otags-3.09.0~/Makefile otags-3.09.0/Makefile
fi
uninstall:
+--
diff --git a/debian/patches/20_camlp5.dpatch b/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
old mode 100755
new mode 100644
similarity index 72%
rename from debian/patches/20_camlp5.dpatch
rename to debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
index 9518f37..02174b6
--- a/debian/patches/20_camlp5.dpatch
+++ b/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
@@ -1,14 +1,22 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_camlp5.dpatch by Mike Furr <mfurr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use camlp5 instead of camlp4.
+From: Mike Furr <mfurr at debian.org>
+Date: Tue, 11 Sep 2007 20:53:28 +0000
+Subject: [PATCH] Use camlp5 instead of camlp4
- at DPATCH@
-diff -urNad otags-3.09.3~/Makefile otags-3.09.3/Makefile
---- otags-3.09.3~/Makefile 2007-09-11 16:10:49.177667219 -0400
-+++ otags-3.09.3/Makefile 2007-09-11 16:15:48.758821205 -0400
-@@ -70,23 +70,23 @@
+---
+ Makefile | 8 ++++----
+ Makefile.here.tpl | 4 +++-
+ configure | 4 ++--
+ editor.ml | 2 +-
+ mk_conf | 2 +-
+ pr.ml | 23 ++++++++++++++++++-----
+ splay.ml | 4 ++--
+ 7 files changed, 31 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6bf9e94..7a8b949 100644
+--- a/Makefile
++++ b/Makefile
+@@ -70,23 +70,23 @@ otags.byte: conf.cmo otags.cmo
# since 3.09.3 we don't need any source tree
camlp4o_pr_emacs: \
tags.cmxa pr_emacs_tags.cmxa
@@ -36,16 +44,17 @@ diff -urNad otags-3.09.3~/Makefile otags-3.09.3/Makefile
pa_o.cmx pa_op.cmx $+ \
odyl.cmx
-diff -urNad otags-3.09.3~/Makefile.here.tpl otags-3.09.3/Makefile.here.tpl
---- otags-3.09.3~/Makefile.here.tpl 2007-03-15 18:40:43.000000000 -0400
-+++ otags-3.09.3/Makefile.here.tpl 2007-09-11 16:15:15.322674462 -0400
+diff --git a/Makefile.here.tpl b/Makefile.here.tpl
+index 18ce6c1..52ced60 100644
+--- a/Makefile.here.tpl
++++ b/Makefile.here.tpl
@@ -1,3 +1,5 @@
+
+
# This is a -*-Makefile-*-
# $Id: Makefile.here.tpl,v 1.12 2007-03-15 22:40:43 tews Exp $
ROOT=/usr/local
-@@ -15,7 +17,7 @@
+@@ -15,7 +17,7 @@ INSTALLLIBDIR=tpllib
CAMLC=tplocamlc
CAMLOPT=tplocamlopt
CAMLAR=tplocamlc -a
@@ -54,10 +63,11 @@ diff -urNad otags-3.09.3~/Makefile.here.tpl otags-3.09.3/Makefile.here.tpl
CAMLP4DIR=${shell ${CAMLP4} -where}
CAMLLEX=ocamllex
CAMLDEP=ocamldep
-diff -urNad otags-3.09.3~/configure otags-3.09.3/configure
---- otags-3.09.3~/configure 2007-09-11 16:10:31.000000000 -0400
-+++ otags-3.09.3/configure 2007-09-11 16:17:52.666188170 -0400
-@@ -11,7 +11,7 @@
+diff --git a/configure b/configure
+index 4c32abb..814f30f 100755
+--- a/configure
++++ b/configure
+@@ -11,7 +11,7 @@ cmdline="$0 $*"
root=/usr/local
bindir=$root/bin
bindir_spec=no
@@ -66,7 +76,7 @@ diff -urNad otags-3.09.3~/configure otags-3.09.3/configure
#libdir=`camlp4 -where`
libdir_spec=no
#splaydir=$root/lib/ocaml
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ fi
# check ocamlc version
if [ $versioncheck = 1 ] ; then
@@ -75,9 +85,10 @@ diff -urNad otags-3.09.3~/configure otags-3.09.3/configure
echo ocaml version $ocv found. Need 3.09.x.
exit 1
fi
-diff -urNad otags-3.09.3~/editor.ml otags-3.09.3/editor.ml
---- otags-3.09.3~/editor.ml 2007-03-15 18:40:43.000000000 -0400
-+++ otags-3.09.3/editor.ml 2007-09-11 16:19:03.987033364 -0400
+diff --git a/editor.ml b/editor.ml
+index 2359683..2c20069 100644
+--- a/editor.ml
++++ b/editor.ml
@@ -2,7 +2,7 @@
(* Cuihtlauac Alvarado, France Telecon, Recherche & Developement *)
(* Jean-François Monin, Université Joseph Fourier - VERIMAG *)
@@ -87,10 +98,11 @@ diff -urNad otags-3.09.3~/editor.ml otags-3.09.3/editor.ml
(* $Id: editor.ml,v 1.3 2007-03-15 22:40:43 tews Exp $ *)
-diff -urNad otags-3.09.3~/mk_conf otags-3.09.3/mk_conf
---- otags-3.09.3~/mk_conf 2007-03-15 18:40:43.000000000 -0400
-+++ otags-3.09.3/mk_conf 2007-09-11 16:20:48.864040187 -0400
-@@ -23,7 +23,7 @@
+diff --git a/mk_conf b/mk_conf
+index f85dcf0..cd6d2ae 100755
+--- a/mk_conf
++++ b/mk_conf
+@@ -23,7 +23,7 @@ echo "let recursive = ref false"
echo "let editor = ref Emacs"
echo "let output = ref (Some \"TAGS\")"
echo "let camlp4 = ref (None : string option)"
@@ -99,9 +111,10 @@ diff -urNad otags-3.09.3~/mk_conf otags-3.09.3/mk_conf
echo "let quotations = ref false"
echo "let mli_tags = ref true"
-diff -urNad otags-3.09.3~/pr.ml otags-3.09.3/pr.ml
---- otags-3.09.3~/pr.ml 2007-03-15 18:40:43.000000000 -0400
-+++ otags-3.09.3/pr.ml 2007-09-11 16:32:04.927885471 -0400
+diff --git a/pr.ml b/pr.ml
+index 4604c27..bb6ffd8 100644
+--- a/pr.ml
++++ b/pr.ml
@@ -4,8 +4,8 @@
(* $Id: pr.ml,v 1.16 2007-03-15 22:40:43 tews Exp $ *)
@@ -113,7 +126,7 @@ diff -urNad otags-3.09.3~/pr.ml otags-3.09.3/pr.ml
module type Tags_param = sig
val add : string -> int * int -> unit
-@@ -20,7 +20,8 @@
+@@ -20,7 +20,8 @@ module Tags = functor (T : Tags_param) -> struct
*)
(* TODO: remove this crap *)
@@ -123,7 +136,7 @@ diff -urNad otags-3.09.3~/pr.ml otags-3.09.3/pr.ml
let rec pe_patt ast =
let loc = kludge (MLast.loc_of_patt ast) in
-@@ -125,7 +126,13 @@
+@@ -125,7 +126,13 @@ let rec pe_str_item ast =
| <:str_item< module type $i$ = $mt$ >>
-> T.add i loc; pe_module_type_expr mt
| <:str_item< type $list:ssltl$ >> ->
@@ -138,7 +151,7 @@ diff -urNad otags-3.09.3~/pr.ml otags-3.09.3/pr.ml
| <:str_item< value $opt:rf$ $list:pel$ >> -> List.iter (fun (p, _) -> pe_patt p) pel
| <:str_item< class $list:cd$ >> ->
List.iter (etag_class_info) cd
-@@ -179,7 +186,13 @@
+@@ -179,7 +186,13 @@ and pe_sig_item ast =
-> T.add i loc; pe_module_type_expr mt
| <:sig_item< open $sl$ >> -> ()
| <:sig_item< type $list:ssltl$ >> ->
@@ -153,9 +166,10 @@ diff -urNad otags-3.09.3~/pr.ml otags-3.09.3/pr.ml
| <:sig_item< value $s$ : $t$ >> -> T.add s loc
| <:sig_item< class $list:cd$ >> -> List.iter (etag_class_type_info) cd
| <:sig_item< class type $list:cd$ >> -> List.iter etag_class_type_info cd
-diff -urNad otags-3.09.3~/splay.ml otags-3.09.3/splay.ml
---- otags-3.09.3~/splay.ml 2007-03-15 18:40:43.000000000 -0400
-+++ otags-3.09.3/splay.ml 2007-09-11 16:20:26.589277675 -0400
+diff --git a/splay.ml b/splay.ml
+index 9253fd9..df3210d 100644
+--- a/splay.ml
++++ b/splay.ml
@@ -4,8 +4,8 @@
(* $Id: splay.ml,v 1.3 2007-03-15 22:40:43 tews Exp $ *)
@@ -167,3 +181,4 @@ diff -urNad otags-3.09.3~/splay.ml otags-3.09.3/splay.ml
(* dcell mutable, parcours fermeture éclair *)
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9edad53..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-
-10_Makefile
-20_camlp5
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..78a2e51
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Change-install-directory.patch
+0002-Use-camlp5-instead-of-camlp4.patch
diff --git a/debian/rules b/debian/rules
index 823a95c..43bf9f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,8 @@
PACKAGE=otags
include /usr/share/ocaml/ocamlvars.mk
include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/dpatch/dpatch.make
-configure-stamp: patch-stamp configure
+configure-stamp: configure
dh_testdir
./configure --prefix /usr --libdir $(OCAML_STDLIB_DIR)/otags/ --bytecode
touch configure-stamp
@@ -26,11 +25,11 @@ build-stamp: ocamlinit configure-stamp
touch build-stamp
-clean: patch clean1 unpatch ocamlinit-clean
+clean: clean1 ocamlinit-clean
clean1:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp patch-stamp
+ rm -f build-stamp configure-stamp
-$(MAKE) clean
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)
--
otags packaging
More information about the Pkg-ocaml-maint-commits
mailing list