[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.19-1-5-g5a77704

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1a382ffefc9e370dece1d3d89163556832cfc891
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Dec 1 09:34:49 2009 +0100

    Switch to 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
index 853e34d..283fc09 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,13 +4,9 @@ Cameleon Debian source package
 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.5) package. Please
 refer to the appendix about Git in the Debian OCaml Packaging Policy
 (from the same package).
 
- -- Stéphane Glondu <glondu at debian.org>, Tue,  8 Sep 2009 21:41:36 +0200
+ -- Stéphane Glondu <glondu at debian.org>, Tue,  1 Dec 2009 09:34:34 +0100
diff --git a/debian/control b/debian/control
index c7cfd32..93cf2c6 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders:
  Samuel Mimram <smimram at debian.org>,
  Stefano Zacchiroli <zack at debian.org>
 Build-Depends: cdbs (>= 0.4.23-1.1),
- quilt,
  patchutils (>= 0.2.25),
  cdbs (>= 0.4.27),
  ocaml-nox (>= 3.11.1-3~),
diff --git a/debian/rules b/debian/rules
index fa1f5ac..bde69cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -103,8 +102,3 @@ install/cameleon::
 	mv '$(MAKE_MY_CHAMO)' '$(MAKE_MY_CHAMO).tmp'
 	(echo '#!/bin/sh'; cat '$(MAKE_MY_CHAMO).tmp') > '$(MAKE_MY_CHAMO)'
 	$(RM) '$(MAKE_MY_CHAMO).tmp'
-
-redo-patches::
-	rm -f debian/patches/*
-	git format-patch -N -o debian/patches master...patch-queue | \
-	  sed -e 's%debian/patches/%%' > debian/patches/series
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)

-- 
cameleon packaging