[Pkg-ocaml-maint-commits] [SCM] camlbz2 packaging branch, master, updated. debian/0.6.0-6-5-gd6ea1a6

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 3d31c430dee91b3074446db788ee4dcc29a49288
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Nov 2 11:11:59 2010 +0100

    Switch to dom-{save,apply}-patches scheme

diff --git a/debian/patches/fixes/make.diff b/debian/patches/0001-Various-build-process-fixes-to-for-Debian-packaging.patch
similarity index 89%
rename from debian/patches/fixes/make.diff
rename to debian/patches/0001-Various-build-process-fixes-to-for-Debian-packaging.patch
index aae5e09..1cec572 100644
--- a/debian/patches/fixes/make.diff
+++ b/debian/patches/0001-Various-build-process-fixes-to-for-Debian-packaging.patch
@@ -1,13 +1,12 @@
 From: Stefano Zacchiroli <zack at upsilon.cc>
-Subject: [PATCH] fixes/debian-build
-
-Various build-process fixes to for Debian packaging
+Date: Tue, 2 Nov 2010 11:09:13 +0100
+Subject: [PATCH] Various build-process fixes to for Debian packaging
 
 - proper distclean vs maintainer-clean target distinction
 - install without failing when ocamlopt is not available
 
 Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
-
+Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
  Makefile.in |   13 ++++++++-----
  1 files changed, 8 insertions(+), 5 deletions(-)
@@ -52,4 +51,3 @@ index 4df223d..125f476 100644
  ifdef OCAMLDOC
  doc : doc/index.html
 -- 
-tg: (b462450..) fixes/make (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index f668ba3..2dcccb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fixes/make.diff -p1
+0001-Various-build-process-fixes-to-for-Debian-packaging.patch

-- 
camlbz2 packaging