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

Mon Sep 7 20:43:46 UTC 2009

The following commit has been merged in the master branch:
commit 892853f4f9a428e6a1cb564570aa4d85eeb349aa
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Sep 7 22:13:40 2009 +0200

    New upstream version, remove all patches, update packaging

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 47f9924..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,16 +0,0 @@
-Nurpawiki 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>, Sun, 21 Jun 2009 01:50:10 +0200
diff --git a/debian/changelog b/debian/changelog
index b6ff806..8e038da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-nurpawiki (1.2.2-5) UNRELEASED; urgency=low
+nurpawiki (1.2.3-1) UNRELEASED; urgency=low
 
-  * Added two patches from Vladimir Zapolskiy (accepted upstream):
-    - support https and ftp URL schemas
-    - support tilde symbol in URIs
+  * New Upstream Version:
+    - remove 0001-Build-native-plugin.patch
   * debian/control:
+    - remove dependency to quilt
     - update runtime dependencies
     - update my e-mail address and remove DMUA
+  * Remove README.source, there is no patches anymore
 
- -- StÃ©phane Glondu <glondu at debian.org>  Mon, 07 Sep 2009 10:46:54 +0200
+ -- StÃ©phane Glondu <glondu at debian.org>  Mon, 07 Sep 2009 22:13:24 +0200
 
 nurpawiki (1.2.2-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index aceddae..1b01b31 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: StÃ©phane Glondu <glondu at debian.org>
 Build-Depends:
  debhelper (>= 7.0.52),
- quilt (>= 0.46-7),
  dh-ocaml,
  ocsigen-dev (>= 1.2.0),
  libcalendar-ocaml-dev,
diff --git a/debian/nurpawiki.docs b/debian/nurpawiki.docs
deleted file mode 100644
index f0a7c3c..0000000
--- a/debian/nurpawiki.docs
+++ /dev/null
@@ -1 +0,0 @@
-schema.psql
diff --git a/debian/nurpawiki.install.in b/debian/nurpawiki.install.in
index 565ef66..b41a16e 100644
--- a/debian/nurpawiki.install.in
+++ b/debian/nurpawiki.install.in
@@ -1,2 +1 @@
 files/* usr/share/ocsigen/nurpawiki/
-OPT: nurpawiki.cmxs usr/lib/ocsigen/nurpawiki
diff --git a/debian/patches/0001-Build-native-plugin.patch b/debian/patches/0001-Build-native-plugin.patch
deleted file mode 100644
index 09ad1de..0000000
--- a/debian/patches/0001-Build-native-plugin.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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 +++++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/META.in b/META.in
-index b66410c..7fcc3c7 100644
---- a/META.in
-+++ b/META.in
-@@ -1,3 +1,4 @@
- requires = "unix,extlib,postgresql,calendar,pcre,str"
- version = "%_NURPAWIKI_VERSION_%"
--archive(byte) = "nurpawiki.cma"
-+archive(plugin,byte) = "nurpawiki.cma"
-+archive(plugin,native) = "nurpawiki.cmxs"
-diff --git a/Makefile b/Makefile
-index 03383c2..3f3ec6b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,14 +8,20 @@ CAMLDEP = ocamlfind ocamldep
- LIB = -package threads,netstring,calendar,extlib,postgresql,ocsigen
- 
- OBJS = $(FILES:.ml=.cmo)
-+OBJX = $(FILES:.ml=.cmx)
- 
- CMA = nurpawiki.cma
-+CMX = nurpawiki.cmx
- 
- all: $(CMA) META
- 
- $(CMA): $(OBJS)
- 	$(CAMLC) -a -o $(CMA) $(OBJS)
- 
-+$(CMX)s $(CMX)a: $(OBJX)
-+	$(CAMLOPT) -a -o $(CMX)a $(OBJX)
-+	$(CAMLOPT) -shared -linkall -o $(CMX)s $(CMX)a
-+
- .SUFFIXES:
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
- 
-@@ -43,11 +49,10 @@ doc:
- #	$(CAMLDOC) -d doc -html db.mli
- 
- clean:
--	-rm -f *.cm[ioxa] *~ $(NAME)
-+	-rm -f *.cm[ioxa] *~ *.[oa] *.cmx[as] $(NAME)
- 
- install:
- 	ocamlfind install nurpawiki META $(CMA)
- 
- depend:
- 	$(CAMLDEP) $(PP) $(LIB) $(FILES:.ml=.mli) $(FILES) > .depend
--
--- 
diff --git a/debian/patches/0002-Support-additional-URL-schemas.patch b/debian/patches/0002-Support-additional-URL-schemas.patch
deleted file mode 100644
index 6e9cc44..0000000
--- a/debian/patches/0002-Support-additional-URL-schemas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 8494932..0000000
--- a/debian/patches/0003-Support-tilde-in-URI.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 0018f4d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-Build-native-plugin.patch
-0002-Support-additional-URL-schemas.patch
-0003-Support-tilde-in-URI.patch
diff --git a/debian/rules b/debian/rules
index 42d9a65..231f9d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/ocaml/ocamlinit.mk
 export OCAMLFIND_DESTDIR := debian/nurpawiki/usr/lib/ocsigen
 
 %:
-	dh --with quilt $@
+	dh $@
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build: ocamlinit

-- 
nurpawiki packaging

