[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.0-5-24-g79c6b5d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 79c6b5d4c35092fcb1adb9695a861930bd91c608
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 17 00:30:10 2009 +0200

    Move OCaml standard library to /usr/lib/ocaml

diff --git a/debian/changelog b/debian/changelog
index 6d46116..af34ec4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ ocaml (3.11.1-1) UNRELEASED; urgency=low
     - change Recommends from ledit to "ledit | readline-editor" for
       ocaml-interp
     - remove various obsolete Conflicts and Replaces
+  * Move OCaml standard library to /usr/lib/ocaml
 
  -- Stephane Glondu <steph at glondu.net>  Fri, 12 Jun 2009 15:50:22 +0200
 
diff --git a/debian/ocaml-base-nox.postinst.in b/debian/ocaml-base-nox.postinst.in
index 2913dbc..589d8c8 100644
--- a/debian/ocaml-base-nox.postinst.in
+++ b/debian/ocaml-base-nox.postinst.in
@@ -18,7 +18,7 @@ if [ ! -e /usr/local/lib/ocaml/@OCamlABI@/stublibs ]; then
     fi
 fi
 
-for i in /usr/lib/ocaml/3.06 /etc/ocaml /var/lib/ocaml /usr/lib/ocaml;	\
+for i in /usr/lib/ocaml/3.06 /etc/ocaml /var/lib/ocaml; 		\
 do									\
 	if [ -e $i/ld.conf ]; then					\
 		echo "Removing leftover $i/ld.conf";			\
diff --git a/debian/ocaml.files.in b/debian/ocaml.files.in
deleted file mode 100644
index 558c8bf..0000000
--- a/debian/ocaml.files.in
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/bin/labltk
-usr/bin/ocamlbrowser
-usr/lib/ocaml/#OcamlABI#/graphics.cmi
-usr/lib/ocaml/#OcamlABI#/graphicsX11.cmi
-usr/lib/ocaml/#OcamlABI#/graphics.mli
-usr/lib/ocaml/#OcamlABI#/graphicsX11.mli
-usr/lib/ocaml/#OcamlABI#/labltk
-usr/lib/ocaml/#OcamlABI#/libgraphics.a
-OPT: usr/bin/labltk
-OPT: usr/lib/ocaml/#OcamlABI#/labltk
-OPT: usr/lib/ocaml/#OcamlABI#/graphics.cmx
-OPT: usr/lib/ocaml/#OcamlABI#/graphics.cmxa
-OPT: usr/lib/ocaml/#OcamlABI#/graphics.a
diff --git a/debian/rules b/debian/rules
index 91a6db3..60dd323 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ BUILDCACHE := $(wildcard ../ocaml.cache)
 
 # These are defined here to avoid definition of them in ocamlvars.mk
 OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR)
-OCAML_STDLIB_DIR := /usr/lib/ocaml/$(OCAML_ABI)
+OCAML_STDLIB_DIR := /usr/lib/ocaml
 OCAML_NATIVE_ARCHS := $(shell cat debian/native-archs)
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 OCAML_OPT_ARCH := $(findstring $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS))
@@ -45,8 +45,8 @@ CONFIGURE_OPTS := \
 
 CONFIGURE_SED := \
   -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g" \
-  -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAML_ABI)%g" \
-  -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAML_ABI)/stublibs%g"
+  -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml%g" \
+  -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/stublibs%g"
 
 
 $(QUILT_STAMPFN): debian/$(SRCTARBALL)

-- 
OCaml packaging