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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 20eb1ec39d1e528dd4e8a92b605be73fe0d2a47b
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Mar 3 21:44:26 2009 +0100

    Use TopGit (and quilt) for patches to upstream

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..a1b955a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,14 @@
+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.
+
+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 branch layout is those described in the aforementioned document.
+
+ -- Stephane Glondu <steph at glondu.net>  Tue, 03 Mar 2009 21:43:33 +0100
diff --git a/debian/control b/debian/control
index fe55c56..2b9331f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
 Build-Depends:
  debhelper (>= 5),
+ quilt,
  ocaml-nox,
  ocaml-findlib,
  libextlib-ocaml-dev,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..977aca8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,3 @@
 [DEFAULT]
+debian-branch = build
 pristine-tar = True
diff --git a/debian/rules b/debian/rules
index 4c58914..8bd9c44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+-include /usr/share/topgit/tg2quilt.mk
+
 OCAMLABI := $(shell ocamlc -version)
 BYTECODE := $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
 OCAMLRUN := $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
@@ -26,7 +29,7 @@ debian/csvtool.1: debian/csvtool.dbk
 	$(XP) -o $@ $(DB2MAN) $<
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 	touch configure-stamp
 
@@ -37,7 +40,7 @@ build-stamp: configure-stamp
 	$(MAKE) OCAMLCINCS="-package extlib" OCAMLCLIBS="-linkpkg" OCAMLOPTLIBS="-linkpkg" byte $(OPTTARGET) doc
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

-- 
ocaml-csv packaging