[Pkg-ocaml-maint-commits] [SCM] omake packaging branch, master, updated. debian/0.9.8.5-3-7-7-g2ce5369

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 10ea9fe679b498754cc9b4241e8291f90271c506
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon May 3 22:08:07 2010 +0200

    Switch source package format to 3.0 (quilt)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index a40757c..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,11 +0,0 @@
-omake for Debian
-----------------
-
-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.
-
- -- Stephane Glondu <Stephane Glondu <steph at glondu.net>>, Sat, 11 Apr 2009 16:02:13 +0200
diff --git a/debian/control b/debian/control
index aabcb16..cb08522 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends:
  libfam-dev,
  libreadline-dev,
  libncurses5-dev,
- quilt,
  dh-ocaml
 Standards-Version: 3.8.3
 Homepage: http://omake.metaprl.org/
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..6c7ed3b 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 9460f16..f217491 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,9 @@
 #export DH_VERBOSE=1
 
 PACKAGE=omake
-include /usr/share/quilt/quilt.make
 include /usr/share/ocaml/ocamlvars.mk
 
-build: patch
+build:
 	dh $@
 
 override_dh_auto_build:
@@ -17,10 +16,8 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 ifneq ($(wildcard omake-boot),)
-	debian/rules patch
 	-./omake-boot clean
 endif
-	debian/rules unpatch
 
 override_dh_auto_install:
 	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp/ install
@@ -48,10 +45,4 @@ endif
   override_dh_auto_install \
   override_dh_installdocs \
   override_dh_compress \
-  override_dh_strip \
-  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
+  override_dh_strip
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)

-- 
omake packaging