[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 950a692972cfe9feb45d1c7f72b2aafd18e8dde4
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jul 14 23:31:15 2010 +0200

    Release to unstable

diff --git a/Makefile b/Makefile
index b5101e2..5a136d6 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
@@ -49,15 +50,16 @@ clean:
 	$(OCAMLBUILD) -clean
 
 doc:
-	$(OCAMLBUILD) batteries.docdir/index.html
+	$(OCAMLBUILD) -no-hygiene batteries.docdir/index.html
 	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/changelog b/debian/changelog
index 5e45614..16a4879 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocaml-batteries (1.2.2-1) UNRELEASED; urgency=low
+ocaml-batteries (1.2.2-1) unstable; urgency=low
 
   [ Stéphane Glondu ]
   * Add 0002-Fix-build-with-OCaml-3.12.0.patch (Closes: #586493)
@@ -15,7 +15,7 @@ ocaml-batteries (1.2.2-1) UNRELEASED; urgency=low
   * Update libbatteries-ocaml-doc.doc-base
   * Bump standards version to 3.9.0, no changes needed.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 14 Jul 2010 22:56:36 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 14 Jul 2010 23:31:15 +0200
 
 ocaml-batteries (1.1.0-2) unstable; urgency=low
 
diff --git a/src/syntax/pa_strings/pa_format.ml b/src/syntax/pa_strings/pa_format.ml
index 0b40904..aa402ca 100644
--- a/src/syntax/pa_strings/pa_format.ml
+++ b/src/syntax/pa_strings/pa_format.ml
@@ -246,7 +246,7 @@ struct
         <:expr< fun paren out x -> BatIO.nwrite out "<abstract>" >>
     | <:ctyp at _loc< $id:id$ >> ->
         <:expr< $id:map_id id$ >>
-    | <:ctyp at _loc< $a$ $b$ >> ->
+    | Ast.TyApp (_loc, b, a) ->
         <:expr< $vprinter_of_ctyp b$ $vprinter_of_ctyp a$ >>
     | <:ctyp at _loc< $tup:t$ >> ->
         let l = Ast.list_of_ctyp t [] in

-- 
ocaml-batteries packaging