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

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Jan  2 19:38:11 2007
New Revision: 3440

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3440
Log:
- clean generated files upon "clean"
- added OCAML_DLL_DIR/@OCamlDllDir@ variable
- bumped copyright years

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=3440&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk Tue Jan  2 19:38:11 2007
@@ -1,7 +1,7 @@
 #
 # Description: Useful CDBS variables for OCaml related packages
 #
-# Copyright © 2006 Stefano Zacchiroli <zack at debian.org>
+# Copyright © 2006-2007 Stefano Zacchiroli <zack at 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
@@ -35,6 +35,11 @@
 # $(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.

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=3440&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Tue Jan  2 19:38:11 2007
@@ -1,7 +1,7 @@
 #
 # Description: CDBS class for OCaml related packages
 #
-# Copyright © 2006 Stefano Zacchiroli <zack at debian.org>
+# Copyright © 2006-2007 Stefano Zacchiroli <zack at 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
@@ -49,11 +49,12 @@
 		sed \
 			-e 's, at OCamlABI@,$(OCAML_ABI),g' \
 			-e 's, at OCamlStdlibDir@,$(OCAML_STDLIB_DIR),g' \
+			-e 's, at 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

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=3440&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Tue Jan  2 19:38:11 2007
@@ -3,7 +3,15 @@
   [ Samuel Mimram ]
   * Ship dh_ocaml into ocaml-nox
 
- -- Stefano Zacchiroli <zack at 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 at debian.org>  Tue,  2 Jan 2007 19:35:02 +0100
 
 ocaml (3.09.3-1) experimental; urgency=low