[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/3.0.1-1-6-gdf8ccf1

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 87e4be31975877aed91d1e6c53d014611c2a8c41
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Wed Jun 24 22:12:28 2009 +0200

    Get rid of usage of old OCaml's stdlib location

diff --git a/debian/changelog b/debian/changelog
index 6a29177..088f0cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-camlimages (1:3.0.1-2) unstable; urgency=low
+camlimages (1:3.0.1-2) UNRELEASED; urgency=low
 
   * Add myself to uploaders
   * Fix missing comma in control file
   * Move library packages to ocaml section.
+  * Get rid of usage of old OCaml's stdlib location.
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Tue, 23 Jun 2009 11:33:10 +0200
 
diff --git a/debian/libcamlimages-ocaml-dev.install.in b/debian/libcamlimages-ocaml-dev.install.in
index 1a5dc7d..e11c3c4 100644
--- a/debian/libcamlimages-ocaml-dev.install.in
+++ b/debian/libcamlimages-ocaml-dev.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/site-lib/camlimages @OCamlStdlibDir@
+debian/tmp at OCamlStdlibDir@/site-lib/camlimages @OCamlStdlibDir@
diff --git a/debian/rules b/debian/rules
index 4363107..bc43c64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
+include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -47,7 +48,7 @@ install/libcamlimages-ocaml-doc::
 	$(MAKE) -C '$(CURDIR)/examples' clean
 
 install/libcamlimages-ocaml-dev::
-	mv '$(CURDIR)/debian/tmp/usr/lib/ocaml/stublibs/dllcamlimages.so' \
+	mv '$(CURDIR)/debian/tmp$(OCAML_DLL_DIR)/dllcamlimages.so' \
 	 '$(DESTDIR)/$(OCAML_DLL_DIR)/'
 	chrpath -d $(DESTDIR)/$(OCAML_DLL_DIR)/*.so
 

-- 
camlimages packaging