[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.3-1-5-g96ba2ca

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit c9745ea8804830b2ebc1fe5fa5284cc129d9f737
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Jun 4 15:36:58 2008 +0200

    install *.cmi-s under STDLIB/dose2/
    
    rather then under STDLIB/ directly, which can cause FTBFS in unrelated
    packages

diff --git a/Makefile.in b/Makefile.in
index 125b340..942d37c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,5 +57,5 @@ else
 	@OCAMLFIND@ install $(DESTDIR_FLAGS) -patch-version @VERSION@ dose2 META $(CMAS) $(CMXAS) $(ARCHIVES)
 endif	
 	@for i in $(DIRS); do \
-		$(MAKE) -C $$i cmi-install extra-install INSTALLDIR=$(DESTDIR); \
+		$(MAKE) -C $$i cmi-install extra-install INSTALLDIR=$(DESTDIR)/dose2; \
 	done
diff --git a/debian/changelog b/debian/changelog
index 2872a25..0a8250f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dose2 (1.3-2) UNRELEASED; urgency=low
 
   * debian/control: add missing deps on librpm-dev and libgdbm-dev from the
     -dev package
+  * install *.cmi-s under STDLIB/dose2/, rather then STDLIB/ directly
 
  -- Stefano Zacchiroli <zack at debian.org>  Tue, 03 Jun 2008 14:56:41 +0200
 
diff --git a/debian/rules b/debian/rules
index 7cb78cb..22322e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,6 @@ clean::
 	rm -f debian/configure-stamp
 install/$(DEV_PKG_NAME)::
 	mkdir -p debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR)
-	mv debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)/*.so \
+	mv debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)/$(LIB_NAME)/*.so \
 		debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR)
 

-- 
dose2 packaging