summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2010-06-01 13:41:15 +0200
committerGravatar Stephane Glondu <steph@glondu.net>2010-07-01 17:28:13 +0200
commit7c9acaaecd06f9350b94b04b74106cd0a5f5de55 (patch)
tree331baf3a6d424f5289086b550e5e86dd27fab398
parent83ff9e0c693ccc0a8123e8f7a0f45f6831a4b3c7 (diff)
Switch source package format to 3.0 (quilt)
-rw-r--r--debian/README.source8
-rw-r--r--debian/control1
-rw-r--r--debian/gbp.conf1
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/source/format1
5 files changed, 6 insertions, 7 deletions
diff --git a/debian/README.source b/debian/README.source
index b1b16335..ab1f26cd 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@debian.org>, Sat, 29 Aug 2009 16:49:52 +0200
+ -- Stéphane Glondu <glondu@debian.org>, Mon, 31 May 2010 15:30:50 +0200
diff --git a/debian/control b/debian/control
index 2a9fb0da..1c1d7e12 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 cec628c7..6c7ed3be 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 4f907015..997f99fe 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 00000000..163aaf8d
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)