[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. debian/1.5-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit c75022d3e4644023639c735e327a57b4cef9c8a8
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Apr 26 23:19:47 2012 +0000

    New upstream version.
    
    * New upstream version.
    * Use batteries to replace extlib (Closes: #670474)
    * Drop patch 05_support_hex_format, applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 877ec14..20d1ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pgocaml (1.5-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Use batteries to replace extlib (Closes: #670474)
+  * Drop patch 05_support_hex_format, applied upstream.
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 26 Apr 2012 22:35:22 +0000
+
 pgocaml (1.4-2) unstable; urgency=low
 
   * PG'OCaml moved to forge.ocamlcore.org
diff --git a/debian/control b/debian/control
index d70bd3e..b57781b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: cdbs (>= 0.4.52),
  ocaml-nox (>=3.11),
  camlp4 (>=3.11),
  ocaml-findlib,
- libextlib-ocaml-dev,
+ libbatteries-ocaml-dev,
  libpcre-ocaml-dev,
  libcsv-ocaml-dev,
  libcalendar-ocaml-dev (>= 2)
@@ -25,7 +25,7 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pgocaml.git
 Package: libpgocaml-ocaml-dev
 Architecture: any
 Depends: libpgocaml-ocaml (= ${binary:Version}),
- libextlib-ocaml-dev,
+ libbatteries-ocaml-dev,
  libpcre-ocaml-dev,
  libcsv-ocaml-dev,
  libcalendar-ocaml-dev (>= 2),
diff --git a/debian/patches/05_support_hex_format b/debian/patches/05_support_hex_format
deleted file mode 100644
index 248cf68..0000000
--- a/debian/patches/05_support_hex_format
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Dario Teixeira
-Description: Added support for the 'hex' format used in PostgreSQL 9.0 for serialising
-
---- a/pGOCaml_generic.ml
-+++ b/pGOCaml_generic.ml
-@@ -1548,7 +1548,35 @@
- let is_oct_digit c = c >= '0' && c <= '7'
- let oct_val c = Char.code c - 0x30
- 
--let bytea_of_string str =
-+let is_hex_digit = function '0'..'9' | 'a'..'f' | 'A'..'F' -> true | _ -> false
-+
-+let hex_val c =
-+  let offset = match c with
-+    | '0'..'9' -> 0x30
-+    | 'a'..'f' -> 0x57
-+    | 'A'..'F' -> 0x37
-+    | _	       -> failwith "hex_val"
-+  in Char.code c - offset
-+
-+(* Deserialiser for the new 'hex' format introduced in PostgreSQL 9.0. *)
-+let bytea_of_string_hex str =
-+  let len = String.length str in
-+  let buf = Buffer.create ((len-2)/2) in
-+  let i = ref 3 in
-+  while !i < len do
-+    let hi_nibble = str.[!i-1] in
-+    let lo_nibble = str.[!i] in
-+    i := !i+2;
-+    if is_hex_digit hi_nibble && is_hex_digit lo_nibble
-+    then begin
-+      let byte = ((hex_val hi_nibble) lsl 4) + (hex_val lo_nibble) in
-+      Buffer.add_char buf (Char.chr byte)
-+    end
-+  done;
-+  Buffer.contents buf
-+
-+(* Deserialiser for the old 'escape' format used in PostgreSQL < 9.0. *)
-+let bytea_of_string_escape str =
-   let len = String.length str in
-   let buf = Buffer.create len in
-   let i = ref 0 in
-@@ -1578,6 +1606,16 @@
-   done;
-   Buffer.contents buf
- 
-+(* PostgreSQL 9.0 introduced the new 'hex' format for binary data.
-+   We must therefore check whether the data begins with a magic sequence
-+   that identifies this new format and if so call the appropriate parser;
-+   if it doesn't, then we invoke the parser for the old 'escape' format.
-+*)
-+let bytea_of_string str =
-+	if String.starts_with str "\\x"
-+	then bytea_of_string_hex str
-+	else bytea_of_string_escape str
-+
- let bind = (>>=)
- let return = Thread.return
- end
diff --git a/debian/patches/series b/debian/patches/series
index 92e8a9e..30105b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_postgresql_socket
 03_makefile_cmxs
 04_makefile_byte
-05_support_hex_format
diff --git a/debian/rules b/debian/rules
index 2534d97..3a5600d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ include /usr/share/cdbs/1/class/makefile.mk
 
 DEB_MAKE_CLEAN_TARGET   := clean
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET   := all
+DEB_MAKE_BUILD_TARGET   := all USE_BATTERIES=yes 
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=debian/libpgocaml-ocaml-dev/
 else
 DEB_MAKE_BUILD_TARGET   := all_byte

-- 
pgocaml packaging