[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. debian/1.2.3-4-1-g6e98c50

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 6e98c506e66697905a85496a073ded00f2a60716
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Mar 16 10:41:20 2010 +0100

    Replace ocsigen_ext by ocsigen.ext in conf templates

diff --git a/debian/changelog b/debian/changelog
index 4e92ecf..d7fa7de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nurpawiki (1.2.3-5) UNRELEASED; urgency=low
+
+  * Replace ocsigen_ext by ocsigen.ext in conf templates
+    - add 0005-Replace-ocsigen_ext-by-ocsigen.ext-in-conf-template.patch
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 16 Mar 2010 10:43:16 +0100
+
 nurpawiki (1.2.3-4) unstable; urgency=low
 
   * debian/patches:
diff --git a/debian/ocsigen.conf.template b/debian/ocsigen.conf.template
index bdacbfc..3aa75be 100644
--- a/debian/ocsigen.conf.template
+++ b/debian/ocsigen.conf.template
@@ -12,9 +12,9 @@
     <findlib path="/usr/lib/ocsigen" />
     <findlib path="/usr/lib/ocsigen/METAS" />
 
-    <extension findlib-package="ocsigen_ext.staticmod" />
-    <extension findlib-package="ocsigen_ext.ocsipersist-sqlite"/>
-    <extension findlib-package="ocsigen_ext.eliom"/>
+    <extension findlib-package="ocsigen.ext.staticmod" />
+    <extension findlib-package="ocsigen.ext.ocsipersist-sqlite"/>
+    <extension findlib-package="ocsigen.ext.eliom"/>
 
     <host>
       <site dir="" charset="UTF-8">
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 bf3587d..95d46a5 100644
--- a/debian/patches/0004-Install-.a-file-along-with-.cmxa.patch
+++ b/debian/patches/0004-Install-.a-file-along-with-.cmxa.patch
@@ -8,7 +8,7 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 605cc42..d7e8453 100644
+index 605cc42..ef45e41 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -46,4 +46,4 @@ clean:
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
new file mode 100644
index 0000000..d62fd15
--- /dev/null
+++ b/debian/patches/0005-Replace-ocsigen_ext-by-ocsigen.ext-in-conf-template.patch
@@ -0,0 +1,34 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 16 Mar 2010 10:41:53 +0100
+Subject: [PATCH] Replace ocsigen_ext by ocsigen.ext in conf template
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ ocsigen.conf.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ocsigen.conf.in b/ocsigen.conf.in
+index 6bfc1a1..2d9815c 100644
+--- a/ocsigen.conf.in
++++ b/ocsigen.conf.in
+@@ -7,7 +7,7 @@
+     <charset>UTF-8</charset> <!-- Default charset for pages -->
+ 
+     <findlib path="%_OCSIGEN_METAS_DIR_%" />
+-    <extension findlib-package="ocsigen_ext.staticmod" />
++    <extension findlib-package="ocsigen.ext.staticmod" />
+ 
+     <library module="%_STR_CMA_%"/>
+     <library module="%_NUMS_CMA_%"/>
+@@ -20,8 +20,8 @@
+     <!-- Sqlite is needed by ocsipersist, which is used by Eliom: -->
+     <extension module="%_SQLITE3_CMA_%"/>
+ 
+-    <extension findlib-package="ocsigen_ext.ocsipersist-sqlite"/>
+-    <extension findlib-package="ocsigen_ext.eliom"/>
++    <extension findlib-package="ocsigen.ext.ocsipersist-sqlite"/>
++    <extension findlib-package="ocsigen.ext.eliom"/>
+ 
+     <host defaulthostname="localhost">
+       <site dir="" charset="UTF-8">
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 103119e..6930719 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Add-native-archive-to-META.patch
 0003-Port-to-Ocsigen-1.3.patch
 0004-Install-.a-file-along-with-.cmxa.patch
+0005-Replace-ocsigen_ext-by-ocsigen.ext-in-conf-template.patch

-- 
nurpawiki packaging