[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.1.0-2-15-g950a692

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 818ca7df2e8daef6cd4f64120953b964c5cdf46c
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jul 14 21:09:20 2010 +0200

    Update patches

diff --git a/debian/changelog b/debian/changelog
index 7ee3460..384f771 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ ocaml-batteries (1.2.2-1) UNRELEASED; urgency=low
 
   [ Mehdi Dogguy ]
   * New upstream release
+    - Add 0001-Add-Set-an-installation-prefix-path.patch
   * Adapt debian/rules to new upstream's build system.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 14 Jul 2010 20:31:33 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 14 Jul 2010 21:39:15 +0200
 
 ocaml-batteries (1.1.0-2) unstable; urgency=low
 
diff --git a/debian/patches/0001-Add-Set-an-installation-prefix-path.patch b/debian/patches/0001-Add-Set-an-installation-prefix-path.patch
new file mode 100644
index 0000000..16bf318
--- /dev/null
+++ b/debian/patches/0001-Add-Set-an-installation-prefix-path.patch
@@ -0,0 +1,36 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Wed, 14 Jul 2010 21:35:14 +0200
+Subject: [PATCH] Add/Set an installation prefix path
+
+---
+ Makefile |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b5101e2..e8f1c4c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,6 +8,7 @@ VERSION := $(shell cat VERSION)
+ 
+ # Define variables and export them for mkconf.ml
+ DOCROOT ?= /usr/share/doc/ocaml-batteries
++PREFIX ?= $(shell ocamlc -where)
+ export DOCROOT
+ BROWSER_COMMAND ?= x-www-browser %s
+ export BROWSER_COMMAND
+@@ -53,11 +54,12 @@ doc:
+ 	test -e apidocs || ln -s _build/batteries.docdir apidocs
+ 
+ install: all
+-	ocamlfind install estring libs/estring/META \
++	ocamlfind install -destdir $(PREFIX) estring \
++		libs/estring/META \
+ 		_build/libs/estring/*.cmo \
+ 		_build/libs/estring/*.cmi \
+ 		_build/libs/estring/*.mli
+-	ocamlfind install $(NAME) $(INSTALL_FILES)
++	ocamlfind install -destdir $(PREFIX) $(NAME) $(INSTALL_FILES)
+ 
+ uninstall:
+ 	ocamlfind remove estring
+-- 
diff --git a/debian/patches/0001-install-fix-for-bytecode-only-build.patch b/debian/patches/0001-install-fix-for-bytecode-only-build.patch
deleted file mode 100644
index fb25ba8..0000000
--- a/debian/patches/0001-install-fix-for-bytecode-only-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Sat, 6 Mar 2010 15:14:09 +0100
-Subject: [PATCH] install fix for bytecode only build
-
-do not try to install *.a files when native code compilation has not
-been performed
----
- src/OMakefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/OMakefile b/src/OMakefile
-index e4b1648..e520f8e 100644
---- a/src/OMakefile
-+++ b/src/OMakefile
-@@ -119,9 +119,9 @@ batteries_config.ml: batteries_config.mlp
- 	    batteries_config.mlp > batteries_config.ml
- 	chmod(444 batteries_config.ml)
- 
--BAT_FILES[] += $(file $(glob *.mli *.cmi *.cma $(EXTRA) *.a))
-+BAT_FILES[] += $(file $(glob *.mli *.cmi *.cma $(EXTRA)))
- if $(NATIVE_ENABLED)
--	BAT_FILES[] += $(file $(glob *.cmx *.cmxa))
-+	BAT_FILES[] += $(file $(glob *.cmx *.cmxa *.a))
- 	export BAT_FILES
- 
- all: batteries.cma batteries_uni.cma $(if $(NATIVE_ENABLED), batteries.cmxa batteries_uni.cmxa) $(EXTRA)
--- 
diff --git a/debian/patches/0002-Fix-build-with-OCaml-3.12.0.patch b/debian/patches/0002-Fix-build-with-OCaml-3.12.0.patch
index a90b512..e30e21a 100644
--- a/debian/patches/0002-Fix-build-with-OCaml-3.12.0.patch
+++ b/debian/patches/0002-Fix-build-with-OCaml-3.12.0.patch
@@ -13,10 +13,10 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/syntax/pa_strings/pa_format.ml b/src/syntax/pa_strings/pa_format.ml
-index 58396ff..f71a150 100644
+index 0b40904..aa402ca 100644
 --- a/src/syntax/pa_strings/pa_format.ml
 +++ b/src/syntax/pa_strings/pa_format.ml
-@@ -244,7 +244,7 @@ struct
+@@ -246,7 +246,7 @@ struct
          <:expr< fun paren out x -> BatIO.nwrite out "<abstract>" >>
      | <:ctyp at _loc< $id:id$ >> ->
          <:expr< $id:map_id id$ >>
diff --git a/debian/patches/series b/debian/patches/series
index 906fb5c..c5be354 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0001-install-fix-for-bytecode-only-build.patch
+0001-Add-Set-an-installation-prefix-path.patch
 0002-Fix-build-with-OCaml-3.12.0.patch
diff --git a/debian/rules b/debian/rules
index afaf2b0..de19d49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,8 @@ override_dh_auto_test:
 	make test
 
 override_dh_auto_install:
-	mkdir -p $(DEB_DESTDIR) $(BATTERIES_DEB_DOCROOT)
-	DESTDIR=$(DEB_DESTDIR) make install
+	mkdir -p $(DEB_DESTDIR)/estring $(DEB_DESTDIR)/batteries $(BATTERIES_DEB_DOCROOT)
+	make PREFIX=$(DEB_DESTDIR) install
 ifneq (,$(findstring $(DOC_PKG),$(shell dh_listpackages)))
 	make DOCROOT=$(BATTERIES_DEB_DOCROOT) install-doc
 endif

-- 
ocaml-batteries packaging