[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.1.0-2-8-g7c674a7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 14f5b52fd48a9e4a681cce38cd924239047b66a0
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 20 16:15:09 2009 +0200

    Add patches
    
     * Fix typo in configure script
     * Fix build with pcre-ocaml 6.0.0
       - add versioned dependency on libpcre-ocaml-dev
     * Update packaging:
       - add dependency on quilt
       - add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..247cb88
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,16 @@
+Ocsigen Debian source package
+=============================
+
+Patching upstream sources
+-------------------------
+
+This source package uses quilt to apply and remove its patches. Please
+refer to `/usr/share/doc/quilt/README.source' for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (>= 0.4.2) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
+
+ -- Stephane Glondu <steph at glondu.net>, Sat, 20 Jun 2009 16:16:23 +0200
diff --git a/debian/control b/debian/control
index 1f37535..adb75ca 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,16 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stephane Glondu <steph at glondu.net>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.52),
+Build-Depends:
+ debhelper (>= 7.0.52),
+ quilt (>= 0.46-7),
  ocaml-nox,
  camlp4,
  camlp4-extra,
  ocaml-findlib,
  liblwt-ocaml-dev (>= 1.1.0-3),
  libocamlnet-ocaml-dev (>= 2.2.9-6),
+ libpcre-ocaml-dev (>= 6.0.0),
  libssl-ocaml-dev (>= 0.4.3-2),
  libgdbm-dev,
  libsqlite3-ocaml-dev,
diff --git a/debian/patches/0001-Fix-typo-regarding-stubdir-in-configure-script.patch b/debian/patches/0001-Fix-typo-regarding-stubdir-in-configure-script.patch
new file mode 100644
index 0000000..2f50c71
--- /dev/null
+++ b/debian/patches/0001-Fix-typo-regarding-stubdir-in-configure-script.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 8 May 2009 01:53:22 +0200
+Subject: [PATCH] Fix typo regarding --stubdir in configure script
+
+Applied upstream.
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 03937d5..0819b30 100755
+--- a/configure
++++ b/configure
+@@ -375,7 +375,7 @@ while [ "$#" -gt 0 ]; do
+                         shift
+                         ;;
+                 --stubdir)
+-                        libdir="$2"
++                        stubdir="$2"
+                         shift
+                         shift
+                         ;;
+-- 
diff --git a/debian/patches/0002-Fix-for-pcre-ocaml-6.0.0.patch b/debian/patches/0002-Fix-for-pcre-ocaml-6.0.0.patch
new file mode 100644
index 0000000..16535ad
--- /dev/null
+++ b/debian/patches/0002-Fix-for-pcre-ocaml-6.0.0.patch
@@ -0,0 +1,31 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 13 Jun 2009 02:21:56 +0200
+Subject: [PATCH] Fix for pcre-ocaml 6.0.0
+
+Upstream notified.
+---
+ extensions/staticmod.ml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/staticmod.ml b/extensions/staticmod.ml
+index d2250ae..aac17d5 100644
+--- a/extensions/staticmod.ml
++++ b/extensions/staticmod.ml
+@@ -188,14 +188,14 @@ let parse_config userconf : parse_config_aux = fun _ _ _ ->
+ 
+       | ("regexp", s)::l when opt.opt_regexp = None ->
+           let s = try Netstring_pcre.regexp ("^"^s^"$")
+-           with Pcre.BadPattern _ ->
++           with Pcre.Error (Pcre.BadPattern _) ->
+              bad_config ("Bad regexp \""^s^"\" in <static regexp=\"...\" />")
+           in
+           parse_attrs l { opt with opt_regexp = Some s }
+ 
+       | ("code", c)::l when opt.opt_code = None ->
+           let c = try Netstring_pcre.regexp ("^"^c^"$")
+-           with Pcre.BadPattern _ ->
++           with Pcre.Error (Pcre.BadPattern _) ->
+              bad_config ("Bad regexp \""^c^"\" in <static code=\"...\" />")
+           in
+           parse_attrs l { opt with opt_code = Some c }
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..442ac2d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Fix-typo-regarding-stubdir-in-configure-script.patch
+0002-Fix-for-pcre-ocaml-6.0.0.patch
diff --git a/debian/rules b/debian/rules
index 3e358d8..d1d3b77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR := $(CURDIR)/debian/tmp
 PACKAGES := $(shell sed -nr 's/^Package: (.*)$$/\1/p' debian/control)
-
+DH := dh --with quilt
 
 override_dh_auto_configure:
 	chmod +x configure
@@ -72,12 +72,12 @@ override_dh_strip:
 	@echo Skip dh_strip because of -custom
 
 clean: ocamlinit-clean
-	dh $@
+	$(DH) $@
 
 build: ocamlinit-stamp
-	dh $@
+	$(DH) $@
 
 %:
-	dh $@
+	$(DH) $@
 
 .PHONY: build clean

-- 
ocsigen packaging