[Pkg-ocaml-maint-commits] [SCM] cduce packaging branch, master, updated. debian/0.5.3-2-4-g4819981

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9686348ce7343ead2bf0d63b20c5914530595526
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 19 18:26:18 2010 -0700

    Switch source package format to 3.0 (quilt)

diff --git a/debian/control b/debian/control
index 3cfab71..7e4855a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Pietro Abate <pietro.abate at pps.jussieu.fr>, Stefano Zacchiroli <zack at debian.org>
 Build-Depends: debhelper (>= 7),
  dh-ocaml,
- quilt,
  ocaml-nox (>= 3.11.0),
  camlp4-extra,
  ocaml-source (>= 3.11.0),
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..6c7ed3b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,3 @@
 [DEFAULT]
 pristine-tar = True
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
diff --git a/debian/rules b/debian/rules
index 0aecd80..ded3ce0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 PACKAGE = cduce
 
 include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/quilt/quilt.make
 MAKE_OPTS := "NATIVE=$(if $(OCAML_OPT_ARCH),true,false)"
 
 LIBDIR=$(CURDIR)/debian/cduce/$(OCAML_STDLIB_DIR)
@@ -18,7 +17,7 @@ CONFIGURE_OPTS := --prefix=/usr \
   --without-pxp
 
 configure: configure-stamp
-configure-stamp: ocamlinit-stamp patch
+configure-stamp: ocamlinit-stamp
 	dh_testdir
 	tar -C debian -xjf /usr/src/ocaml-source-$(OCAML_ABI).tar.bz2
 	./configure  $(CONFIGURE_OPTS)
@@ -29,7 +28,7 @@ build-stamp: configure-stamp
 	$(MAKE) $(MAKE_OPTS) all doc
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 
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)

-- 
cduce packaging