[Pkg-ocaml-maint-commits] [SCM] ocaml-csv packaging branch, master, updated. debian/1.1.6-3-20-g0241cfa

Tue Nov 3 16:24:57 UTC 2009

The following commit has been merged in the master branch:
commit 30b2c4bb235ea3025d60f9b9ad892d8691f6d7bd
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Nov 3 16:49:40 2009 +0100

    Switch to 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
index a1b955a..62dff5b 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,14 +1,12 @@
 Building ocaml-csv for Debian
 -----------------------------
 
-This source package uses quilt to apply and remove its patches. Please
-refer to `/usr/share/doc/quilt/README.source' for information about
-how to use quilt for source packages.
+Patching upstream sources
+-------------------------
 
-The quilt series is generated from the Git repository, using TopGit
-(from the `topgit' Debian package). This process is documented in
-`/usr/share/doc/topgit/HOWTO-tg2quilt.gz'.
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (>= 0.5) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
 
-The branch layout is those described in the aforementioned document.
-
- -- Stephane Glondu <steph at glondu.net>  Tue, 03 Mar 2009 21:43:33 +0100
+ -- Stéphane Glondu <glondu at debian.org>, Tue,  3 Nov 2009 16:56:00 +0100
diff --git a/debian/control b/debian/control
index b1e6667..984294d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  debhelper (>= 7),
  dh-ocaml,
- quilt,
  ocaml-nox,
  ocaml-findlib,
  libextlib-ocaml-dev,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 977aca8..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,2 @@
 [DEFAULT]
-debian-branch = build
 pristine-tar = True
diff --git a/debian/patches/0001-Use-extlib.patch b/debian/patches/0001-Use-extlib.patch
new file mode 100644
index 0000000..95a7f1d
--- /dev/null
+++ b/debian/patches/0001-Use-extlib.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..8790933
--- /dev/null
+++ b/debian/patches/0002-Various-improvements-in-the-Makefile.patch
@@ -0,0 +1,65 @@
+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
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..60b1cee
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Use-extlib.patch
+0002-Various-improvements-in-the-Makefile.patch
diff --git a/debian/rules b/debian/rules
index 31b8319..8409e03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,6 @@
 #export DH_VERBOSE=1
 
 include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/quilt/quilt.make
--include /usr/share/topgit/tg2quilt.mk
 
 export OCAMLFIND_DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
 
@@ -25,7 +23,7 @@ debian/csvtool.1: debian/csvtool.dbk
 	$(XP) -o $@ $(DB2MAN) $<
 
 build: debian/csvtool.1 build-stamp
-build-stamp: ocamlinit patch
+build-stamp: ocamlinit
 	dh build --before dh_auto_build
 	$(MAKE) depend
 	$(MAKE) OCAMLCINCS="-package extlib" OCAMLCLIBS="-linkpkg" OCAMLOPTLIBS="-linkpkg" byte $(OPTTARGET) doc
@@ -33,7 +31,7 @@ build-stamp: ocamlinit patch
 	dh build --after dh_auto_test
 	touch $@
 
-clean: unpatch ocamlinit-clean
+clean: ocamlinit-clean
 	dh $@
 	rm -Rf html
 	cp debian/upstream.depend .depend
@@ -56,4 +54,4 @@ binary-arch: install-stamp
 	dh $@
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit patch unpatch links
+.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit
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)

-- 
ocaml-csv packaging

