[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.2-4-2-g2cb89dd

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 2cb89dd56ba5dc67bf2201e8c102c335e35a29bf
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Sep 7 10:59:18 2009 +0200

    Added two patches from Vladimir Zapolskiy (accepted upstream)

diff --git a/debian/changelog b/debian/changelog
index a7237fb..b6ff806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 nurpawiki (1.2.2-5) UNRELEASED; urgency=low
 
+  * Added two patches from Vladimir Zapolskiy (accepted upstream):
+    - support https and ftp URL schemas
+    - support tilde symbol in URIs
   * debian/control:
     - update runtime dependencies
     - update my e-mail address and remove DMUA
diff --git a/debian/patches/0001-Build-native-plugin.patch b/debian/patches/0001-Build-native-plugin.patch
index 2c5f253..09ad1de 100644
--- a/debian/patches/0001-Build-native-plugin.patch
+++ b/debian/patches/0001-Build-native-plugin.patch
@@ -2,6 +2,7 @@ From: Stephane Glondu <steph at glondu.net>
 Date: Sun, 21 Jun 2009 01:44:42 +0200
 Subject: [PATCH] Build native plugin
 
+Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
  META.in  |    3 ++-
  Makefile |    9 +++++++--
diff --git a/debian/patches/0002-Support-additional-URL-schemas.patch b/debian/patches/0002-Support-additional-URL-schemas.patch
new file mode 100644
index 0000000..6e9cc44
--- /dev/null
+++ b/debian/patches/0002-Support-additional-URL-schemas.patch
@@ -0,0 +1,32 @@
+From: Vladimir Zapolskiy <vzapolskiy at gmail.com>
+Date: Fri, 28 Aug 2009 19:06:57 +0400
+Subject: [PATCH] Support additional URL schemas.
+
+See http://code.google.com/p/nurpawiki/issues/detail?id=64 as a
+reference.
+
+Signed-off-by: Vladimir Zapolskiy <vzapolskiy at gmail.com>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ nurpawiki.ml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nurpawiki.ml b/nurpawiki.ml
+index bd7c44a..1418f29 100644
+--- a/nurpawiki.ml
++++ b/nurpawiki.ml
+@@ -145,11 +145,11 @@ module WikiML =
+     let wikilink_re = Pcre.regexp "^([!]?[A-Z][a-z]+([A-Z][a-z]+)+)"
+       
+     let wikilinkanum_re = 
+-      Pcre.regexp ("^(\\[(wiki|file|http):("^accepted_chars_sans_ws^
++      Pcre.regexp ("^(\\[(wiki|file|http|https|ftp):("^accepted_chars_sans_ws^
+                     ")[ ]+("^accepted_chars^")\\])")
+ 
+     let wikilinkanum_no_text_re = 
+-      Pcre.regexp ("^(\\[(wiki|file|http):("^accepted_chars_sans_ws^")\\])")
++      Pcre.regexp ("^(\\[(wiki|file|http|https|ftp):("^accepted_chars_sans_ws^")\\])")
+ 
+     let todo_re = 
+       Pcre.regexp ("\\[todo:([0-9]+)( "^accepted_chars^")?\\]")
+-- 
diff --git a/debian/patches/0003-Support-tilde-in-URI.patch b/debian/patches/0003-Support-tilde-in-URI.patch
new file mode 100644
index 0000000..8494932
--- /dev/null
+++ b/debian/patches/0003-Support-tilde-in-URI.patch
@@ -0,0 +1,27 @@
+From: Vladimir Zapolskiy <vzapolskiy at gmail.com>
+Date: Fri, 28 Aug 2009 19:02:24 +0400
+Subject: [PATCH] Support tilde in URI.
+
+See http://code.google.com/p/nurpawiki/issues/detail?id=65 as a
+reference.
+
+Signed-off-by: Vladimir Zapolskiy <vzapolskiy at gmail.com>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ nurpawiki.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/nurpawiki.ml b/nurpawiki.ml
+index 1418f29..2166ec4 100644
+--- a/nurpawiki.ml
++++ b/nurpawiki.ml
+@@ -128,7 +128,7 @@ module WikiML =
+             ([], List.rev acc) in
+       loop [] lines
+ 
+-    let accepted_chars_ = "a-zA-Z\128-\2550-9_!\"§°#%&/()=?+.,;:{}'@\\$\\^\\*`´<>"
++    let accepted_chars_ = "a-zA-Z\128-\2550-9_!\"§°#%&/()=?+.,;:{}'@\\$\\^\\*`´<>~"
+     let accepted_chars_sans_ws = "["^accepted_chars_^"-]+"
+     let accepted_chars = "["^accepted_chars_^" -]+"
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 5b802e3..0018f4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Build-native-plugin.patch
+0002-Support-additional-URL-schemas.patch
+0003-Support-tilde-in-URI.patch

-- 
nurpawiki packaging