* CDBS class:

  - avoid dpatch breaking upon clean if debian/patches/*.in files are in use
  - fix the usage example for "OCAML_IN_FILES += ...", it was wrong

diff --git a/debian/cdbs/ocaml-vars.mk b/debian/cdbs/ocaml-vars.mk
index 7edf5369cb14ded7f7e8c2b4b3be97d9a9e0bc84..67255b2bfa2edd398182c802555df3dac50b19f0 100644 (file)
--- a/debian/cdbs/ocaml-vars.mk
+++ b/debian/cdbs/ocaml-vars.mk
@@ -16,7 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: ocaml-vars.mk 3830 2007-06-14 19:42:34Z zack $
+# $Id: ocaml-vars.mk 3889 2007-07-04 10:48:53Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -44,7 +44,7 @@ OCAML_DLL_DIR := $(OCAML_STDLIB_DIR)/stublibs
 # pre-build filling.
 # Used internally by ocaml.mk.
 # debian/rules writers might need to add stuff to this list:
-#  e.g.: OCAML_IN_FILES += debian/patches/foo.in
+#  e.g.: OCAML_IN_FILES += debian/patches/foo  # (no .in extension)
 OCAML_IN_FILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
 
 # 'yes' if native code compilation is available on the build architecture, 'no' otherwise.

diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index 9ef5be02afdddc29f901ecccce5f46ad7fc56511..ad65fd0178ac75bf93e349352acc53187e46ad3d 100644 (file)
--- a/debian/cdbs/ocaml.mk
+++ b/debian/cdbs/ocaml.mk
@@ -16,7 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: ocaml.mk 3440 2007-01-02 18:38:11Z zack $
+# $Id: ocaml.mk 3889 2007-07-04 10:48:53Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -56,6 +56,9 @@ ocamlinit-stamp:
 clean::
        rm -f ocamlinit-stamp $(OCAML_IN_FILES)
 
+# avoid dpatch breaking upon clean if debian/patches/*.in files are in use
+deapply-dpatches: ocamlinit
+
 # update debian/control substituting @OCamlNativeArchs@
 # XXX ASSUMPTION: debian/control has already been generated, i.e. this rule is
 # executed after the debian/control:: rule in builcore.mk

diff --git a/debian/changelog b/debian/changelog
index 525c43e3f4732e36300e78f9d2d36289a320e113..e0b2b48452f30ad8c8ecc6a12ec214c8d6e19e5d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,12 @@
-ocaml (3.10.0-5) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Stefano Zacchiroli <zack@debian.org>  Wed, 04 Jul 2007 10:16:52 +0000
-
 ocaml (3.10.0-4) experimental; urgency=low
 
   * debian/patches/install_ocamlbuild.dpatch
     - patched to install ocamlbuild as .native/.byte (following upstream
       convention which will become widespread in the future), but changes
       ocamlbuild to be a symlink to the best ocamlbuild available
+  * CDBS class:
+    - avoid dpatch breaking upon clean if debian/patches/*.in files are in use
+    - fix the usage example for "OCAML_IN_FILES += ...", it was wrong
 
  -- Stefano Zacchiroli <zack@debian.org>  Wed, 04 Jul 2007 11:50:43 +0200