[Pkg-ocaml-maint-commits] [SCM] lablgtk2 packaging branch, master, updated. debian/2.14.2+dfsg-3-7-g4cc6e9c

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 78a98fad766c88b8fb655ae0e53b086069f8921c
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sun May 12 08:30:34 2013 +0800

    Fix install path.

diff --git a/debian/liblablgtk2-gl-ocaml.install.in b/debian/liblablgtk2-gl-ocaml.install.in
index f6f3e64..0ae766f 100644
--- a/debian/liblablgtk2-gl-ocaml.install.in
+++ b/debian/liblablgtk2-gl-ocaml.install.in
@@ -1,4 +1,4 @@
 debian/META.lablgtk2-gl                    @OCamlStdlibDir@/METAS
- at OCamlDllDir@/dlllablgtkgl2.so
+ at OCamlStdlibDir@/lablgtk2/dlllablgtkgl2.so @OCamlDllDir@
 @OCamlStdlibDir@/lablgtk2/lablgtkgl.cma
 DYN: @OCamlStdlibDir@/lablgtk2/lablgtkgl.cmxs
diff --git a/debian/liblablgtk2-gnome-ocaml.install.in b/debian/liblablgtk2-gnome-ocaml.install.in
index d55fb33..538c9ac 100644
--- a/debian/liblablgtk2-gnome-ocaml.install.in
+++ b/debian/liblablgtk2-gnome-ocaml.install.in
@@ -1,7 +1,7 @@
 debian/META.lablgtk2-gnome                        @OCamlStdlibDir@/METAS
- at OCamlDllDir@/dlllablgnomecanvas.so
- at OCamlDllDir@/dlllablgnomeui.so
- at OCamlDllDir@/dlllablrsvg.so
+ at OCamlStdlibDir@/lablgtk2/dlllablgnomecanvas.so   @OCamlDllDir@
+ at OCamlStdlibDir@/lablgtk2/dlllablgnomeui.so       @OCamlDllDir@
+ at OCamlStdlibDir@/lablgtk2/dlllablrsvg.so          @OCamlDllDir@
 @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.cma
 @OCamlStdlibDir@/lablgtk2/lablgnomeui.cma
 @OCamlStdlibDir@/lablgtk2/lablrsvg.cma
diff --git a/debian/liblablgtk2-ocaml.install.in b/debian/liblablgtk2-ocaml.install.in
index d06c709..d20b23d 100644
--- a/debian/liblablgtk2-ocaml.install.in
+++ b/debian/liblablgtk2-ocaml.install.in
@@ -1,7 +1,7 @@
-debian/META               @OCamlStdlibDir@/lablgtk2
- at OCamlDllDir@/dlllablgtkspell.so
- at OCamlDllDir@/dlllablglade2.so
- at OCamlDllDir@/dlllablgtk2.so
+debian/META                                  @OCamlStdlibDir@/lablgtk2
+ at OCamlStdlibDir@/lablgtk2/dlllablgtkspell.so @OCamlDllDir@
+ at OCamlStdlibDir@/lablgtk2/dlllablglade2.so   @OCamlDllDir@
+ at OCamlStdlibDir@/lablgtk2/dlllablgtk2.so     @OCamlDllDir@
 @OCamlStdlibDir@/lablgtk2/lablglade.cma
 @OCamlStdlibDir@/lablgtk2/lablgtk.cma
 @OCamlStdlibDir@/lablgtk2/lablgtkspell.cma
diff --git a/debian/liblablgtksourceview2-ocaml.install.in b/debian/liblablgtksourceview2-ocaml.install.in
index 8722f99..b08101c 100644
--- a/debian/liblablgtksourceview2-ocaml.install.in
+++ b/debian/liblablgtksourceview2-ocaml.install.in
@@ -1,4 +1,4 @@
 debian/META.lablgtksourceview2                      @OCamlStdlibDir@/METAS
- at OCamlDllDir@/dlllablgtksourceview2.so
+ at OCamlStdlibDir@/lablgtk2/dlllablgtksourceview2.so  @OCamlDllDir@
 @OCamlStdlibDir@/lablgtk2/lablgtksourceview2.cma
 DYN: @OCamlStdlibDir@/lablgtk2/lablgtksourceview2.cmxs
diff --git a/debian/patches/0002-fix-install-path.patch b/debian/patches/0002-fix-install-path.patch
new file mode 100644
index 0000000..dbaf12d
--- /dev/null
+++ b/debian/patches/0002-fix-install-path.patch
@@ -0,0 +1,14 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -427,9 +427,9 @@
+       then \
+         echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \
+     fi`
+-	$(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%)
++	$(RANLIB) $(CLIBS:%="$(OCAMLFIND_DESTDIR)"/lablgtk2/%)
+ 	@if test -f lablgtk.cmxa; \
+-	  then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi
++	  then ($(RANLIB) $(MLLIBS:%.cma="$(OCAMLFIND_DESTDIR)"/lablgtk2/%$(XA)) $(EXTRA_MLLIBS:%.cma="$(OCAMLFIND_DESTDIR)"/lablgtk2/%$(XA)) ); fi
+ 	rm lablgtk2$(XB)
+ 	$(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB)
+ 	cp lablgtk2$(XB) "$(BINDIR)"
diff --git a/debian/patches/series b/debian/patches/series
index 08b30ba..53b7513 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Disable-svgz.patch
+0002-fix-install-path.patch
diff --git a/debian/rules b/debian/rules
index 1b03dd0..3e7717e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 DESTDIR := $(CURDIR)/debian/tmp
+export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_LDCONF=ignore
 
 %:
 	dh $@ --with ocaml
@@ -33,6 +35,7 @@ override_dh_auto_clean:
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
+	mkdir -p '$(OCAMLFIND_DESTDIR)'
 	$(MAKE) install DESTDIR=$(DESTDIR)
 # remove files related to gtksourceview1 (uncompiled anyway... and
 # make dh_ocamldoc fail)

-- 
lablgtk2 packaging