ocaml 3.09 transition

diff --git a/helm/DEVEL/lablgtksourceview/debian/changelog b/helm/DEVEL/lablgtksourceview/debian/changelog
index 60893788b401c14eb4d4101e14128f87e263dd9f..c7f6efedf0be72ac875c91522f9c607030e35103 100644 (file)
--- a/helm/DEVEL/lablgtksourceview/debian/changelog
+++ b/helm/DEVEL/lablgtksourceview/debian/changelog
@@ -1,3 +1,11 @@
+lablgtksourceview (0.0.1-2) unstable; urgency=low
+
+  * rebuilt with ocaml 3.09
+  * debian/*
+    - no longer hard coding of ocaml abi version anywhere
+
+ -- Stefano Zacchiroli <zack@debian.org>  Wed, 23 Nov 2005 10:23:24 +0000
+
 lablgtksourceview (0.0.1-1) unstable; urgency=low
 
   * Initial release (closes: bug#320716).

diff --git a/helm/DEVEL/lablgtksourceview/debian/control b/helm/DEVEL/lablgtksourceview/debian/control
index 31664ed3b7f10d2b2171e39bdf6590ca75cf0c36..ab0ca84d5e9e585013c1a36a35cc579f35d60e15 100644 (file)
--- a/helm/DEVEL/lablgtksourceview/debian/control
+++ b/helm/DEVEL/lablgtksourceview/debian/control
@@ -2,13 +2,13 @@ Source: lablgtksourceview
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, ocaml-findlib, ocaml-nox-3.08.3, liblablgtk2-ocaml-dev (>= 2.4.0+2005.06.13-1), libgtksourceview-dev (>= 1.2.0)
+Build-Depends: debhelper (>= 4.1.0), cdbs, ocaml-findlib, ocaml-nox (>= 3.09.0), liblablgtk2-ocaml-dev (>= 2.6.0), libgtksourceview-dev (>= 1.2.0)
 Standards-Version: 3.6.2
 
 Package: liblablgtksourceview-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-3.08.3, ocaml-findlib, liblablgtksourceview-ocaml (= ${Source-Version}), liblablgtk2-ocaml-dev (>= 2.4.0+2005.06.13-1), libgtksourceview-dev (>= 1.2.0), ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, liblablgtksourceview-ocaml (= ${Source-Version}), liblablgtk2-ocaml-dev (>= 2.6.0), libgtksourceview-dev (>= 1.2.0), ${misc:Depends}
 Description: OCaml bindings for libgtksourceview, a source editor GTK widget
  This is the OCaml binding for the GtkSourceView widget, a text widget that
  extends the standard gtk+ 2.x text widget with syntax highlighting and other
@@ -19,7 +19,7 @@ Description: OCaml bindings for libgtksourceview, a source editor GTK widget
 Package: liblablgtksourceview-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-3.08.3, liblablgtk2-ocaml (>= 2.4.0+2005.06.13-1), ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, liblablgtk2-ocaml (>= 2.6.0), ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings for libgtksourceview, a source editor GTK widget
  This is the OCaml binding for the GtkSourceView widget, a text widget that
  extends the standard gtk+ 2.x text widget with syntax highlighting and other

diff --git a/helm/DEVEL/lablgtksourceview/debian/control.in b/helm/DEVEL/lablgtksourceview/debian/control.in
new file mode 100644 (file)
index 0000000..6cd1f42
--- /dev/null
+++ b/helm/DEVEL/lablgtksourceview/debian/control.in
@@ -0,0 +1,29 @@
+Source: lablgtksourceview
+Section: devel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack@debian.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs, ocaml-findlib, ocaml-nox (>= @OCamlABI@), liblablgtk2-ocaml-dev (>= 2.6.0), libgtksourceview-dev (>= 1.2.0)
+Standards-Version: 3.6.2
+
+Package: liblablgtksourceview-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, liblablgtksourceview-ocaml (= ${Source-Version}), liblablgtk2-ocaml-dev (>= 2.6.0), libgtksourceview-dev (>= 1.2.0), ${misc:Depends}
+Description: OCaml bindings for libgtksourceview, a source editor GTK widget
+ This is the OCaml binding for the GtkSourceView widget, a text widget that
+ extends the standard gtk+ 2.x text widget with syntax highlighting and other
+ features typical of a source editor.
+ .
+ This package contains the development part of the lablgtksourceview package.
+
+Package: liblablgtksourceview-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, liblablgtk2-ocaml (>= 2.6.0), ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings for libgtksourceview, a source editor GTK widget
+ This is the OCaml binding for the GtkSourceView widget, a text widget that
+ extends the standard gtk+ 2.x text widget with syntax highlighting and other
+ features typical of a source editor.
+ .
+ This package contains the shared runtime stub libraries.
+

diff --git a/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml-dev.install b/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml-dev.install
index ff039c3ef42b482f4967ca95c5b055099b0ba298..a85b1ed815815d01dd1f3a573e332a889d2be039 100644 (file)
--- a/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml-dev.install
+++ b/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml-dev.install
@@ -1,7 +1,7 @@
-debian/tmp/lablgtksourceview/*.a      usr/lib/ocaml/3.08.3/lablgtksourceview/
-debian/tmp/lablgtksourceview/*.cma    usr/lib/ocaml/3.08.3/lablgtksourceview/
-debian/tmp/lablgtksourceview/*.cmi    usr/lib/ocaml/3.08.3/lablgtksourceview/
-debian/tmp/lablgtksourceview/*.cmxa   usr/lib/ocaml/3.08.3/lablgtksourceview/
-debian/tmp/lablgtksourceview/META     usr/lib/ocaml/3.08.3/lablgtksourceview/
-debian/tmp/lablgtksourceview/*.mli    usr/lib/ocaml/3.08.3/lablgtksourceview/
-debian/tmp/lablgtksourceview/*.o      usr/lib/ocaml/3.08.3/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.a      usr/lib/ocaml/3.09.0/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.cma    usr/lib/ocaml/3.09.0/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.cmi    usr/lib/ocaml/3.09.0/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.cmxa   usr/lib/ocaml/3.09.0/lablgtksourceview/
+debian/tmp/lablgtksourceview/META     usr/lib/ocaml/3.09.0/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.mli    usr/lib/ocaml/3.09.0/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.o      usr/lib/ocaml/3.09.0/lablgtksourceview/

diff --git a/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml-dev.install.in b/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml-dev.install.in
new file mode 100644 (file)
index 0000000..6ed27ec
--- /dev/null
+++ b/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml-dev.install.in
@@ -0,0 +1,7 @@
+debian/tmp/lablgtksourceview/*.a      usr/lib/ocaml/@OCamlABI@/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.cma    usr/lib/ocaml/@OCamlABI@/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.cmi    usr/lib/ocaml/@OCamlABI@/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.cmxa   usr/lib/ocaml/@OCamlABI@/lablgtksourceview/
+debian/tmp/lablgtksourceview/META     usr/lib/ocaml/@OCamlABI@/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.mli    usr/lib/ocaml/@OCamlABI@/lablgtksourceview/
+debian/tmp/lablgtksourceview/*.o      usr/lib/ocaml/@OCamlABI@/lablgtksourceview/

diff --git a/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml.install b/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml.install
index 4565d7c33d4e0283e9be5c4405ac46aeff4b5c9c..8ece11addc413135929119d1c07e2968c77caa3f 100644 (file)
--- a/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml.install
+++ b/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml.install
@@ -1 +1 @@
-debian/tmp/lablgtksourceview/*.so     usr/lib/ocaml/3.08.3/stublibs/
+debian/tmp/lablgtksourceview/*.so     usr/lib/ocaml/3.09.0/stublibs/

diff --git a/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml.install.in b/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml.install.in
new file mode 100644 (file)
index 0000000..d140fb6
--- /dev/null
+++ b/helm/DEVEL/lablgtksourceview/debian/liblablgtksourceview-ocaml.install.in
@@ -0,0 +1 @@
+debian/tmp/lablgtksourceview/*.so     usr/lib/ocaml/@OCamlABI@/stublibs/

diff --git a/helm/DEVEL/lablgtksourceview/debian/rules b/helm/DEVEL/lablgtksourceview/debian/rules
index f738c4d58fa71db80a33b1cf26f38a77bc71aaae..52a3e2ea36d651a236917c0c593a2a519773a20c 100755 (executable)
--- a/helm/DEVEL/lablgtksourceview/debian/rules
+++ b/helm/DEVEL/lablgtksourceview/debian/rules
@@ -1,3 +1,10 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+
+ocamlinit:
+       for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done