- clean generated files upon "clean"

- added OCAML_DLL_DIR/@OCamlDllDir@ variable
- bumped copyright years

diff --git a/debian/cdbs/ocaml-vars.mk b/debian/cdbs/ocaml-vars.mk
index 312f924e2a073cac3da928de53e7301bda82d328..5c1fb9cdf0e370cecd60f8662c8574e7ca1979fb 100644 (file)
--- a/debian/cdbs/ocaml-vars.mk
+++ b/debian/cdbs/ocaml-vars.mk
@@ -1,7 +1,7 @@
 #
 # Description: Useful CDBS variables for OCaml related packages
 #
-# Copyright © 2006 Stefano Zacchiroli <zack@debian.org>
+# Copyright © 2006-2007 Stefano Zacchiroli <zack@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -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 3352 2006-11-18 17:52:10Z zack $
+# $Id: ocaml-vars.mk 3440 2007-01-02 18:38:11Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -35,6 +35,11 @@ OCAML_ABI := $(shell /usr/bin/ocamlc -version)
 # $(OCAML_IN_FILES) below), may be useful to debian/rules writers as well
 OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
 
+# OCaml stublibs (i.e. DLLs) location.
+# Used internally by ocaml.mk (substituted for @OCamlDllDir@) in
+# $(OCAML_IN_FILES) below), may be useful to debian/rules writers as well
+OCAML_DLL_DIR := $(OCAML_STDLIB_DIR)/stublibs
+
 # list of .in files contained (non-recursively) in debian/ that requires
 # pre-build filling.
 # Used internally by ocaml.mk.

diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index 5aace585cb192263e93829cf9701df1de1edf79c..9ef5be02afdddc29f901ecccce5f46ad7fc56511 100644 (file)
--- a/debian/cdbs/ocaml.mk
+++ b/debian/cdbs/ocaml.mk
@@ -1,7 +1,7 @@
 #
 # Description: CDBS class for OCaml related packages
 #
-# Copyright © 2006 Stefano Zacchiroli <zack@debian.org>
+# Copyright © 2006-2007 Stefano Zacchiroli <zack@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -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 3288 2006-10-28 13:40:52Z zack $
+# $Id: ocaml.mk 3440 2007-01-02 18:38:11Z zack $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -49,11 +49,12 @@ ocamlinit-stamp:
                sed \
                        -e 's,@OCamlABI@,$(OCAML_ABI),g' \
                        -e 's,@OCamlStdlibDir@,$(OCAML_STDLIB_DIR),g' \
+                       -e 's,@OCamlDllDir@,$(OCAML_DLL_DIR),g' \
                        $$f.in > $$f ; \
        done
        touch $@
 clean::
-       rm -f ocamlinit-stamp
+       rm -f ocamlinit-stamp $(OCAML_IN_FILES)
 
 # update debian/control substituting @OCamlNativeArchs@
 # XXX ASSUMPTION: debian/control has already been generated, i.e. this rule is

diff --git a/debian/changelog b/debian/changelog
index 517572d2c2b0ea27b41d69579a216078ddeaa5d4..1bc1ed85d91c31d1484ca23691428aac703d6181 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,15 @@ ocaml (3.09.3-2) UNRELEASED; urgency=low
   [ Samuel Mimram ]
   * Ship dh_ocaml into ocaml-nox
 
- -- Stefano Zacchiroli <zack@debian.org>  Tue, 26 Sep 2006 15:05:02 +0200
+  [ Stefano Zacchiroli ]
+  * CDBS class
+    - added support for the OCAML_DLL_DIR variable, pointing ATM to the
+      stublibs/ subdirectory of the standard library directory. It's
+      substituted for @OCamlDllDir@ in .in files
+    - remove files which have been generated from their .in counterparts upon
+      clean target invocation
+
+ -- Stefano Zacchiroli <zack@debian.org>  Tue,  2 Jan 2007 19:35:02 +0100
 
 ocaml (3.09.3-1) experimental; urgency=low