[Pkg-ocaml-maint-commits] [SCM] ocaml-csv packaging branch, master, updated. debian/1.2.0-1-9-gce3694d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0e528acc6628aa812037eb8ffcc331bf42f923d3
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 18 10:48:54 2010 +0200

    Remove unused patches and dependency to extlib (Closes: #589457)

diff --git a/debian/control b/debian/control
index 8b7f0c6..2edef9b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends:
  dh-ocaml (>= 0.9),
  ocaml-nox (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.5),
- libextlib-ocaml-dev (>= 1.5.1-5~),
  xsltproc,
  docbook-xsl
 Standards-Version: 3.8.4
diff --git a/debian/patches/0001-Use-extlib.patch b/debian/patches/0001-Use-extlib.patch
deleted file mode 100644
index 95a7f1d..0000000
--- a/debian/patches/0001-Use-extlib.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 3 Nov 2009 16:53:24 +0100
-Subject: [PATCH] Use extlib
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- META   |    1 +
- csv.ml |    2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/META b/META
-index 451a58d..cdeb1a5 100644
---- a/META
-+++ b/META
-@@ -1,4 +1,5 @@
- description = "CSV Processing Library"
- version = "1.1.7"
-+requires = "extlib"
- archive(byte) = "csv.cma"
- archive(native) = "csv.cmxa"
-diff --git a/csv.ml b/csv.ml
-index 2237ee8..46bdbe1 100644
---- a/csv.ml
-+++ b/csv.ml
-@@ -45,7 +45,7 @@ open Printf
- (* Uncomment the next line to enable Extlib's List function.  These
-  * avoid stack overflows on really huge CSV files.
-  *)
--(*open ExtList*)
-+open ExtList
- 
- type t = string list list
- 
--- 
diff --git a/debian/patches/0002-Various-improvements-in-the-Makefile.patch b/debian/patches/0002-Various-improvements-in-the-Makefile.patch
deleted file mode 100644
index 8790933..0000000
--- a/debian/patches/0002-Various-improvements-in-the-Makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 3 Nov 2009 16:53:58 +0100
-Subject: [PATCH] Various improvements in the Makefile
-
- * Remove bashisms
- * Add opt and byte targets
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- Makefile |   18 ++++++++++++------
- 1 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c40580d..4b67027 100644
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,10 @@ XOBJS		:= $(OBJS:.cmo=.cmx)
- 
- OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
- 
--all: csv.cma csv.cmxa example csvtool
-+all: byte opt example
-+
-+opt: csv.cmxa META csvtool.opt
-+byte: csv.cma META csvtool.byte
- 
- csv.cma: $(OBJS)
- 	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) -a -o $@ $^
-@@ -33,12 +36,15 @@ example: csv.cma example.ml
- 	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) $^ -o $@
- 
- test:	csv.cma test.ml
--	ocamlfind ocamlc $^ -o $@
-+	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) $^ -o $@
- 	./test
- 
--csvtool: csv.cmxa csvtool.ml
-+csvtool.opt: csv.cmxa csvtool.ml
- 	ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) $^ -o $@
- 
-+csvtool.byte: csv.cma csvtool.ml
-+	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) $^ -o $@
-+
- # Common rules for building OCaml objects.
- 
- .mli.cmi:
-@@ -70,7 +76,7 @@ endif
- # Build a distribution.
- 
- install:
--	ocamlfind install csv csv.{cmi,a,cmxa,cma,cmx} META
-+	ocamlfind install csv META csv.cmi csv.cma -optional csv.a csv.cmxa csv.cmx
- 
- dist:
- 	$(MAKE) check-manifest
-@@ -98,6 +104,6 @@ check-manifest:
- doc:
- 	rm -rf html
- 	mkdir html
--	-ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html csv.ml{i,}
-+	-ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html csv.ml csv.mli
- 
--.PHONY: depend dist check-manifest doc
-+.PHONY: depend dist check-manifest doc all opt byte install
--- 

-- 
ocaml-csv packaging