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

Tue Mar 3 23:14:04 UTC 2009

The following commit has been merged in the master branch:
commit 6f90fc33263d9b91b2da5ce90d7ea6a4c46f1107
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Mar 3 07:22:10 2009 +0100

    Remove patches and dpatch dependency

diff --git a/debian/control b/debian/control
index 6eafbcb..fe55c56 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,13 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), dpatch, ocaml-nox, ocaml-findlib, libextlib-ocaml-dev, xsltproc, docbook-xsl
+Build-Depends:
+ debhelper (>= 5),
+ ocaml-nox,
+ ocaml-findlib,
+ libextlib-ocaml-dev,
+ xsltproc,
+ docbook-xsl
 Standards-Version: 3.7.3
 Section: libs
 Homepage: http://merjis.com/developers/csv
@@ -13,7 +19,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-csv.git
 Package: libcsv-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libextlib-ocaml-dev
+Depends:
+ ocaml-nox-${F:OCamlABI},
+ libextlib-ocaml-dev
 Recommends: ocaml-findlib
 Suggests: csvtool
 Description: A library to read and write CSV files in OCaml
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1024b70..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_Makefile_extlib
-02_META
diff --git a/debian/patches/01_Makefile_extlib.dpatch b/debian/patches/01_Makefile_extlib.dpatch
deleted file mode 100755
index ed52795..0000000
--- a/debian/patches/01_Makefile_extlib.dpatch
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile_extlib.dpatch by Stephane Glondu <steph at glondu.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Extlib, add opt, byte and install targets to Makefile
-
- at DPATCH@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2006-12-05 23:23:03.000000000 +0100
-+++ trunk/Makefile	2008-02-07 00:39:04.000000000 +0100
-@@ -5,6 +5,9 @@
- # To enable support for Extlib, also uncomment 'open ExtList' at the top
- # of file csv.ml.
- 
-+PREFIX		:= /usr/local
-+NATIVELIBS	:= $(if $(wildcard *.cmxa),csv.cmxa csv.a csv.cmx)
-+OCAMLLIBDIR	:= $(shell ocamlc -where)
- OCAMLCINCS	:=
- #OCAMLCINCS	:= -package extlib
- OCAMLCFLAGS	:= -g
-@@ -21,7 +24,10 @@
- 
- 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 $@ $^
-@@ -29,6 +35,9 @@
- csv.cmxa: $(XOBJS)
- 	ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) -a -o $@ $^
- 
-+META: Makefile.config META.in
-+	sed 's/_VERSION_/$(VERSION)/' META.in > META
-+
- example: csv.cma example.ml
- 	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) $^ -o $@
- 
-@@ -36,9 +45,12 @@
- 	ocamlfind ocamlc $^ -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:
-@@ -53,7 +65,8 @@
- # Clean.
- 
- clean:
--	rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *~ core csvtool example
-+	-rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *~ core csvtool.byte csvtool.opt example META
-+	-rm -Rf html
- 
- # Dependencies.
- 
-@@ -90,11 +103,21 @@
- 	rm -f .orig-manifest .check-manifest; \
- 	exit $$rv
- 
-+install:
-+	install -m 0755 -o root -g root -d $(DESTDIR)$(OCAMLLIBDIR)
-+	ocamlfind install csv -destdir $(DESTDIR)$(OCAMLLIBDIR) META csv.mli csv.cma csv.cmi $(NATIVELIBS)
-+	install -m 0755 -o root -g root -d $(DESTDIR)$(PREFIX)/bin
-+	if [ -f csvtool.opt ]; then \
-+	  install -m 0755 -o root -g root csvtool.opt $(DESTDIR)$(PREFIX)/bin/csvtool; \
-+	else \
-+	  install -m 0755 -o root -g root csvtool.byte $(DESTDIR)$(PREFIX)/bin/csvtool; \
-+	fi
-+
- # Developer documentation (in html/ subdirectory).
- 
- doc:
- 	rm -rf html
- 	mkdir html
--	-ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html csv.ml{i,}
-+	-ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html csv.mli csv.ml
- 
--.PHONY: depend dist check-manifest doc
-+.PHONY: depend dist check-manifest doc all opt byte install
-diff -urNad trunk~/csv.ml trunk/csv.ml
---- trunk~/csv.ml	2006-12-05 23:23:03.000000000 +0100
-+++ trunk/csv.ml	2008-02-07 00:19:31.000000000 +0100
-@@ -45,7 +45,7 @@
- (* 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/02_META.dpatch b/debian/patches/02_META.dpatch
deleted file mode 100755
index 0a4f447..0000000
--- a/debian/patches/02_META.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_META.dpatch by Stephane Glondu <steph at glondu.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: META file for ocaml-csv
-
- at DPATCH@
---- ocaml-csv-1.1.6-orig/META.in	1970-01-01 01:00:00.000000000 +0100
-+++ ocaml-csv-1.1.6/META.in	2008-01-14 17:17:07.000000000 +0100
-@@ -0,0 +1,6 @@
-+name="csv"
-+version="_VERSION_"
-+description="This library can read and write CSV files"
-+requires="unix,extlib"
-+archive(byte)="csv.cma"
-+archive(native)="csv.cmxa"
diff --git a/debian/rules b/debian/rules
index fbf0338..4c58914 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 OCAMLABI := $(shell ocamlc -version)
 BYTECODE := $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
 OCAMLRUN := $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
@@ -33,13 +31,13 @@ configure-stamp:
 	touch configure-stamp
 
 
-build: patch ocamlinit debian/csvtool.1 build-stamp
+build: ocamlinit debian/csvtool.1 build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE) OCAMLCINCS="-package extlib" OCAMLCLIBS="-linkpkg" OCAMLOPTLIBS="-linkpkg" byte $(OPTTARGET) doc
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

-- 
ocaml-csv packaging

