[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-5-9-gde0973e

[Stephane Glondu]

The following commit has been merged in the master branch:
commit acf34ba8acd94fa51160e3304fa80d1c4ae30c1f
Author: Stephane Glondu <steph at 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..0000000
--- 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>
     <port>8080</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>
 
     <user>ocsigen</user>   <!-- The user who will run Ocsigen (not root!) -->
     <group>ocsigen</group> <!-- The group (not root!) -->
 
     <charset>UTF-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