[Pkg-ocaml-maint-commits] r3889 - in /trunk/packages/ocaml/trunk/debian: cdbs/ocaml-vars.mk cdbs/ocaml.mk changelog

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Jul  4 10:48:53 2007
New Revision: 3889

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3889
Log:
* 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

Modified:
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
    trunk/packages/ocaml/trunk/debian/changelog

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk?rev=3889&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk Wed Jul  4 10:48:53 2007
@@ -44,7 +44,7 @@
 # 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.

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk?rev=3889&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Wed Jul  4 10:48:53 2007
@@ -56,6 +56,9 @@
 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

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=3889&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Wed Jul  4 10:48:53 2007
@@ -1,15 +1,12 @@
-ocaml (3.10.0-5) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Stefano Zacchiroli <zack at 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 at debian.org>  Wed, 04 Jul 2007 11:50:43 +0200