From c0c56a8f8ad4d177fbd4025a92fb5317240b33fe Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Wed, 23 Nov 2005 10:02:47 +0000 Subject: [PATCH] ocaml 3.09 transition --- helm/DEVEL/lablgtkmathview/debian/changelog | 8 ++++++ helm/DEVEL/lablgtkmathview/debian/control | 6 ++--- helm/DEVEL/lablgtkmathview/debian/control.in | 27 +++++++++++++++++++ .../debian/liblablgtkmathview-ocaml-dev.dirs | 2 +- .../liblablgtkmathview-ocaml-dev.install | 14 +++++----- .../liblablgtkmathview-ocaml-dev.install.in | 7 +++++ .../debian/liblablgtkmathview-ocaml.dirs | 2 +- .../debian/liblablgtkmathview-ocaml.install | 2 +- helm/DEVEL/lablgtkmathview/debian/rules | 13 +++++---- 9 files changed, 63 insertions(+), 18 deletions(-) create mode 100644 helm/DEVEL/lablgtkmathview/debian/control.in create mode 100644 helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install.in diff --git a/helm/DEVEL/lablgtkmathview/debian/changelog b/helm/DEVEL/lablgtkmathview/debian/changelog index 8f1c6ba9e..c5e80350e 100644 --- a/helm/DEVEL/lablgtkmathview/debian/changelog +++ b/helm/DEVEL/lablgtkmathview/debian/changelog @@ -1,3 +1,11 @@ +lablgtkmathview (0.7.2-3) unstable; urgency=low + + * rebuilt with ocaml 3.09 + * debian/* + - no longer hard coding of ocaml abi number anywhere + + -- Stefano Zacchiroli Wed, 23 Nov 2005 09:59:14 +0000 + lablgtkmathview (0.7.2-2) unstable; urgency=low * debian/changelog diff --git a/helm/DEVEL/lablgtkmathview/debian/control b/helm/DEVEL/lablgtkmathview/debian/control index 9cd85f759..92dd81a1f 100644 --- a/helm/DEVEL/lablgtkmathview/debian/control +++ b/helm/DEVEL/lablgtkmathview/debian/control @@ -2,13 +2,13 @@ Source: lablgtkmathview Section: devel Priority: optional Maintainer: Stefano Zacchiroli -Build-Depends: debhelper (>> 4.0.0), ocaml-3.08.3, ocaml-findlib, liblablgtk2-ocaml-dev (>= 2.4.0+2005.06.13), libgdome2-ocaml-dev (>= 0.2.3), libgtkmathview-dev (>= 0.7.2), pkg-config +Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), liblablgtk2-ocaml-dev (>= 2.6.0), libgdome2-ocaml-dev (>= 0.2.3-3), libgtkmathview-dev (>= 0.7.5), pkg-config Standards-Version: 3.6.2 Package: liblablgtkmathview-ocaml Architecture: any Section: libs -Depends: ocaml-base-nox-3.08.3, liblablgtk2-ocaml (>= 2.4.0+2005.06.13), libgdome2-ocaml (>= 0.2.3), libgtkmathview0c2 (>= 0.7.2), ${shlibs:Depends}, ${misc:Depends} +Depends: ocaml-base-nox-${F:OCamlABI}, liblablgtk2-ocaml (>= 2.6.0), libgdome2-ocaml (>= 0.2.3), libgtkmathview0c2a (>= 0.7.5), ${shlibs:Depends}, ${misc:Depends} Description: OCaml bindings for libgtkmathview, a GTK widget to render MathML This is the Ocaml binding for the GtkMathView widget, that is currently available in the libgtkmathview0 package. @@ -18,7 +18,7 @@ Description: OCaml bindings for libgtkmathview, a GTK widget to render MathML Package: liblablgtkmathview-ocaml-dev Architecture: any Section: libdevel -Depends: ocaml-3.08.3, liblablgtk2-ocaml-dev (>= 2.4.0+2005.06.13), liblablgtkmathview-ocaml (= ${Source-Version}), ocaml-findlib, libgdome2-ocaml-dev (>= 0.2.3), libgtkmathview-dev (>= 0.7.2), ${misc:Depends} +Depends: ocaml-nox-${F:OCamlABI}, liblablgtk2-ocaml-dev (>= 2.6.0), liblablgtkmathview-ocaml (= ${Source-Version}), ocaml-findlib, libgdome2-ocaml-dev (>= 0.2.3-3), libgtkmathview-dev (>= 0.7.5), ${misc:Depends} Description: OCaml bindings for libgtkmathview, a GTK widget to render MathML These are the Ocaml bindings for the GtkMathView widget, that is currently available in the libgtkmathview0 package. diff --git a/helm/DEVEL/lablgtkmathview/debian/control.in b/helm/DEVEL/lablgtkmathview/debian/control.in new file mode 100644 index 000000000..aa5f9d1d2 --- /dev/null +++ b/helm/DEVEL/lablgtkmathview/debian/control.in @@ -0,0 +1,27 @@ +Source: lablgtkmathview +Section: devel +Priority: optional +Maintainer: Stefano Zacchiroli +Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), liblablgtk2-ocaml-dev (>= 2.6.0), libgdome2-ocaml-dev (>= 0.2.3-3), libgtkmathview-dev (>= 0.7.5), pkg-config +Standards-Version: 3.6.2 + +Package: liblablgtkmathview-ocaml +Architecture: any +Section: libs +Depends: ocaml-base-nox-${F:OCamlABI}, liblablgtk2-ocaml (>= 2.6.0), libgdome2-ocaml (>= 0.2.3), libgtkmathview0c2a (>= 0.7.5), ${shlibs:Depends}, ${misc:Depends} +Description: OCaml bindings for libgtkmathview, a GTK widget to render MathML + This is the Ocaml binding for the GtkMathView widget, that is + currently available in the libgtkmathview0 package. + . + This package contains only the shared runtime stub libraries. + +Package: liblablgtkmathview-ocaml-dev +Architecture: any +Section: libdevel +Depends: ocaml-nox-${F:OCamlABI}, liblablgtk2-ocaml-dev (>= 2.6.0), liblablgtkmathview-ocaml (= ${Source-Version}), ocaml-findlib, libgdome2-ocaml-dev (>= 0.2.3-3), libgtkmathview-dev (>= 0.7.5), ${misc:Depends} +Description: OCaml bindings for libgtkmathview, a GTK widget to render MathML + These are the Ocaml bindings for the GtkMathView widget, that is + currently available in the libgtkmathview0 package. + . + This package contains the development part of the lablgtkmathview package. + diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.dirs b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.dirs index 8646e27b2..7ba05d3c3 100644 --- a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.dirs +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.dirs @@ -1 +1 @@ -usr/lib/ocaml/3.08.3 +usr/lib/ocaml/3.09.0 diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install index 2a66db0db..79836154a 100644 --- a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install @@ -1,7 +1,7 @@ -debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.a -debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.cma -debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.cmi -debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.cmxa -debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/META -debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.ml -debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.mli +debian/tmp/usr/lib/ocaml/3.09.0/lablgtkmathview/*.a +debian/tmp/usr/lib/ocaml/3.09.0/lablgtkmathview/*.cma +debian/tmp/usr/lib/ocaml/3.09.0/lablgtkmathview/*.cmi +debian/tmp/usr/lib/ocaml/3.09.0/lablgtkmathview/*.cmxa +debian/tmp/usr/lib/ocaml/3.09.0/lablgtkmathview/META +debian/tmp/usr/lib/ocaml/3.09.0/lablgtkmathview/*.ml +debian/tmp/usr/lib/ocaml/3.09.0/lablgtkmathview/*.mli diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install.in b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install.in new file mode 100644 index 000000000..bcae88906 --- /dev/null +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install.in @@ -0,0 +1,7 @@ +debian/tmp/usr/lib/ocaml/@OCamlABI@/lablgtkmathview/*.a +debian/tmp/usr/lib/ocaml/@OCamlABI@/lablgtkmathview/*.cma +debian/tmp/usr/lib/ocaml/@OCamlABI@/lablgtkmathview/*.cmi +debian/tmp/usr/lib/ocaml/@OCamlABI@/lablgtkmathview/*.cmxa +debian/tmp/usr/lib/ocaml/@OCamlABI@/lablgtkmathview/META +debian/tmp/usr/lib/ocaml/@OCamlABI@/lablgtkmathview/*.ml +debian/tmp/usr/lib/ocaml/@OCamlABI@/lablgtkmathview/*.mli diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.dirs b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.dirs index 8ecf93784..2c3099109 100644 --- a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.dirs +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.dirs @@ -1 +1 @@ -usr/lib/ocaml/3.08.3/stublibs +usr/lib/ocaml/3.09.0/stublibs diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.install b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.install index 18dfa426f..24242ed45 100644 --- a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.install +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.install @@ -1 +1 @@ -debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.so usr/lib/ocaml/3.08.3/stublibs/ +debian/tmp/usr/lib/ocaml/3.09.0/lablgtkmathview/*.so usr/lib/ocaml/3.09.0/stublibs/ diff --git a/helm/DEVEL/lablgtkmathview/debian/rules b/helm/DEVEL/lablgtkmathview/debian/rules index ed0e94113..832767abb 100755 --- a/helm/DEVEL/lablgtkmathview/debian/rules +++ b/helm/DEVEL/lablgtkmathview/debian/rules @@ -5,9 +5,12 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -TARGETDIR = debian/tmp -OCAML_STDLIB_DIR = $(shell ocamlc -where) +OCAMLABI := $(shell ocamlc -version) +OCAMLLIBDIR := $(shell ocamlc -where) +OFILES := $(patsubst %.in,%,$(shell ls debian/*.in)) +ocamlinit: + for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done configure: configure-stamp configure-stamp: dh_testdir @@ -39,8 +42,8 @@ install: build dh_clean -k dh_installdirs - mkdir -p $(TARGETDIR)$(OCAML_STDLIB_DIR) - $(MAKE) install PREFIX=$(TARGETDIR)$(OCAML_STDLIB_DIR) + mkdir -p debian/tmp$(OCAMLLIBDIR) + $(MAKE) install PREFIX=debian/tmp$(OCAMLLIBDIR) binary-arch: build install dh_install @@ -57,7 +60,7 @@ binary-arch: build install dh_fixperms dh_installdeb dh_shlibdeps - dh_gencontrol + dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)" dh_md5sums dh_builddeb -- 2.39.2