Switch source package format to 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
index 45ded35e85c2f304b464368abb46ba0b0f59e769..f0dd16179b2cf168595c43abf5d5ae3fd5821447 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -14,9 +14,8 @@ look at the comments in gen_modules.pl to understand the format of
 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. Have a look at
-the `redo-patches' target of debian/rules for more details.
+dom-apply-patches(1) and dom-save-patches(1) from dh-ocaml package for
+more details.
+
+ -- Stéphane Glondu <glondu@debian.org>, Sun, 18 Apr 2010 15:20:53 +0200

diff --git a/debian/control b/debian/control
index de3e97f89167e045abe5f3e97c29707e570bc934..034c2eed2643cc1e96b586f9b593bcf746f04613 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends:
  tk8.5-dev,
  libncurses5-dev,
  libgdbm-dev,
- quilt,
  bzip2,
  dh-ocaml (>= 0.9)
 Standards-Version: 3.8.4

diff --git a/debian/gbp.conf b/debian/gbp.conf
index d84e16cfa4767efd029697bea5f20a2b0ee5df1e..ef8fd01d6259f9c4242f5a61cfb10fa1b32aaf1a 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,5 @@
 [DEFAULT]
 pristine-tar = True
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
 upstream-branch = 312/upstream
 debian-branch = 312/master

diff --git a/debian/rules b/debian/rules
index 69d9b21ea97a5b596596ba83789927cd0edfc463..ef984652ec065e6c1efc86c15e2f794132e81064 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
 
 PACKAGE := ocaml
 ALL_PACKAGES := $(shell sed -ne 's/^Package: //p' debian/control)
@@ -61,7 +60,6 @@ CONFIGURE_SED := \
   -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/stublibs%g"
 
 
-$(QUILT_STAMPFN): debian/$(SRCTARBALL)
 ocamlinit-stamp: debian/$(SRCTARBALL)
 
 # Generate ocaml-native-compilers' Architecture field.
@@ -90,7 +88,7 @@ debian/$(SRCTARBALL):
          $(DISTDIR)/
        rm -f $(DISTDIR)
 
-config-stamp: pre-config-stamp $(QUILT_STAMPFN) ocamlinit-stamp
+config-stamp: pre-config-stamp ocamlinit-stamp
        dh build --before dh_auto_configure
        ./configure $(CONFIGURE_OPTS)
        sed -i $(CONFIGURE_SED) config/Makefile
@@ -102,8 +100,6 @@ config-stamp: pre-config-stamp $(QUILT_STAMPFN) ocamlinit-stamp
        fi
        touch $@
 
-$(QUILT_STAMPFN): ocamlinit-stamp
-
 build: build-stamp
 build-stamp: config-stamp
        if test ! -d boot.debian; then \
@@ -137,7 +133,7 @@ endif
        dh build --after dh_auto_test
        touch $@
 
-clean: unpatch ocamlinit-clean
+clean: ocamlinit-clean
        dh clean --before dh_auto_clean
 ifneq ($(wildcard $(CURDIR)/config/Makefile),)
        $(MAKE) clean
@@ -248,10 +244,3 @@ binary-arch: binary-stamp
 binary-indep: binary-stamp
 
 .PHONY: build clean binary-indep binary-arch binary install build ocamlinit
-
-.PHONY: redo-patches
-redo-patches:
-       rm -f debian/patches/*
-       git format-patch -N -o debian/patches upstream...patch-queue | \
-         sed -e 's%debian/patches/%%' > debian/patches/series
-       sed -i -e 1d debian/patches/*.patch

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)