[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.09.3-4-12-g5b8e80c

Wed Nov 17 18:37:53 UTC 2010

The following commit has been merged in the master branch:
commit e648a39a767127922d696df5e8c0cb301eb91e7d
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Nov 17 19:14:25 2010 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 57171d4..26e3ccf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-otags (3.09.3-5~1) UNRELEASED; urgency=low
+otags (3.09.3.3-1~1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release
 
- -- StÃ©phane Glondu <glondu at debian.org>  Tue, 16 Nov 2010 23:20:17 +0100
+ -- StÃ©phane Glondu <glondu at debian.org>  Wed, 17 Nov 2010 19:32:08 +0100
 
 otags (3.09.3-4) unstable; urgency=low
 
diff --git a/debian/patches/0001-Change-install-directory.patch b/debian/patches/0001-Change-install-directory.patch
index 679ffd7..a79fdae 100644
--- a/debian/patches/0001-Change-install-directory.patch
+++ b/debian/patches/0001-Change-install-directory.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Change install directory
  1 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 33c5898..6bf9e94 100644
+index ad459b9..14c8937 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -122,11 +122,11 @@ clean::
diff --git a/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch b/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
index 8e90c1e..91e0d10 100644
--- a/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
+++ b/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch
@@ -3,17 +3,16 @@ Date: Tue, 11 Sep 2007 20:53:28 +0000
 Subject: [PATCH] Use camlp5 instead of camlp4
 
 ---
- Makefile          |    8 ++++----
- Makefile.here.tpl |    4 +++-
- configure         |    2 +-
- editor.ml         |    2 +-
- mk_conf           |    2 +-
- pr.ml             |   23 ++++++++++++++++++-----
- splay.ml          |    4 ++--
- 7 files changed, 30 insertions(+), 15 deletions(-)
+ Makefile  |    8 ++++----
+ configure |    2 +-
+ editor.ml |    2 +-
+ mk_conf   |    2 +-
+ pr.ml     |   23 ++++++++++++++++++-----
+ splay.ml  |    4 ++--
+ 6 files changed, 27 insertions(+), 14 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 6bf9e94..7a8b949 100644
+index 14c8937..bbc84a1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -70,23 +70,23 @@ otags.byte: conf.cmo otags.cmo
@@ -44,27 +43,8 @@ index 6bf9e94..7a8b949 100644
  		pa_o.cmx pa_op.cmx $+ \
  		odyl.cmx
  
-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 @@ INSTALLLIBDIR=tpllib
- CAMLC=tplocamlc
- CAMLOPT=tplocamlopt
- CAMLAR=tplocamlc -a
--CAMLP4=camlp4o
-+CAMLP4=camlp5o
- CAMLP4DIR=${shell ${CAMLP4} -where}
- CAMLLEX=ocamllex
- CAMLDEP=ocamldep
 diff --git a/configure b/configure
-index 4c32abb..5ffe2d5 100755
+index a356688..1c4fadf 100755
 --- a/configure
 +++ b/configure
 @@ -11,7 +11,7 @@ cmdline="$0 $*"
@@ -77,20 +57,20 @@ index 4c32abb..5ffe2d5 100755
  libdir_spec=no
  #splaydir=$root/lib/ocaml
 diff --git a/editor.ml b/editor.ml
-index 2359683..2c20069 100644
+index ca91618..7df49c2 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      *)
  
--(* ocamlc options: !-I `camlp4 -where`!*)
-+(* ocamlc options: !-I `camlp5 -where`!*)
+-(* ocamlc options: !-I `camlp4o -where`!*)
++(* ocamlc options: !-I `camlp5o -where`!*)
  
- (* $Id: editor.ml,v 1.3 2007-03-15 22:40:43 tews Exp $ *)
+ (* $Id: editor.ml,v 1.4 2007-04-06 20:58:17 tews Exp $ *)
  
 diff --git a/mk_conf b/mk_conf
-index f85dcf0..cd6d2ae 100755
+index 062701f..380c09a 100755
 --- a/mk_conf
 +++ b/mk_conf
 @@ -23,7 +23,7 @@ echo "let recursive = ref false"
@@ -103,16 +83,16 @@ index f85dcf0..cd6d2ae 100755
  echo "let mli_tags = ref true"
  
 diff --git a/pr.ml b/pr.ml
-index 4604c27..bb6ffd8 100644
+index 9f3b678..b57173b 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 $ *)
+ (* $Id: pr.ml,v 1.17 2007-04-06 20:58:17 tews Exp $ *)
  
--(* ocamlc options: !-pp "camlp4o q_MLast.cmo" -I `camlp4 -where`!*)
+-(* ocamlc options: !-pp "camlp4o q_MLast.cmo" -I `camlp4o -where`!*)
 -(* ocamldep options: !-pp "camlp4o q_MLast.cmo"!*)
-+(* ocamlc options: !-pp "camlp5o q_MLast.cmo" -I `camlp5 -where`!*)
++(* ocamlc options: !-pp "camlp5o q_MLast.cmo" -I `camlp5o -where`!*)
 +(* ocamldep options: !-pp "camlp5o q_MLast.cmo"!*)
  
  module type Tags_param = sig
diff --git a/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch b/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch
index 54c1745..e3650bc 100644
--- a/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch
+++ b/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Do not set an upper bound on supported OCaml versions
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 5ffe2d5..0c87ae3 100755
+index 1c4fadf..4cd2a11 100755
 --- a/configure
 +++ b/configure
-@@ -72,7 +72,7 @@ fi
+@@ -77,7 +77,7 @@ fi
  
  # check ocamlc version
  if [ $versioncheck = 1 ] ; then

-- 
otags packaging

