[Pkg-ocaml-maint-commits] [SCM] ocamlduce packaging branch, master, updated. debian/3.11.1.0-2-3-g640c418

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 482d797d38e6a0e882a2c91ca5d4bfa91f041428
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Nov 5 00:17:33 2009 +0100

    Switch to 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
index 8ad0630..a0c9533 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -10,18 +10,4 @@ binary package in Debian), and a `ocamlduce' directory, that contains
 files mostly taken from CDuce. Patches currently involve only compiler
 parts.
 
- -- Stephane Glondu <steph at glondu.net>, Wed, 17 Jun 2009 10:39:05 +0200
-
-Patching upstream sources
--------------------------
-
-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
-dom-{apply,save}-patches, from the dh-ocaml (>= 0.4.2) package. Please
-refer to the appendix about Git in the Debian OCaml Packaging Policy
-(from the same package).
-
- -- Stephane Glondu <steph at glondu.net>, Wed, 17 Jun 2009 10:38:39 +0200
+ -- Stéphane Glondu <glondu at debian.org>, Wed,  4 Nov 2009 21:38:05 +0100
diff --git a/debian/changelog b/debian/changelog
index 210bb66..fed06be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ocamlduce (3.11.1.0-3) UNRELEASED; urgency=low
 
+  * Switch to 3.0 (quilt)
   * Add Replaces/Conflicts to previous versions of ocamlduce in
     ocamlduce-base (Closes: #553177)
 
diff --git a/debian/control b/debian/control
index 82b6b3e..f8d69dc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  debhelper (>= 7.2.11~),
- quilt (>= 0.46-7~),
  dh-ocaml (>= 0.9.1~),
  autotools-dev,
  patch,
diff --git a/debian/rules b/debian/rules
index 5026708..70d743a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ MAKE_DUCE := $(MAKE) -C $(OCAML_SRCDIR) -f Makefile.ocamlduce
 ODOC_DESTDIR := debian/tmp$(OCAML_STDLIB_DIR)/ocamlduce/ocamldoc
 
 %:
-	dh --with quilt,ocaml $@
+	dh --with ocaml $@
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
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)

-- 
ocamlduce packaging