debian release 0.3.0-10

diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in
index 991ca44e3480d26088ce6cdbc3680922885a4bd2..61d4a106dd60122f8299cd5c0b32ce35de773429 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/Makefile.in
+++ b/helm/DEVEL/lablgtkmathview/Makefile.in
@@ -64,11 +64,10 @@ $(ARCHIVE): $(OBJECTS) $(ARCHIVE_SO)
         -predicates "$(PREDICATES)" -o $@ $^ \
         -cclib "`glib-config --libs` `gdome-config --libs` `gtkmathview-config --libs`" -dllib -l$(PACKAGE)
 $(ARCHIVE_OPT) $(ARCHIVE_A): $(OBJECTS_OPT)
-       INSTPATH=`ocamlfind query gdome2` ; \
        $(OCAMLOPT) -a -package "$(REQUIRES)" \
         -predicates "$(PREDICATES)" -o $@ $^ \
         -cclib "`glib-config --libs` `gdome-config --libs` `gtkmathview-config --libs`" \
-        -cclib "`echo $$INSTPATH | sed "s/\\(.*\\)\\/gdome2/\\1/"`/$(PACKAGE)/$(ARCHIVE_SO)"
+               -cclib "@OCAML_LIB_DIR@/stublibs/$(ARCHIVE_SO)"
 
 $(ARCHIVE_SO): $(OBJECTS_C)
        gcc -shared -o $@ $< `gtkmathview-config --libs` -lmlgdome -L `ocamlfind query gdome2` -Xlinker -rpath -Xlinker `ocamlfind query gdome2`

diff --git a/helm/DEVEL/lablgtkmathview/configure.in b/helm/DEVEL/lablgtkmathview/configure.in
index 026e0253e55f2edfac2ee6cd3c709671eb179aa2..a72efd51bbe332c37763c00b1fe95ecf728f0a1d 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/configure.in
+++ b/helm/DEVEL/lablgtkmathview/configure.in
@@ -43,6 +43,7 @@ AC_CHECK_FILE(/usr/include/caml/mlvalues.h,
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(OCAML_INCLUDE_DIR)
+AC_SUBST(OCAML_LIB_DIR)
 
 AC_OUTPUT([
   test/Makefile

diff --git a/helm/DEVEL/lablgtkmathview/debian/changelog b/helm/DEVEL/lablgtkmathview/debian/changelog
index f4d74ef308b08d244a925551aabbc3f5686fa9ee..cf735ba06ad5b0c44d0f417d5aee83327262f5b8 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/debian/changelog
+++ b/helm/DEVEL/lablgtkmathview/debian/changelog
@@ -1,3 +1,19 @@
+lablgtkmathview (0.3.0-10) unstable; urgency=low
+
+  * Added dep on liblablgtk-ocaml{,-dev} respectively in
+    liblablgtkmathview-ocaml{,-dev}
+
+ -- Stefano Zacchiroli <zack@debian.org>  Tue, 17 Sep 2002 11:58:14 +0200
+
+lablgtkmathview (0.3.0-9) unstable; urgency=low
+
+  * Removed useless dh_ocamlld invocation
+  * Fixed native code compilation shared object path (now looks for .so
+    in /usr/lib/ocaml/stublibs instead of
+    /usr/lib/ocaml/lablgtkmathview)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Thu, 29 Aug 2002 15:02:21 +0200
+
 lablgtkmathview (0.3.0-8) unstable; urgency=low
 
   * Switched to debhelper 4
@@ -7,6 +23,7 @@ lablgtkmathview (0.3.0-8) unstable; urgency=low
     mandated by the new ocaml packaging policy
   * Removed mention of lablgtkmathview from debian/control
   * Added dep on ocaml-findlib
+  * Moved shared objects to /usr/lib/ocaml/stublibs
 
  -- Stefano Zacchiroli <zack@debian.org>  Sun,  7 Jul 2002 13:50:52 +0200
 

diff --git a/helm/DEVEL/lablgtkmathview/debian/control b/helm/DEVEL/lablgtkmathview/debian/control
index 858b2aed899a1aa13527a1616af1e91f1bb0c51b..76b227606f66132b6046db2bb8fb5c33cbab7cd6 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/debian/control
+++ b/helm/DEVEL/lablgtkmathview/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.5.6
 Package: liblablgtkmathview-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-3.06, libgdome2-ocaml, ${shlibs:Depends}
+Depends: ocaml-base-3.06, liblablgtk-ocaml, libgdome2-ocaml, ${shlibs:Depends}
 Description: OCaml binding for libgtkmathview
  This is the Ocaml binding for the GtkMathView widget, that is
  currently available in the libgtkmathview0 package.
@@ -18,7 +18,7 @@ Description: OCaml binding for libgtkmathview
 Package: liblablgtkmathview-ocaml-dev
 Architecture: any
 Section: devel
-Depends: ocaml-3.06, libgtkmathview0 (>= 0.3.0), liblablgtkmathview-ocaml (= ${Source-Version}), ocaml-findlib
+Depends: ocaml-3.06, liblablgtk-ocaml-dev, libgtkmathview0 (>= 0.3.0), liblablgtkmathview-ocaml (= ${Source-Version}), ocaml-findlib
 Description: OCaml binding for libgtkmathview
  These are the Ocaml bindings for the GtkMathView widget, that is
  currently available in the libgtkmathview0 package.

diff --git a/helm/DEVEL/lablgtkmathview/debian/rules b/helm/DEVEL/lablgtkmathview/debian/rules
index c73636002cbae24ef49b1da6ab826e24736cbfff..86221bf6f618358628155f91cf5ec69d4845724d 100755 (executable)
--- a/helm/DEVEL/lablgtkmathview/debian/rules
+++ b/helm/DEVEL/lablgtkmathview/debian/rules
@@ -68,7 +68,7 @@ binary-arch: build install
        dh_link -s
        dh_strip -s
        dh_compress -s
-       dh_ocamlld -p liblablgtkmathview-ocaml /usr/lib/ocaml/lablgtkmathview
+#      dh_ocamlld -p liblablgtkmathview-ocaml /usr/lib/ocaml/lablgtkmathview
        dh_fixperms -s
        dh_installdeb -s
        dh_shlibdeps -s