debian release -3

diff --git a/helm/DEVEL/gdome_xslt/debian/changelog b/helm/DEVEL/gdome_xslt/debian/changelog
index 81b9f720cd52b4fa729d2150eef38bcc604706db..6af60f119ce044ed2f547958db319de29312f038 100644 (file)
--- a/helm/DEVEL/gdome_xslt/debian/changelog
+++ b/helm/DEVEL/gdome_xslt/debian/changelog
@@ -1,3 +1,12 @@
+libxslt-ocaml (0.0.1-3) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.06 (Closes: Bug#158225, Bug#158217)
+  * Upgraded Standards-Version to 3.5.6
+  * Switched deps and build-deps to ocaml-3.06 and ocaml-base-3.06
+  * Switched to debhelper 4
+
+ -- Stefano Zacchiroli <zack@debian.org>  Wed, 28 Aug 2002 11:09:04 +0200
+
 libxslt-ocaml (0.0.1-2) unstable; urgency=low
 
   * Added -fPIC option when compiled some .o in order to succesfully build

diff --git a/helm/DEVEL/gdome_xslt/debian/control b/helm/DEVEL/gdome_xslt/debian/control
index 85cb25fddad9f6a0c4bf4d5357adf84d9dce7929..29840c717840672c16d8ba199d6ae8d3cd5cebbf 100644 (file)
--- a/helm/DEVEL/gdome_xslt/debian/control
+++ b/helm/DEVEL/gdome_xslt/debian/control
@@ -2,12 +2,12 @@ Source: libxslt-ocaml
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>> 3.0.0), ocaml, ocaml-findlib, libgdome2-ocaml-dev, libgdome2-dev, libxslt1-dev
-Standards-Version: 3.5.2
+Build-Depends: debhelper (>> 4.0.0), ocaml-3.06, ocaml-findlib, libgdome2-ocaml-dev, libgdome2-dev, libxslt1-dev
+Standards-Version: 3.5.6
 
 Package: libgdome2-xslt-ocaml
 Architecture: any
-Depends: ocaml (>= 3.04), ocaml (<< 3.05), ${shlibs:Depends}
+Depends: ocaml-base-3.06, ${shlibs:Depends}
 Description: OCaml XSLT processing library
  This OCaml library provides an high level API for XSLT
  processing.
@@ -20,7 +20,7 @@ Description: OCaml XSLT processing library
 Package: libgdome2-xslt-ocaml-dev
 Architecture: any
 Section: devel
-Depends: ocaml (>= 3.04), ocaml (<< 3.05), libgdome2-xslt-ocaml (= ${Source-Version}), libxslt1-dev, libgdome2-dev
+Depends: ocaml-3.06, libgdome2-xslt-ocaml (= ${Source-Version}), libxslt1-dev, libgdome2-dev
 Description: OCaml XSLT processing library
  This OCaml library provides an high level API for XSLT
  processing.

diff --git a/helm/DEVEL/gdome_xslt/debian/rules b/helm/DEVEL/gdome_xslt/debian/rules
index a4d8a5bc743ad2cfdedc27f81412ad3329bd4815..c10d3e9a51c3f4379fa620b1b10022de23ca18ce 100755 (executable)
--- a/helm/DEVEL/gdome_xslt/debian/rules
+++ b/helm/DEVEL/gdome_xslt/debian/rules
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
 
 TARGETDIR = debian/libgdome2-xslt-ocaml-dev
 
@@ -47,9 +47,7 @@ install: build
        dh_clean -k
        dh_installdirs -s
 
-    # trick: redifine CAMLLIB so that findlibd doesn't try to modify the
-       # official /var/lib/ocaml/ld.conf
-       CAMLLIB=$(CURDIR) $(MAKE) -C ocaml/gdome_xslt/ install PREFIX=$(CURDIR)/$(TARGETDIR)/usr/lib/ocaml
+       $(MAKE) -C ocaml/gdome_xslt/ install PREFIX=$(CURDIR)/$(TARGETDIR)/usr/lib/ocaml
 
 movefiles: install
        dh_movefiles -p libgdome2-xslt-ocaml --sourcedir=$(TARGETDIR)

diff --git a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.in b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.in
index eafebde9ed1eddeda3b7b3e825d1bb019193a0ba..3f56ae13c2fcb0d8ebda6a0ebf1e804d50307681 100644 (file)
--- a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.in
+++ b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.in
@@ -79,8 +79,9 @@ install:
        if [ "$(PREFIX)" = "" ]; then \
                ocamlfind install $(PACKAGE) $(ARCHIVE) $(ARCHIVE_SO) $(INST) $$extra; \
        else \
-               ocamlfind install -destdir $(PREFIX) $(PACKAGE) $(ARCHIVE) $(ARCHIVE_SO) $(INST) $$extra; \
+               ocamlfind install -ldconf $(CURDIR)/foo.ld.conf -destdir $(PREFIX) $(PACKAGE) $(ARCHIVE) $(ARCHIVE_SO) $(INST) $$extra; \
        fi
+       -rm -f $(CURDIR)/foo.ld.conf
 
 uninstall:
        ocamlfind remove $(PACKAGE)