From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Tue, 7 Jan 2003 11:02:53 +0000 (+0000)
Subject: debian release 0.3.0-10
X-Git-Tag: v0_3_99~83
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=cf497123176d912bdef9baa16c25ace0ad9477fe;p=helm.git

debian release 0.3.0-10
---

diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in
index 991ca44e3..61d4a106d 100644
--- 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 026e0253e..a72efd51b 100644
--- 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 f4d74ef30..cf735ba06 100644
--- 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 858b2aed8..76b227606 100644
--- 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 c73636002..86221bf6f 100755
--- 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