[Pkg-ocaml-maint-commits] [nurpawiki] 01/05: Refresh patches
Stéphane Glondu
glondu at moszumanska.debian.org
Wed Jul 23 11:48:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository nurpawiki.
commit 7c0b548382edb88aa4765f1e4bdea58613ed16a8
Author: Stephane Glondu <steph at glondu.net>
Date: Wed Jul 23 12:49:59 2014 +0200
Refresh patches
---
...-Use-proper-connection-dependent-escaping.patch | 2 +-
.../patches/0002-Add-native-archive-to-META.patch | 2 +-
debian/patches/0003-Port-to-Ocsigen-1.3.patch | 10 +++---
.../0004-Install-.a-file-along-with-.cmxa.patch | 2 +-
...sigen_ext-by-ocsigen.ext-in-conf-template.patch | 2 +-
.../patches/0006-Port-to-Ocsigen-2-Eliom-3.patch | 38 +++++++++++-----------
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/debian/patches/0001-Use-proper-connection-dependent-escaping.patch b/debian/patches/0001-Use-proper-connection-dependent-escaping.patch
index 2f489ee..4121142 100644
--- a/debian/patches/0001-Use-proper-connection-dependent-escaping.patch
+++ b/debian/patches/0001-Use-proper-connection-dependent-escaping.patch
@@ -6,7 +6,7 @@ This patch needs postgresql-ocaml >= 1.12.1.
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- database.ml | 48 ++++++++++++++++++++----------------------------
+ database.ml | 48 ++++++++++++++++++++----------------------------
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/database.ml b/database.ml
diff --git a/debian/patches/0002-Add-native-archive-to-META.patch b/debian/patches/0002-Add-native-archive-to-META.patch
index ceec394..529d2ab 100644
--- a/debian/patches/0002-Add-native-archive-to-META.patch
+++ b/debian/patches/0002-Add-native-archive-to-META.patch
@@ -4,7 +4,7 @@ Subject: Add native archive to META
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- META.in | 1 +
+ META.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/META.in b/META.in
diff --git a/debian/patches/0003-Port-to-Ocsigen-1.3.patch b/debian/patches/0003-Port-to-Ocsigen-1.3.patch
index d853534..4e0c207 100644
--- a/debian/patches/0003-Port-to-Ocsigen-1.3.patch
+++ b/debian/patches/0003-Port-to-Ocsigen-1.3.patch
@@ -4,11 +4,11 @@ Subject: Port to Ocsigen 1.3
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- main.ml | 28 ++++++++++++----------------
- scheduler.ml | 6 +++---
- services.ml | 2 +-
- session.ml | 34 ++++++++++++++++------------------
- types.ml | 6 +++---
+ main.ml | 28 ++++++++++++----------------
+ scheduler.ml | 6 +++---
+ services.ml | 2 +-
+ session.ml | 34 ++++++++++++++++------------------
+ types.ml | 6 +++---
5 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/main.ml b/main.ml
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 4656ce4..5964e56 100644
--- a/debian/patches/0004-Install-.a-file-along-with-.cmxa.patch
+++ b/debian/patches/0004-Install-.a-file-along-with-.cmxa.patch
@@ -4,7 +4,7 @@ Subject: Install .a file along with .cmxa
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- Makefile | 2 +-
+ Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
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 0b266f8..cd03c68 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
@@ -4,7 +4,7 @@ Subject: Replace ocsigen_ext by ocsigen.ext in conf template
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- ocsigen.conf.in | 6 +++---
+ ocsigen.conf.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ocsigen.conf.in b/ocsigen.conf.in
diff --git a/debian/patches/0006-Port-to-Ocsigen-2-Eliom-3.patch b/debian/patches/0006-Port-to-Ocsigen-2-Eliom-3.patch
index f15e7c6..0702bef 100644
--- a/debian/patches/0006-Port-to-Ocsigen-2-Eliom-3.patch
+++ b/debian/patches/0006-Port-to-Ocsigen-2-Eliom-3.patch
@@ -22,25 +22,25 @@ Summary of changes:
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- Makefile | 6 +-
- about.ml | 21 +--
- config.ml | 5 +-
- database.ml | 114 ++++++++------
- database.mli | 61 ++++----
- database_schema.ml | 5 +-
- database_upgrade.ml | 19 ++-
- gen_ocsigen_config | 4 +-
- history.ml | 81 +++++-----
- html_util.ml | 104 ++++++-------
- main.ml | 413 +++++++++++++++++++++++++------------------------
- ocsigen.conf.in | 46 ------
- ocsigenserver.conf.in | 46 ++++++
- page_revisions.ml | 40 +++--
- privileges.ml | 16 +-
- scheduler.ml | 216 +++++++++++++-------------
- services.ml | 47 +++---
- session.ml | 187 +++++++++++-----------
- user_editor.ml | 163 ++++++++++---------
+ Makefile | 6 +-
+ about.ml | 21 +--
+ config.ml | 5 +-
+ database.ml | 114 ++++++++------
+ database.mli | 61 ++++----
+ database_schema.ml | 5 +-
+ database_upgrade.ml | 19 ++-
+ gen_ocsigen_config | 4 +-
+ history.ml | 81 +++++-----
+ html_util.ml | 104 +++++++------
+ main.ml | 413 ++++++++++++++++++++++++++------------------------
+ ocsigen.conf.in | 46 ------
+ ocsigenserver.conf.in | 46 ++++++
+ page_revisions.ml | 40 +++--
+ privileges.ml | 16 +-
+ scheduler.ml | 216 +++++++++++++-------------
+ services.ml | 47 +++---
+ session.ml | 187 +++++++++++------------
+ user_editor.ml | 163 ++++++++++----------
19 files changed, 807 insertions(+), 787 deletions(-)
delete mode 100644 ocsigen.conf.in
create mode 100644 ocsigenserver.conf.in
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/nurpawiki.git
More information about the Pkg-ocaml-maint-commits
mailing list