[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.0-2-6-gf16e9e3
Stephane Glondu
steph at glondu.net
Mon Mar 22 00:03:24 UTC 2010
The following commit has been merged in the master branch:
commit 906777a7f94ee472b31705d8efc812cd727d7fca
Author: Stephane Glondu <steph at glondu.net>
Date: Mon Mar 22 00:25:40 2010 +0100
Split out libxhtml-ocaml-dev, revisit binary package dispatch
diff --git a/debian/control b/debian/control
index c388b87..87639db 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Samuel Mimram <smimram at debian.org>,
Stefano Zacchiroli <zack at debian.org>
Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 7.1.0~),
ocaml-nox (>= 3.11.1-3~),
camlp4-extra,
ocaml-findlib (>= 1.2.5),
@@ -96,8 +96,14 @@ Depends:
${shlibs:Depends},
${misc:Depends}
Provides: ${ocaml:Provides}
-Replaces: ocsigen (<< 1.2.2), ocsigen-dev (<< 1.2.2)
-Conflicts: ocsigen (<< 1.2.2), ocsigen-dev (<< 1.2.2)
+Replaces:
+ ocsigen (<< 1.2.2),
+ ocsigen-dev (<< 1.2.2),
+ libocsigen-ocaml-dev (<< 1.3.0-3~)
+Conflicts:
+ ocsigen (<< 1.2.2),
+ ocsigen-dev (<< 1.2.2),
+ libocsigen-ocaml-dev (<< 1.3.0-3~)
Breaks: nurpawiki (<< 1.2.3-4~)
Description: runtime librairies for Ocsigen
Ocsigen is a Web server and a programming framework providing a new
@@ -131,3 +137,20 @@ Description: development librairies for Ocsigen
.
This package contains development files for compiling Ocsigen
extensions and Eliom modules.
+
+Package: libocsigen-xhtml-ocaml-dev
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: ocaml-findlib, libocsigen-ocaml-doc
+Replaces: libocsigen-ocaml-dev (<< 1.3.0-3~)
+Conflicts: libocsigen-ocaml-dev (<< 1.3.0-3~)
+Description: Ocsigen XHTML generation library
+ This package provides the XHTML generation library of Ocsigen, to
+ generate statically typed XHTML pages. Typing is achieved with
+ polymorphic variants. This library can be used independently of
+ Ocsigen. This package contains development files needed to use this
+ library alone.
diff --git a/debian/libocsigen-ocaml-dev.install.in b/debian/libocsigen-ocaml-dev.install.in
index 575e1d1..9061230 100644
--- a/debian/libocsigen-ocaml-dev.install.in
+++ b/debian/libocsigen-ocaml-dev.install.in
@@ -1 +1,125 @@
- at OCamlStdlibDir@/ocsigen
+ at OCamlStdlibDir@/ocsigen/META
+ at OCamlStdlibDir@/ocsigen/accesscontrol.cmi
+ at OCamlStdlibDir@/ocsigen/accesscontrol.mli
+ at OCamlStdlibDir@/ocsigen/eliom_common.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_common.mli
+ at OCamlStdlibDir@/ocsigen/eliom_duce.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_duce.mli
+ at OCamlStdlibDir@/ocsigen/eliom_duce_tools.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_duce_tools.mli
+ at OCamlStdlibDir@/ocsigen/eliom_extensions.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_extensions.mli
+ at OCamlStdlibDir@/ocsigen/eliom_mkforms.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_mkforms.mli
+ at OCamlStdlibDir@/ocsigen/eliom_mkreg.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_mkreg.mli
+ at OCamlStdlibDir@/ocsigen/eliom_obrowser.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_obrowser.js
+ at OCamlStdlibDir@/ocsigen/eliom_obrowser.mli
+ at OCamlStdlibDir@/ocsigen/eliom_obrowser_client.cma
+ at OCamlStdlibDir@/ocsigen/eliom_obrowser_client.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_parameters.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_parameters.mli
+ at OCamlStdlibDir@/ocsigen/eliom_predefmod.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_predefmod.mli
+ at OCamlStdlibDir@/ocsigen/eliom_services.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_services.mli
+ at OCamlStdlibDir@/ocsigen/eliom_sessions.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_sessions.mli
+ at OCamlStdlibDir@/ocsigen/eliom_tools.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_tools.mli
+ at OCamlStdlibDir@/ocsigen/eliom_tools_common.cmi
+ at OCamlStdlibDir@/ocsigen/eliom_tools_common.mli
+ at OCamlStdlibDir@/ocsigen/eliommod.cmi
+ at OCamlStdlibDir@/ocsigen/extendconfiguration.cmi
+ at OCamlStdlibDir@/ocsigen/framepp.cmi
+ at OCamlStdlibDir@/ocsigen/framepp.mli
+ at OCamlStdlibDir@/ocsigen/http_headers.cmi
+ at OCamlStdlibDir@/ocsigen/http_headers.mli
+ at OCamlStdlibDir@/ocsigen/lwt_obrowser.cmi
+ at OCamlStdlibDir@/ocsigen/lwt_obrowser.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen.cma
+ at OCamlStdlibDir@/ocsigen/ocsigen_LocalFiles.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_LocalFiles.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_cache.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_cache.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_charset_mime.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_charset_mime.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_config.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_config.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_extensions.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_extensions.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_getcommandline.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_getcommandline.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_headers.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_headers.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_http_client.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_http_client.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_http_com.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_http_com.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_http_frame.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_http_frame.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_lib.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_lib.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_messages.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_messages.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_parseconfig.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_parseconfig.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_senders.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_senders.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_server.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_server.mli
+ at OCamlStdlibDir@/ocsigen/ocsigen_stream.cmi
+ at OCamlStdlibDir@/ocsigen/ocsigen_stream.mli
+ at OCamlStdlibDir@/ocsigen/ocsipersist.cmi
+ at OCamlStdlibDir@/ocsigen/ocsipersist.mli
+ at OCamlStdlibDir@/ocsigen/pa_eliom_obrowser.cmo
+ at OCamlStdlibDir@/ocsigen/polytables.cmi
+ at OCamlStdlibDir@/ocsigen/polytables.mli
+ at OCamlStdlibDir@/ocsigen/server_main.cmo
+ at OCamlStdlibDir@/ocsigen/simplexmlparser.cmi
+ at OCamlStdlibDir@/ocsigen/simplexmlparser.mli
+ at OCamlStdlibDir@/ocsigen/xhtmlpretty_streams.cmi
+ at OCamlStdlibDir@/ocsigen/xhtmlpretty_streams.mli
+ at OCamlStdlibDir@/ocsigen/xhtmltypes_duce.cmi
+OPT: @OCamlStdlibDir@/ocsigen/accesscontrol.cmx
+OPT: @OCamlStdlibDir@/ocsigen/accesscontrol.o
+OPT: @OCamlStdlibDir@/ocsigen/authbasic.cmx
+OPT: @OCamlStdlibDir@/ocsigen/authbasic.o
+OPT: @OCamlStdlibDir@/ocsigen/cgimod.cmx
+OPT: @OCamlStdlibDir@/ocsigen/cgimod.o
+OPT: @OCamlStdlibDir@/ocsigen/deflatemod.cmx
+OPT: @OCamlStdlibDir@/ocsigen/deflatemod.o
+OPT: @OCamlStdlibDir@/ocsigen/donotparsecommandline.a
+OPT: @OCamlStdlibDir@/ocsigen/donotparsecommandline.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/eliom.a
+OPT: @OCamlStdlibDir@/ocsigen/eliom.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/eliom_duce.a
+OPT: @OCamlStdlibDir@/ocsigen/eliom_duce.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/extendconfiguration.cmx
+OPT: @OCamlStdlibDir@/ocsigen/extendconfiguration.o
+OPT: @OCamlStdlibDir@/ocsigen/libocsigen.a
+OPT: @OCamlStdlibDir@/ocsigen/ocsigen.a
+OPT: @OCamlStdlibDir@/ocsigen/ocsigen.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/ocsipersist-dbm.a
+OPT: @OCamlStdlibDir@/ocsigen/ocsipersist-dbm.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/ocsipersist-sqlite.a
+OPT: @OCamlStdlibDir@/ocsigen/ocsipersist-sqlite.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/outputfilter.cmx
+OPT: @OCamlStdlibDir@/ocsigen/outputfilter.o
+OPT: @OCamlStdlibDir@/ocsigen/parsecommandline.a
+OPT: @OCamlStdlibDir@/ocsigen/parsecommandline.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/polytables.cmx
+OPT: @OCamlStdlibDir@/ocsigen/polytables.o
+OPT: @OCamlStdlibDir@/ocsigen/redirectmod.cmx
+OPT: @OCamlStdlibDir@/ocsigen/redirectmod.o
+OPT: @OCamlStdlibDir@/ocsigen/revproxy.cmx
+OPT: @OCamlStdlibDir@/ocsigen/revproxy.o
+OPT: @OCamlStdlibDir@/ocsigen/rewritemod.cmx
+OPT: @OCamlStdlibDir@/ocsigen/rewritemod.o
+OPT: @OCamlStdlibDir@/ocsigen/server_main.cmx
+OPT: @OCamlStdlibDir@/ocsigen/server_main.o
+OPT: @OCamlStdlibDir@/ocsigen/staticmod.cmx
+OPT: @OCamlStdlibDir@/ocsigen/staticmod.o
+OPT: @OCamlStdlibDir@/ocsigen/userconf.cmx
+OPT: @OCamlStdlibDir@/ocsigen/userconf.o
diff --git a/debian/libocsigen-ocaml.install.in b/debian/libocsigen-ocaml.install.in
index b7e19a4..6f2969c 100644
--- a/debian/libocsigen-ocaml.install.in
+++ b/debian/libocsigen-ocaml.install.in
@@ -1,2 +1,38 @@
@OCamlDllDir@/*
+ at OCamlStdlibDir@/ocsigen/accesscontrol.cmo
+ at OCamlStdlibDir@/ocsigen/authbasic.cmo
+ at OCamlStdlibDir@/ocsigen/cgimod.cmo
+ at OCamlStdlibDir@/ocsigen/deflatemod.cmo
+ at OCamlStdlibDir@/ocsigen/donotparsecommandline.cma
+ at OCamlStdlibDir@/ocsigen/eliom.cma
+ at OCamlStdlibDir@/ocsigen/eliom_duce.cma
+ at OCamlStdlibDir@/ocsigen/extendconfiguration.cmo
+ at OCamlStdlibDir@/ocsigen/ocsipersist-dbm.cma
+ at OCamlStdlibDir@/ocsigen/ocsipersist-sqlite.cma
+ at OCamlStdlibDir@/ocsigen/outputfilter.cmo
+ at OCamlStdlibDir@/ocsigen/parsecommandline.cma
+ at OCamlStdlibDir@/ocsigen/polytables.cmo
+ at OCamlStdlibDir@/ocsigen/redirectmod.cmo
+ at OCamlStdlibDir@/ocsigen/revproxy.cmo
+ at OCamlStdlibDir@/ocsigen/rewritemod.cmo
+ at OCamlStdlibDir@/ocsigen/staticmod.cmo
+ at OCamlStdlibDir@/ocsigen/userconf.cmo
+OPT: @OCamlStdlibDir@/ocsigen/accesscontrol.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/authbasic.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/cgimod.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/deflatemod.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/donotparsecommandline.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/eliom.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/eliom_duce.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/extendconfiguration.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/ocsipersist-dbm.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/ocsipersist-sqlite.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/outputfilter.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/parsecommandline.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/polytables.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/redirectmod.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/revproxy.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/rewritemod.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/staticmod.cmxs
+OPT: @OCamlStdlibDir@/ocsigen/userconf.cmxs
usr/lib/ocsigen
diff --git a/debian/libocsigen-xhtml-ocaml-dev.install.in b/debian/libocsigen-xhtml-ocaml-dev.install.in
new file mode 100644
index 0000000..4eb0ddb
--- /dev/null
+++ b/debian/libocsigen-xhtml-ocaml-dev.install.in
@@ -0,0 +1,19 @@
+ at OCamlStdlibDir@/METAS/META.ocsigen_xhtml
+ at OCamlStdlibDir@/ocsigen/xHTML.cmi
+ at OCamlStdlibDir@/ocsigen/xHTML.mli
+ at OCamlStdlibDir@/ocsigen/xML.cmi
+ at OCamlStdlibDir@/ocsigen/xML.mli
+ at OCamlStdlibDir@/ocsigen/xhtml.cma
+ at OCamlStdlibDir@/ocsigen/xhtmlcompact.cmi
+ at OCamlStdlibDir@/ocsigen/xhtmlcompact.mli
+ at OCamlStdlibDir@/ocsigen/xhtmlpretty.cma
+ at OCamlStdlibDir@/ocsigen/xhtmlpretty.cmi
+ at OCamlStdlibDir@/ocsigen/xhtmlpretty.mli
+ at OCamlStdlibDir@/ocsigen/xhtmlsyntax.cma
+ at OCamlStdlibDir@/ocsigen/xhtmltypes.cmi
+OPT: @OCamlStdlibDir@/ocsigen/xhtml.a
+OPT: @OCamlStdlibDir@/ocsigen/xhtml.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/xhtmlpretty.a
+OPT: @OCamlStdlibDir@/ocsigen/xhtmlpretty.cmxa
+OPT: @OCamlStdlibDir@/ocsigen/xhtmlsyntax.a
+OPT: @OCamlStdlibDir@/ocsigen/xhtmlsyntax.cmxa
diff --git a/debian/patches/0001-Split-out-ocsigen_xhtml-findlib-package.patch b/debian/patches/0001-Split-out-ocsigen_xhtml-findlib-package.patch
new file mode 100644
index 0000000..da33ad1
--- /dev/null
+++ b/debian/patches/0001-Split-out-ocsigen_xhtml-findlib-package.patch
@@ -0,0 +1,148 @@
+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/series b/debian/patches/series
new file mode 100644
index 0000000..521b33a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Split-out-ocsigen_xhtml-findlib-package.patch
diff --git a/debian/rules b/debian/rules
index fa7a1d8..e0e9b59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ override_dh_auto_configure:
.PHONY: override_dh_auto_install
override_dh_auto_install:
- $(MAKE) $(INSTALL_TARGET) MODULEINSTALLDIR=$(shell ocamlc -where) CHOWN=true
+ $(MAKE) $(INSTALL_TARGET) CHOWN=true MODULEINSTALLDIR=$(OCAML_STDLIB_DIR) STD_METAS_DIR=$(OCAML_STDLIB_DIR)/METAS
# For each installed .cmi file, install the corresponding .mli file next to it
find $(DESTDIR) -name '*.cmi' -printf '%h %f\n' | \
@@ -80,3 +80,10 @@ override_dh_auto_clean:
.PHONY: override_dh_auto_clean
override_dh_compress:
dh_compress -X.ml
+
+
+.PHONY: override_dh_ocaml
+override_dh_ocaml:
+ dh_ocaml \
+ --nodefined-map=libocsigen-ocaml-dev:Xmllexer \
+ --nodefined-map=libocsigen-xhtml-ocaml-dev:Xmllexer
--
ocsigen packaging
More information about the Pkg-ocaml-maint-commits
mailing list