[Pkg-ocaml-maint-commits] r2167 - trunk/packages/ocaml-expat/trunk/debian

[Enrico Tassi]

Author: gares-guest
Date: 2005-11-27 14:52:40 +0000 (Sun, 27 Nov 2005)
New Revision: 2167

Added:
   trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs.in
Removed:
   trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs
   trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install
   trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs
   trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install
Modified:
   trunk/packages/ocaml-expat/trunk/debian/rules
Log:
no more useless files


Deleted: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs	2005-11-27 14:44:15 UTC (rev 2166)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.dirs	2005-11-27 14:52:40 UTC (rev 2167)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/expat/

Deleted: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install	2005-11-27 14:44:15 UTC (rev 2166)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml-dev.install	2005-11-27 14:52:40 UTC (rev 2167)
@@ -1,4 +0,0 @@
-debian/tmp/usr/lib/ocaml/3.09.0/expat/META
-debian/tmp/usr/lib/ocaml/3.09.0/expat/lib*.a
-debian/tmp/usr/lib/ocaml/3.09.0/expat/*.cm*
-debian/tmp/usr/lib/ocaml/3.09.0/expat/*.ml*

Deleted: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs	2005-11-27 14:44:15 UTC (rev 2166)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs	2005-11-27 14:52:40 UTC (rev 2167)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/stublibs

Copied: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs.in (from rev 2159, trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs)
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs	2005-11-27 11:53:15 UTC (rev 2159)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.dirs.in	2005-11-27 14:52:40 UTC (rev 2167)
@@ -0,0 +1 @@
+/usr/lib/ocaml/@OCamlABI@/stublibs

Deleted: trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install	2005-11-27 14:44:15 UTC (rev 2166)
+++ trunk/packages/ocaml-expat/trunk/debian/libexpat-ocaml.install	2005-11-27 14:52:40 UTC (rev 2167)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/ocaml/3.09.0/expat/dll*.so usr/lib/ocaml/3.09.0/stublibs/
-

Modified: trunk/packages/ocaml-expat/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-expat/trunk/debian/rules	2005-11-27 14:44:15 UTC (rev 2166)
+++ trunk/packages/ocaml-expat/trunk/debian/rules	2005-11-27 14:52:40 UTC (rev 2167)
@@ -14,10 +14,19 @@
 DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
 
+# expand @OCamlABI@ insinde *.in (all but control.in)
 ocamlinit:
 	for f in $(OFILES); do \
-		sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; \
+		if test $$f != debian/control; then \
+			sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; \
+		fi \
 	done
+
+# use this when a new to move to a new ocaml release the control file
+bump-abi:
+	sed -e 's/@OCamlABI@/$(OCAMLABI)/g' debian/control.in > debian/control
+
+update-config:: ocamlinit
 	
 build/$(PKGNAME)::
 	mkdir -p $(DESTDIR)