[Pkg-ocaml-maint-commits] [SCM] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8954ddf8efd48a057f4337d7936491af639678ff
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 29 19:06:05 2011 +0200

    Complete switch to 3.0 (quilt)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 62605d2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package use dpatch for patching the source. 
-
-Please consider reading dpatch manpage to patch the source.
-
- -- Sylvain Le Gall <gildor at debian.org>  Sun, 22 Jun 2008 23:26:52 +0200
diff --git a/debian/control b/debian/control
index 5a4b449..1291614 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>
 Build-Depends: cdbs (>= 0.4.23-1.1),
  debhelper (>= 7),
- dpatch,
  ocaml-nox (>= 3.11.1),
  po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc,
  ocaml-findlib (>= 1.2.4-2),
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..4f24002 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,3 @@
 [DEFAULT]
 pristine-tar = True
+compression = bzip2
diff --git a/debian/rules b/debian/rules
index abc7987..365abc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@
 
 include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include $(CURDIR)/debian/mk/docbook-manpage.mk
 
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)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
camomile packaging