[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.0-4-4-g7b12333
Stephane Glondu
steph at glondu.net
Sun Apr 25 14:03:27 UTC 2010
The following commit has been merged in the master branch:
commit de537f1c9b44f79f0c30a59960e9ccca434be905
Author: Stephane Glondu <steph at glondu.net>
Date: Fri Apr 23 23:51:36 2010 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index c51d0c7..2dc5850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ocsigen (1.3.1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - the web server should now be insensitive to the net.ipv6.bindv6only
+ sysctl setting (Closes: #578216)
+ - remove all patches (committed upstream)
+
+ -- Stéphane Glondu <glondu at debian.org> Fri, 23 Apr 2010 23:51:18 +0200
+
ocsigen (1.3.0-4) unstable; urgency=low
* Fix FTBFS on hppa:
diff --git a/debian/patches/0001-Split-out-ocsigen_xhtml-findlib-package.patch b/debian/patches/0001-Split-out-ocsigen_xhtml-findlib-package.patch
deleted file mode 100644
index da33ad1..0000000
--- a/debian/patches/0001-Split-out-ocsigen_xhtml-findlib-package.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sun, 21 Mar 2010 22:42:27 +0100
-Subject: [PATCH] Split out ocsigen_xhtml findlib package
-
-The XHTML part can be used independently of the rest of Ocsigen.
-
-Committed in upstream darcs repository.
----
- Makefile | 9 ++++++++-
- baselib/ocsigen_config.ml.in | 6 ++----
- files/META.in | 18 +-----------------
- files/META.ocsigen_xhtml.in | 14 ++++++++++++++
- 4 files changed, 25 insertions(+), 22 deletions(-)
- create mode 100644 files/META.ocsigen_xhtml.in
-
-diff --git a/Makefile b/Makefile
-index 8bef0b8..3d7772a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,6 +8,7 @@ DOCPREF=./
- SED_COMMAND_FOR_META =
- SED_COMMAND_FOR_META += -e "s/_VERSION_/$(VERSION)/"
- SED_COMMAND_FOR_META += -e "s/_CAMLZIPNAME_/$(CAMLZIPNAME)/"
-+SED_COMMAND_FOR_META += -e "s at _DIRECTORY_@$(MODULEINSTALLDIR)/$(OCSIGENNAME)@"
-
- ifeq "$(OCAMLDUCE)" "YES"
- DUCECMA=eliom/eliom_duce.cma
-@@ -92,7 +93,7 @@ DOC= $(DOCPREF)eliom/eliom_mkforms.mli $(DOCPREF)eliom/eliom_mkreg.mli \
- $(DOCPREF)xmlp4/newocaml/pp/xhtmltypes.ml \
- $(DUCEDOC)
-
--METAS = files/META files/META.ocsigen files/META.eliom_examples files/META.eliom_examples.global
-+METAS = files/META files/META.ocsigen_xhtml files/META.ocsigen files/META.eliom_examples files/META.eliom_examples.global
-
-
- INSTALL = install
-@@ -194,6 +195,7 @@ TOINSTALL=$(TOINSTALLBYTE) $(TOINSTALLX) $(CMITOINSTALL) $(PLUGINSCMITOINSTALL)
- EXAMPLES=$(EXAMPLESBYTE) $(EXAMPLESOPT) $(EXAMPLESCMI)
-
- REPS=$(TARGETSBYTE:.byte=)
-+STD_METAS_DIR=$(MODULEINSTALLDIR)
-
- all: $(BYTE) $(OPT) $(OCSIGENNAME).conf.local $(METAS)
-
-@@ -279,6 +281,9 @@ doc/index.html: doc
- files/META: files/META.in VERSION
- sed $(SED_COMMAND_FOR_META) < $< > $@
-
-+files/META.ocsigen_xhtml: files/META.ocsigen_xhtml.in VERSION
-+ sed $(SED_COMMAND_FOR_META) < $< > $@
-+
- files/META.ocsigen: files/META.in VERSION
- -ln -sf ../eliom/eliom.cma extensions
- -ln -sf ../eliom/eliom_duce.cma extensions
-@@ -368,6 +373,7 @@ partialinstall:
- mkdir -p $(TEMPROOT)$(EXAMPLESINSTALLDIR)
- mkdir -p $(TEMPROOT)$(EXTRALIBDIR)/METAS
- mkdir -p $(TEMPROOT)$(EXTRALIBDIR)/extensions
-+ mkdir -p $(TEMPROOT)$(STD_METAS_DIR)
- $(MAKE) -C server install
- mkdir -p "$(TEMPROOT)$(MODULEINSTALLDIR)"
- $(OCAMLFIND) install $(OCSIGENNAME) -destdir "$(TEMPROOT)$(MODULEINSTALLDIR)" $(TOINSTALL)
-@@ -378,6 +384,7 @@ partialinstall:
- $(INSTALL) -m 755 extensions/ocsipersist-dbm/ocsidbm.opt $(TEMPROOT)$(EXTRALIBDIR)/extensions
- # $(INSTALL) -m 644 META.ocsigen_ext.global $(TEMPROOT)$(EXTRALIBDIR)/METAS/META.ocsigen_ext
- $(INSTALL) -m 644 files/META.eliom_examples.global $(TEMPROOT)$(EXTRALIBDIR)/METAS/META.eliom_examples
-+ $(INSTALL) -m 644 files/META.ocsigen_xhtml $(TEMPROOT)$(STD_METAS_DIR)
- chmod a+rx $(TEMPROOT)$(MODULEINSTALLDIR)/$(OCSIGENNAME)
- chmod a+r $(TEMPROOT)$(MODULEINSTALLDIR)/$(OCSIGENNAME)/*
- chmod a+rx $(TEMPROOT)$(MODULEINSTALLDIR)
-diff --git a/baselib/ocsigen_config.ml.in b/baselib/ocsigen_config.ml.in
-index ca6b22e..bd0d673 100644
---- a/baselib/ocsigen_config.ml.in
-+++ b/baselib/ocsigen_config.ml.in
-@@ -41,8 +41,8 @@ let builtin_packages =
- ["unix"; "threads"; "ssl"; "react"; "lwt.unix";
- "lwt"; "lwt.preemptive"; "lwt.ssl"; "lwt.extra";
- "netstring"; "netsys"; "pcre"; "dynlink"; "findlib";
-- "ocsigen"; "ocsigen.server"; "ocsigen.xhtml";
-- "ocsigen.xhtml"; "camlp4.lib"; "ocsigen.ext.polytables"]
-+ "ocsigen"; "ocsigen.server"; "ocsigen_xhtml";
-+ "camlp4.lib"; "ocsigen.ext.polytables"]
-
- (* Server config: *)
- let (uploaddir : string option ref) = ref None
-@@ -159,5 +159,3 @@ let display_version () =
- print_string version_number;
- print_newline ();
- exit 0
--
--
-diff --git a/files/META.in b/files/META.in
-index 9b350dc..8d12631 100644
---- a/files/META.in
-+++ b/files/META.in
-@@ -2,22 +2,6 @@ description = "Libraries for Ocsigen"
- version = "_VERSION_"
- requires = "netstring,netsys,ssl,pcre,unix,dynlink,threads,lwt"
-
--package "xhtml" (
-- requires = "netstring"
-- version = "[distributed with Ocsigen]"
-- description = "XHTML pages typed with variants"
-- archive(byte) = "xhtml.cma xhtmlpretty.cma"
-- archive(native) = "xhtml.cmxa xhtmlpretty.cmxa"
--
--package "syntax" (
-- description = "XHTML syntax extension"
-- version = "[distributed with Ocsigen]"
-- requires = "ocsigen.xhtml,camlp4"
-- archive(syntax,preprocessor) = "xhtmlsyntax.cma"
-- archive(syntax,toploop) = "xhtmlsyntax.cma"
-- )
--)
--
- package "polytables" (
- exists_if = "polytables.cmo,polytables.cmx"
- version = "[distributed with Ocsigen]"
-@@ -36,7 +20,7 @@ package "commandline" (
- )
-
- package "server" (
-- requires = "lwt.extra,lwt.ssl,lwt.preemptive,ocsigen.commandline,ocsigen,ocsigen.xhtml,findlib,camlp4.lib"
-+ requires = "lwt.extra,lwt.ssl,lwt.preemptive,ocsigen.commandline,ocsigen,ocsigen_xhtml,findlib,camlp4.lib"
- version = "_VERSION_"
- description = "Ocsigen server library"
- archive(byte) = "ocsigen.cma"
-diff --git a/files/META.ocsigen_xhtml.in b/files/META.ocsigen_xhtml.in
-new file mode 100644
-index 0000000..d219eb6
---- /dev/null
-+++ b/files/META.ocsigen_xhtml.in
-@@ -0,0 +1,14 @@
-+description = "XHTML pages typed with polymorphic variants"
-+version = "_VERSION_"
-+requires = "netstring"
-+directory = "_DIRECTORY_"
-+archive(byte) = "xhtml.cma xhtmlpretty.cma"
-+archive(native) = "xhtml.cmxa xhtmlpretty.cmxa"
-+
-+package "syntax" (
-+ description = "XHTML syntax extension"
-+ version = "_VERSION_"
-+ requires = "ocsigen_xhtml,camlp4"
-+ archive(syntax,preprocessor) = "xhtmlsyntax.cma"
-+ archive(syntax,toploop) = "xhtmlsyntax.cma"
-+)
---
diff --git a/debian/patches/0002-Do-not-compile-dbm-test-with-custom.patch b/debian/patches/0002-Do-not-compile-dbm-test-with-custom.patch
deleted file mode 100644
index 493a624..0000000
--- a/debian/patches/0002-Do-not-compile-dbm-test-with-custom.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Mon, 22 Mar 2010 22:28:20 +0100
-Subject: [PATCH] Do not compile dbm test with -custom
-
-On the hppa port of Debian, ld doesn't like outputting to
-/dev/null. Seems related to Debian bug #350239.
----
- configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 9db7247..16c7156 100755
---- a/configure
-+++ b/configure
-@@ -630,7 +630,7 @@ fi
-
- if [ "$enable_dbm" -gt 0 ]; then
- printf "%s" "Checking for dbm... "
-- if ocamlc -custom -o /dev/null dbm.cma >/dev/null 2>/dev/null; then
-+ if ocamlc -o /dev/null dbm.cma >/dev/null 2>/dev/null; then
- echo "found"
- elif [ "$enable_dbm" -gt 1 ]; then
- echo "not found, but --enable-dbm specified"
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8ccd397..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Split-out-ocsigen_xhtml-findlib-package.patch
-0002-Do-not-compile-dbm-test-with-custom.patch
--
ocsigen packaging
More information about the Pkg-ocaml-maint-commits
mailing list