[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.pl1+dfsg-6-12-g7a99898

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 7c9acaaecd06f9350b94b04b74106cd0a5f5de55
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 1 13:41:15 2010 +0200

    Switch source package format to 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
index b1b1633..ab1f26c 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,11 +25,9 @@ version (the script will do it for you).
 Patch system
 ------------
 
-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.
+This source package is in format 3.0 (quilt).
 
-The quilt series is generated from the Git repository, using
+The quilt series, if any, 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).
@@ -55,4 +53,4 @@ to ../coq.cache, and debian/rules will detect its presence and rsync
 from there instead of really compiling Coq...
 
 
- -- Stéphane Glondu <glondu at debian.org>, Sat, 29 Aug 2009 16:49:52 +0200
+ -- Stéphane Glondu <glondu at debian.org>, Mon, 31 May 2010 15:30:50 +0200
diff --git a/debian/control b/debian/control
index 2a9fb0d..1c1d7e1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Uploaders:
 Standards-Version: 3.8.4
 Build-Depends:
  debhelper (>= 7),
- quilt (>= 0.46-7~),
  dh-ocaml (>= 0.9~),
  ocaml-nox (>= 3.11.1-3~),
  ocaml-best-compilers,
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 4f90701..997f99f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ export OCAMLINIT_SED += \
   -e 's%@CoqVersion@%$(COQ_VERSION)%' \
   -e 's%@CoqABI@%$(COQ_ABI)%'
 
-DH := dh --with quilt,ocaml
+DH := dh --with ocaml
 
 configure: configure-stamp
 configure-stamp:
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)

-- 
coq packaging