From 97c2d258a5c524eb5c4b85208899d80751a2c82f Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Wed, 23 Nov 2005 10:45:01 +0000 Subject: [PATCH] ocaml 3.09 transition --- helm/DEVEL/gdome_xslt/Makefile.am | 2 +- helm/DEVEL/gdome_xslt/debian/changelog | 12 ++++ helm/DEVEL/gdome_xslt/debian/control | 16 ++--- helm/DEVEL/gdome_xslt/debian/control.in | 58 +++++++++++++++++++ .../debian/libgdome2-xslt-ocaml-dev.dirs | 2 +- .../debian/libgdome2-xslt-ocaml-dev.dirs.in | 1 + .../debian/libgdome2-xslt-ocaml-dev.install | 6 +- .../libgdome2-xslt-ocaml-dev.install.in | 3 + .../debian/libgdome2-xslt-ocaml.dirs | 2 +- .../debian/libgdome2-xslt-ocaml.dirs.in | 1 + .../debian/libgdome2-xslt-ocaml.install | 2 +- .../debian/libgdome2-xslt-ocaml.install.in | 1 + helm/DEVEL/gdome_xslt/debian/rules | 7 +++ 13 files changed, 98 insertions(+), 15 deletions(-) create mode 100644 helm/DEVEL/gdome_xslt/debian/control.in create mode 100644 helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs.in create mode 100644 helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.install.in create mode 100644 helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs.in create mode 100644 helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.install.in diff --git a/helm/DEVEL/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/Makefile.am index e31283586..bb68b5e4b 100644 --- a/helm/DEVEL/gdome_xslt/Makefile.am +++ b/helm/DEVEL/gdome_xslt/Makefile.am @@ -11,6 +11,6 @@ SUBDIRS = C C++ ocaml test_files deb: dist if [ -d $(DISTDIR)/ ]; then rm -rf $(DISTDIR); else true; fi tar xvzf $(DISTDIR).tar.gz - (cd $(DISTDIR)/ && debuild) + (cd $(DISTDIR)/ && find . -type d -name CVS -exec rm -rf {} \; ; debuild) rm -rf $(DISTDIR) diff --git a/helm/DEVEL/gdome_xslt/debian/changelog b/helm/DEVEL/gdome_xslt/debian/changelog index 7c5bdda42..260ae3b28 100644 --- a/helm/DEVEL/gdome_xslt/debian/changelog +++ b/helm/DEVEL/gdome_xslt/debian/changelog @@ -1,3 +1,15 @@ +gdome2-xslt (0.0.7-2) unstable; urgency=low + + * ocaml 3.09 transition + * rebuild/renaming due to changed libstdc++ configuration + (closes: #339167) + * debian/* + - no longer hard coding of ocaml abi number anywhere + * debian/control + - bumped standards version + + -- Stefano Zacchiroli Wed, 23 Nov 2005 10:30:16 +0000 + gdome2-xslt (0.0.7-1) unstable; urgency=low * New upstream release diff --git a/helm/DEVEL/gdome_xslt/debian/control b/helm/DEVEL/gdome_xslt/debian/control index df874e90f..242f5eb6c 100644 --- a/helm/DEVEL/gdome_xslt/debian/control +++ b/helm/DEVEL/gdome_xslt/debian/control @@ -2,15 +2,15 @@ Source: gdome2-xslt Section: devel Priority: optional Maintainer: Stefano Zacchiroli -Build-Depends: debhelper (>= 4.1.0), ocaml-nox-3.08.3, ocaml-findlib (>= 0.8-5), libgdome2-ocaml-dev (>= 0.2.3), libgdome2-dev (>= 0.8.1), libxslt1-dev, libgdome2-cpp-smart-dev (>= 0.2.3), pkg-config, cdbs -Standards-Version: 3.6.1.1 +Build-Depends: debhelper (>= 4.1.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), libgdome2-ocaml-dev (>= 0.2.3-4), libgdome2-dev (>= 0.8.1), libxslt1-dev, libgdome2-cpp-smart-dev (>= 0.2.3-4), pkg-config, cdbs +Standards-Version: 3.6.2 -Package: libgdome2-xslt0c2 +Package: libgdome2-xslt0c2a Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libgdome2-xslt0 -Conflicts: libgdome2-xslt0 +Replaces: libgdome2-xslt0, libgdome2-xslt0c2 +Conflicts: libgdome2-xslt0, libgdome2-xslt0c2 Description: Minimal XSLT processor working on GDome2 documents gdome2-xslt is a very small C library that implements a minimal XSLT processor that can be used to apply XSLT stylesheets to @@ -22,7 +22,7 @@ Description: Minimal XSLT processor working on GDome2 documents Package: libgdome2-xslt-dev Section: libdevel Architecture: any -Depends: libgdome2-xslt0c2 (= ${Source-Version}), libxslt1-dev, libgdome2-dev (>= 0.8.1), libgdome2-cpp-smart-dev (>= 0.2.3), ${misc:Depends} +Depends: libgdome2-xslt0c2a (= ${Source-Version}), libxslt1-dev, libgdome2-dev (>= 0.8.1), libgdome2-cpp-smart-dev (>= 0.2.3-4), ${misc:Depends} Description: Minimal XSLT processor working on GDome2 documents gdome2-xslt is a very small C library that implements a minimal XSLT processor that can be used to apply XSLT stylesheets to @@ -33,7 +33,7 @@ Description: Minimal XSLT processor working on GDome2 documents Package: libgdome2-xslt-ocaml Architecture: any -Depends: ocaml-base-nox-3.08.3, libgdome2-ocaml (>= 0.2.3), ${shlibs:Depends}, ${misc:Depends} +Depends: ocaml-base-nox-${F:OCamlABI}, libgdome2-ocaml (>= 0.2.3-4), ${shlibs:Depends}, ${misc:Depends} Description: OCaml bindings for a minimal GDome2 based XSLT processor gdome2-xslt is a very small C library that implements a minimal XSLT processor that can be used to apply XSLT stylesheets to @@ -46,7 +46,7 @@ Description: OCaml bindings for a minimal GDome2 based XSLT processor Package: libgdome2-xslt-ocaml-dev Architecture: any Section: libdevel -Depends: ocaml-nox-3.08.3, libgdome2-xslt-ocaml (= ${Source-Version}), libgdome2-ocaml-dev (>= 0.2.3), libxslt1-dev, libgdome2-dev (>= 0.8.1), ${misc:Depends} +Depends: ocaml-nox-${F:OCamlABI}, libgdome2-xslt-ocaml (= ${Source-Version}), libgdome2-ocaml-dev (>= 0.2.3-4), libxslt1-dev, libgdome2-dev (>= 0.8.1), ${misc:Depends} Description: OCaml bindings for a minimal GDome2 based XSLT processor gdome2-xslt is a very small C library that implements a minimal XSLT processor that can be used to apply XSLT stylesheets to diff --git a/helm/DEVEL/gdome_xslt/debian/control.in b/helm/DEVEL/gdome_xslt/debian/control.in new file mode 100644 index 000000000..1624c32b6 --- /dev/null +++ b/helm/DEVEL/gdome_xslt/debian/control.in @@ -0,0 +1,58 @@ +Source: gdome2-xslt +Section: devel +Priority: optional +Maintainer: Stefano Zacchiroli +Build-Depends: debhelper (>= 4.1.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), libgdome2-ocaml-dev (>= 0.2.3-4), libgdome2-dev (>= 0.8.1), libxslt1-dev, libgdome2-cpp-smart-dev (>= 0.2.3-4), pkg-config, cdbs +Standards-Version: 3.6.2 + +Package: libgdome2-xslt0c2a +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libgdome2-xslt0, libgdome2-xslt0c2 +Conflicts: libgdome2-xslt0, libgdome2-xslt0c2 +Description: Minimal XSLT processor working on GDome2 documents + gdome2-xslt is a very small C library that implements a minimal + XSLT processor that can be used to apply XSLT stylesheets to + gdome2 documents. + . + This package includes shared libraries for the C implementation + and for the C++ bindings. + +Package: libgdome2-xslt-dev +Section: libdevel +Architecture: any +Depends: libgdome2-xslt0c2a (= ${Source-Version}), libxslt1-dev, libgdome2-dev (>= 0.8.1), libgdome2-cpp-smart-dev (>= 0.2.3-4), ${misc:Depends} +Description: Minimal XSLT processor working on GDome2 documents + gdome2-xslt is a very small C library that implements a minimal + XSLT processor that can be used to apply XSLT stylesheets to + gdome2 documents. + . + This package includes development support files for the C + library and for its C++ bindings. + +Package: libgdome2-xslt-ocaml +Architecture: any +Depends: ocaml-base-nox-${F:OCamlABI}, libgdome2-ocaml (>= 0.2.3-4), ${shlibs:Depends}, ${misc:Depends} +Description: OCaml bindings for a minimal GDome2 based XSLT processor + gdome2-xslt is a very small C library that implements a minimal + XSLT processor that can be used to apply XSLT stylesheets to + gdome2 documents. + . + This package ships the OCaml language bindings for gdome2-xslt. + . + This package contains only the OCaml shared runtime stub libraries. + +Package: libgdome2-xslt-ocaml-dev +Architecture: any +Section: libdevel +Depends: ocaml-nox-${F:OCamlABI}, libgdome2-xslt-ocaml (= ${Source-Version}), libgdome2-ocaml-dev (>= 0.2.3-4), libxslt1-dev, libgdome2-dev (>= 0.8.1), ${misc:Depends} +Description: OCaml bindings for a minimal GDome2 based XSLT processor + gdome2-xslt is a very small C library that implements a minimal + XSLT processor that can be used to apply XSLT stylesheets to + gdome2 documents. + . + This package ships the OCaml language bindings for gdome2-xslt. + . + This package contains OCaml development stuff for gdome2-xslt. + diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs index 8646e27b2..7ba05d3c3 100644 --- a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs +++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs @@ -1 +1 @@ -usr/lib/ocaml/3.08.3 +usr/lib/ocaml/3.09.0 diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs.in b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs.in new file mode 100644 index 000000000..92126d87b --- /dev/null +++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs.in @@ -0,0 +1 @@ +usr/lib/ocaml/@OCamlABI@ diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.install b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.install index 52584711d..2383fd8b1 100644 --- a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.install +++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/ocaml/3.08.3/stublibs/*.owner -debian/tmp/usr/lib/ocaml/3.08.3/stublibs/lib*.so -debian/tmp/usr/lib/ocaml/3.08.3/gdome2-xslt/ +debian/tmp/usr/lib/ocaml/3.09.0/stublibs/*.owner +debian/tmp/usr/lib/ocaml/3.09.0/stublibs/lib*.so +debian/tmp/usr/lib/ocaml/3.09.0/gdome2-xslt/ diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.install.in b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.install.in new file mode 100644 index 000000000..4888ff757 --- /dev/null +++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.install.in @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*.owner +debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/lib*.so +debian/tmp/usr/lib/ocaml/@OCamlABI@/gdome2-xslt/ diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs index 8646e27b2..7ba05d3c3 100644 --- a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs +++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs @@ -1 +1 @@ -usr/lib/ocaml/3.08.3 +usr/lib/ocaml/3.09.0 diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs.in b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs.in new file mode 100644 index 000000000..92126d87b --- /dev/null +++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs.in @@ -0,0 +1 @@ +usr/lib/ocaml/@OCamlABI@ diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.install b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.install index 96cc7de5c..a2cb93c23 100644 --- a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.install +++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.install @@ -1 +1 @@ -debian/tmp/usr/lib/ocaml/3.08.3/stublibs/dll*.so +debian/tmp/usr/lib/ocaml/3.09.0/stublibs/dll*.so diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.install.in b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.install.in new file mode 100644 index 000000000..b13996552 --- /dev/null +++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.install.in @@ -0,0 +1 @@ +debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/dll*.so diff --git a/helm/DEVEL/gdome_xslt/debian/rules b/helm/DEVEL/gdome_xslt/debian/rules index f738c4d58..52a3e2ea3 100755 --- a/helm/DEVEL/gdome_xslt/debian/rules +++ b/helm/DEVEL/gdome_xslt/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 -- 2.39.2