[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-5-9-gde0973e
The following commit has been merged in the master branch:
commit 6430420e06061732bb53ffda6118f327b69e5ad0
Author: Stephane Glondu st...@glondu.net
Date: Mon Apr 8 17:41:34 2013 +0200
Update README.Debian
diff --git a/debian/README.Debian b/debian/README.Debian
index d478531..8a7606e 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -6,7 +6,7 @@ Nurpawiki for Debian
~~~
To use Nurpwaki, you first need to set up a PostgreSQL database. With
-Lenny's PostgreSQL (version 8.3), the steps on the SQL server are (as
+Wheezy's PostgreSQL (version 9.1), the steps on the SQL server are (as
user postgres):
1. Create a user in the database:
@@ -15,7 +15,7 @@ user postgres):
createdb -O ${DBUSER} -E UTF-8 ${DBNAME}
3. Set a password for the user accessing the database:
psql ${DBNAME} ${DBUSER}
- ALTER ${DBUSER} PASSWORD '${DBPASSWORD}';
+ ALTER ROLE ${DBUSER} PASSWORD '${DBPASSWORD}';
\q
You can take, for example, DBUSER=ocsigen and DBNAME=nurpawiki (beware
@@ -25,13 +25,14 @@ schema itself if needed.
A sample template for a configuration file is available in
/usr/share/doc/nurpawiki/examples. Filling it with proper database
user, database name and password will give you a file that can be
-run with ocsigen -c file (as root). Ocsigen will then be listening
-on port 8080, as user ocsigen, and be serving Nurpawiki only (at
-/). If satisfied, and if you don't use any other Ocsigen-based
+run with ocsigenserver -c file (as root). Ocsigen will then be
+listening on port 8080, as user ocsigen, and be serving Nurpawiki only
+(at /). If satisfied, and if you don't use any other Ocsigen-based
service, you can directly use that configuration file as
-/etc/ocsigen/ocsigen.conf and use the initscript to launch ocsigen. Of
-course, Nurpawiki can be used with other Ocsigen-based services, but
-you'll have to edit /etc/ocsigen.conf yourself.
+/etc/ocsigenserver/ocsigenserver.conf and use the initscript to launch
+ocsigenserver. Of course, Nurpawiki can be used with other
+Ocsigen-based services, but you'll have to edit
+/etc/ocsigenserver/ocsigenserver.conf yourself.
At installation, a wiki user admin with an empty password is created.
@@ -52,10 +53,11 @@ At installation, a wiki user admin with an empty password
is created.
3. Known limitations
-Ocsigen provides a /etc/ocsigen/conf.d directory for easy splitting of
-the configuration but the default /etc/ocsigen/ocsigen.conf provided
-by the ocsigen package makes it useless. This is the reason why the
-configuration part is still a bit tricky (this will hopefully be fixed
-in the future).
+Ocsigen provides a /etc/ocsigenserver/conf.d directory for easy
+splitting of the configuration but the default
+/etc/ocsigenserver/ocsigenserver.conf provided by the ocsigenserver
+package makes it useless. This is the reason why the configuration
+part is still a bit tricky (this will hopefully be fixed in the
+future).
- -- Stéphane Glondu glo...@debian.org, Mon, 7 Sep 2009 22:29:07 +0200
+ -- Stéphane Glondu glo...@debian.org, Tue, 9 Apr 2013 15:50:35 +0200
--
nurpawiki packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-5-9-gde0973e
The following commit has been merged in the master branch: commit 7215f480abab99a89c98b135cb1f77241450ca40 Author: Stephane Glondu st...@glondu.net Date: Mon Apr 8 17:09:57 2013 +0200 Refresh patches diff --git a/debian/patches/0001-Use-proper-connection-dependent-escaping.patch b/debian/patches/0001-Use-proper-connection-dependent-escaping.patch index 6be9432..2f489ee 100644 --- a/debian/patches/0001-Use-proper-connection-dependent-escaping.patch +++ b/debian/patches/0001-Use-proper-connection-dependent-escaping.patch @@ -1,13 +1,13 @@ From: Stephane Glondu st...@glondu.net Date: Sat, 19 Sep 2009 13:19:01 +0200 -Subject: [PATCH] Use proper connection-dependent escaping +Subject: Use proper connection-dependent escaping This patch needs postgresql-ocaml = 1.12.1. Signed-off-by: Stephane Glondu st...@glondu.net --- database.ml | 48 - 1 files changed, 20 insertions(+), 28 deletions(-) + 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/database.ml b/database.ml index fa0d5bd..a08037e 100644 diff --git a/debian/patches/0002-Add-native-archive-to-META.patch b/debian/patches/0002-Add-native-archive-to-META.patch index 8a21bda..ceec394 100644 --- a/debian/patches/0002-Add-native-archive-to-META.patch +++ b/debian/patches/0002-Add-native-archive-to-META.patch @@ -1,11 +1,11 @@ From: Stephane Glondu st...@glondu.net Date: Sun, 20 Sep 2009 00:15:00 +0200 -Subject: [PATCH] Add native archive to META +Subject: Add native archive to META Signed-off-by: Stephane Glondu st...@glondu.net --- META.in |1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) diff --git a/META.in b/META.in index b66410c..cf27702 100644 diff --git a/debian/patches/0003-Port-to-Ocsigen-1.3.patch b/debian/patches/0003-Port-to-Ocsigen-1.3.patch index c48bd1e..d853534 100644 --- a/debian/patches/0003-Port-to-Ocsigen-1.3.patch +++ b/debian/patches/0003-Port-to-Ocsigen-1.3.patch @@ -1,6 +1,6 @@ From: Stephane Glondu st...@glondu.net Date: Mon, 15 Mar 2010 15:19:49 +0100 -Subject: [PATCH] Port to Ocsigen 1.3 +Subject: Port to Ocsigen 1.3 Signed-off-by: Stephane Glondu st...@glondu.net --- diff --git a/debian/patches/0004-Install-.a-file-along-with-.cmxa.patch b/debian/patches/0004-Install-.a-file-along-with-.cmxa.patch index 95d46a5..4656ce4 100644 --- a/debian/patches/0004-Install-.a-file-along-with-.cmxa.patch +++ b/debian/patches/0004-Install-.a-file-along-with-.cmxa.patch @@ -1,11 +1,11 @@ From: Stephane Glondu st...@glondu.net Date: Mon, 15 Mar 2010 15:37:45 +0100 -Subject: [PATCH] Install .a file along with .cmxa +Subject: Install .a file along with .cmxa Signed-off-by: Stephane Glondu st...@glondu.net --- Makefile |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 605cc42..ef45e41 100644 diff --git a/debian/patches/0005-Replace-ocsigen_ext-by-ocsigen.ext-in-conf-template.patch b/debian/patches/0005-Replace-ocsigen_ext-by-ocsigen.ext-in-conf-template.patch index d62fd15..0b266f8 100644 --- a/debian/patches/0005-Replace-ocsigen_ext-by-ocsigen.ext-in-conf-template.patch +++ b/debian/patches/0005-Replace-ocsigen_ext-by-ocsigen.ext-in-conf-template.patch @@ -1,11 +1,11 @@ From: Stephane Glondu st...@glondu.net Date: Tue, 16 Mar 2010 10:41:53 +0100 -Subject: [PATCH] Replace ocsigen_ext by ocsigen.ext in conf template +Subject: Replace ocsigen_ext by ocsigen.ext in conf template Signed-off-by: Stephane Glondu st...@glondu.net --- ocsigen.conf.in |6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ocsigen.conf.in b/ocsigen.conf.in index 6bfc1a1..2d9815c 100644 -- nurpawiki packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-5-9-gde0973e
The following commit has been merged in the master branch: commit 817fd0dca0718d5ae9463019cab2d8aeb2a9091a Author: Stephane Glondu st...@glondu.net Date: Mon Apr 8 17:12:30 2013 +0200 Update debian/watch (contributed by Bart Martens) diff --git a/debian/watch b/debian/watch index d285364..13a144f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,5 @@ -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 - -http://code.google.com/p/nurpawiki/ http://nurpawiki\.googlecode\.com/files/nurpawiki-(.*)\.tar\.gz +opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\ +downloadurlmangle=s%.*/([^/]*)/downloads/detail\?name=([^=]*).*%http://$1.googlecode.com/files/$2%,filenamemangle=s/.*name=([^]+).*/$1/ \ +http://code.google.com/p/nurpawiki/downloads/list?can=1 .*=nurpawiki-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)|zip).* +# Bart Martens ba...@debian.org Sat, 19 Jan 2013 13:20:56 + -- nurpawiki packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-5-9-gde0973e
The following commit has been merged in the master branch:
commit a639407ff8ad2b05a54991b2e6df9a362ef67276
Author: Stephane Glondu st...@glondu.net
Date: Mon Apr 8 17:41:26 2013 +0200
Remove obsolete README.source
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 47f9924..000
--- 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 st...@glondu.net, Sun, 21 Jun 2009 01:50:10 +0200
--
nurpawiki packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-5-9-gde0973e
The following commit has been merged in the master branch: commit acf34ba8acd94fa51160e3304fa80d1c4ae30c1f Author: Stephane Glondu st...@glondu.net Date: Tue Apr 9 15:29:36 2013 +0200 Update configuration file template * install data in /usr/share/nurpawiki diff --git a/debian/nurpawiki.dirs b/debian/nurpawiki.dirs deleted file mode 100644 index 3510059..000 --- a/debian/nurpawiki.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/ocsigen -usr/share/ocsigen/nurpawiki diff --git a/debian/nurpawiki.examples b/debian/nurpawiki.examples index 22783d2..5594723 100644 --- a/debian/nurpawiki.examples +++ b/debian/nurpawiki.examples @@ -1 +1 @@ -debian/ocsigen.conf.template +debian/ocsigenserver.conf.template diff --git a/debian/nurpawiki.install.in b/debian/nurpawiki.install.in index b41a16e..ac5678c 100644 --- a/debian/nurpawiki.install.in +++ b/debian/nurpawiki.install.in @@ -1 +1 @@ -files/* usr/share/ocsigen/nurpawiki/ +files/* usr/share/nurpawiki/ diff --git a/debian/ocsigen.conf.template b/debian/ocsigenserver.conf.template similarity index 59% rename from debian/ocsigen.conf.template rename to debian/ocsigenserver.conf.template index 3aa75be..9e10d5e 100644 --- a/debian/ocsigen.conf.template +++ b/debian/ocsigenserver.conf.template @@ -1,20 +1,19 @@ ocsigen server port8080/port !-- The port for the server -- -logdir/var/log/ocsigen/logdir !-- Where log files are to be written -- -datadir/var/lib/ocsigen/datadir +logdir/var/log/ocsigenserver/logdir !-- Where log files are to be written -- +datadir/var/lib/ocsigenserver/datadir userocsigen/user !-- The user who will run Ocsigen (not root!) -- groupocsigen/group !-- The group (not root!) -- charsetUTF-8/charset !-- Default charset for pages -- -findlib path=/usr/lib/ocsigen / -findlib path=/usr/lib/ocsigen/METAS / +findlib path=/usr/lib/ocaml / -extension findlib-package=ocsigen.ext.staticmod / -extension findlib-package=ocsigen.ext.ocsipersist-sqlite/ -extension findlib-package=ocsigen.ext.eliom/ +extension findlib-package=ocsigenserver.ext.staticmod / +extension findlib-package=ocsigenserver.ext.ocsipersist-sqlite/ +extension findlib-package=eliom.server/ host site dir= charset=UTF-8 @@ -26,7 +25,7 @@ database name=%_DBNAME_% user=%_DBUSER_% password=%_DBPASSWD_% / /eliom -static dir=/usr/share/ocsigen/nurpawiki / +static dir=/usr/share/nurpawiki / /site /host /server -- nurpawiki packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-5-9-gde0973e
The following commit has been merged in the master branch: commit de0973e9cfc7a6a64fce1b7a30fbdec0a8c89f81 Author: Stephane Glondu st...@glondu.net Date: Mon Apr 8 17:11:28 2013 +0200 Update changelog and prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index d3e453c..643ee60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +nurpawiki (1.2.3-6) experimental; urgency=low + + * Port to Ocsigen 2 / Eliom 3 +- use ocsigenserver instead of ocsigen + * Update README.Debian + * Update debian/watch (contributed by Bart Martens) + * Switch copyright file to format 1.0 + * Bump Standards-Version to 3.9.3 + * Remove obsolete README.source + + -- Stéphane Glondu glo...@debian.org Tue, 09 Apr 2013 15:51:56 +0200 + nurpawiki (1.2.3-5) unstable; urgency=low * Replace ocsigen_ext by ocsigen.ext in conf templates -- nurpawiki packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
