[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.2.1-1-8-g7a159d9
Stephane Glondu
steph at glondu.net
Wed Oct 21 16:30:47 UTC 2009
The following commit has been merged in the master branch:
commit 9915b0cc7baaf4a0fcbaee2be3ae853c56c28360
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Oct 20 15:29:41 2009 +0200
Revisit binary packages, switch to dh-ocaml 0.9
diff --git a/debian/control b/debian/control
index f369516..3efd372 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: ocsigen
-Section: web
+Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders:
@@ -7,45 +7,36 @@ Uploaders:
Samuel Mimram <smimram at debian.org>,
Stefano Zacchiroli <zack at debian.org>
Build-Depends:
- debhelper (>= 7.0.52),
- ocaml-nox (>= 3.11),
- camlp4,
+ debhelper (>= 7.0.50~),
+ ocaml-nox (>= 3.11.1-3~),
camlp4-extra,
- ocaml-findlib,
- liblwt-ssl-ocaml-dev (>= 2.0.0~),
- libocamlnet-ocaml-dev (>> 2.2.9-6),
- libpcre-ocaml-dev (>= 6.0.0),
- libssl-ocaml-dev (>= 0.4.3-2),
+ ocaml-findlib (>= 1.2.5),
+ liblwt-ssl-ocaml-dev (>= 2.0.0),
+ libocamlnet-ocaml-dev (>= 2.2.9-7~),
+ libpcre-ocaml-dev (>= 6.0.1-2~),
+ libssl-ocaml-dev (>= 0.4.3-3~),
libgdbm-dev,
- libsqlite3-ocaml-dev (>= 1.5.1),
- libzip-ocaml-dev (>> 1.04-4),
- libcryptokit-ocaml-dev (>> 1.3-13),
- ocamlduce,
- dh-ocaml
+ libsqlite3-ocaml-dev (>= 1.5.6-3~),
+ libzip-ocaml-dev (>= 1.04-6~),
+ libcryptokit-ocaml-dev (>= 1.3-14~),
+ ocamlduce (>= 3.11.1.0-2~),
+ dh-ocaml (>= 0.9)
Standards-Version: 3.8.3
Homepage: http://www.ocsigen.org/
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocsigen.git
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocsigen.git
Package: ocsigen
+Section: httpd
Architecture: any
Depends: adduser, psmisc, procps,
+ ${ocaml:Depends},
${shlibs:Depends},
- ocaml-nox-${F:OCamlABI},
- ocaml-findlib,
- ocamlduce,
- liblwt-ocaml (>= 2.0.0~),
- libsqlite3-ocaml (>= 1.4.0-2),
- libcryptokit-ocaml (>= 1.3-13),
- libzip-ocaml (>= 1.04-4),
- libssl-ocaml,
- libpcre-ocaml,
- libocamlnet-ocaml,
${misc:Depends}
Provides: httpd, httpd-cgi
-Suggests: ocsigen-doc
-Description: Web server and programming framework in OCaml
+Suggests: ocsigen-dev
Breaks: nurpawiki (<< 1.2.3-3~)
+Description: web server and programming framework in OCaml
Ocsigen is a Web server and a programming framework providing a new
way to create dynamic Web sites. Its goal is to offer an alternative
to Apache/PHP, based on cutting-edge technologies coming from
@@ -55,13 +46,34 @@ Breaks: nurpawiki (<< 1.2.3-3~)
pages. With Eliom, you program in a concise and modular way, with a
strong type system which helps you to produce valid xhtml. The server
handles sessions, URLs, and page parameters automatically.
+ .
+ This package contains the web server itself and shared files.
-Package: ocsigen-doc
+Package: libocsigen-ocaml-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Suggests: ocsigen-dev
-Description: Developer's documentation for Ocsigen
+Provides: ocsigen-doc
+Replaces: ocsigen-doc (<< 1.2.2)
+Conflicts: ocsigen-doc (<< 1.2.2)
+Description: developer's documentation for Ocsigen
+ Ocsigen is a Web server and a programming framework providing a new
+ way to create dynamic Web sites.
+ .
+ This package contains the documentation of all Ocsigen's modules.
+ This is developer's documentation, generated by ocamldoc. The
+ documentation for the server itself is available online.
+
+Package: ocsigen-dev
+Architecture: all
+Depends:
+ ocsigen (>= ${binary:Version}),
+ libocsigen-ocaml-doc (>= ${binary:Version}),
+ libocsigen-ocaml-dev (>= ${binary:Version}),
+ ocaml-findlib,
+ ${misc:Depends}
+Description: development metapackage for Ocsigen
Ocsigen is a Web server and a programming framework providing a new
way to create dynamic Web sites. Its goal is to offer an alternative
to Apache/PHP, based on cutting-edge technologies coming from
@@ -72,27 +84,38 @@ Description: Developer's documentation for Ocsigen
strong type system which helps you to produce valid xhtml. The server
handles sessions, URLs, and page parameters automatically.
.
- This package contains the documentation of all Ocsigen's modules.
- This is developer's documentation, generated by ocamldoc. The
- documentation for the server itself is available online.
+ This metapackage brings everything you need to develop Ocsigen
+ extensions and Eliom modules: the development librairies, the server
+ itself and documentation.
-Package: ocsigen-dev
-Section: devel
-Priority: extra
+Package: libocsigen-ocaml
+Architecture: any
+Depends:
+ ${ocaml: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)
+Description: runtime librairies for Ocsigen
+ Ocsigen is a Web server and a programming framework providing a new
+ way to create dynamic Web sites.
+ .
+ This package contains runtime librairies for Ocsigen.
+
+Package: libocsigen-ocaml-dev
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI},
+Depends:
ocaml-findlib,
- ocsigen (= ${binary:Version}),
- liblwt-ssl-ocaml-dev (>= 2.0.0~),
- camlp4, camlp4-extra,
- libocamlnet-ocaml-dev (>= 2.0),
libgdbm-dev,
- libsqlite3-ocaml-dev,
- libzip-ocaml-dev,
- libcryptokit-ocaml-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
${misc:Depends}
+Provides: ${ocaml:Provides}
Recommends: ocsigen-doc
-Description: Development files for Ocsigen
+Replaces: ocsigen (<< 1.2.2), ocsigen-dev (<< 1.2.2)
+Conflicts: ocsigen (<< 1.2.2), ocsigen-dev (<< 1.2.2)
+Description: development librairies for Ocsigen
Ocsigen is a Web server and a programming framework providing a new
way to create dynamic Web sites. Its goal is to offer an alternative
to Apache/PHP, based on cutting-edge technologies coming from
@@ -103,5 +126,5 @@ Description: Development files for Ocsigen
strong type system which helps you to produce valid xhtml. The server
handles sessions, URLs, and page parameters automatically.
.
- This package contains all you need to develop your own extensions and
- Eliom modules.
+ This package contains development files for compiling Ocsigen
+ extensions and Eliom modules.
diff --git a/debian/ocsigen-dev.dirs.in b/debian/libocsigen-ocaml-dev.install.in
similarity index 100%
rename from debian/ocsigen-dev.dirs.in
rename to debian/libocsigen-ocaml-dev.install.in
diff --git a/debian/ocsigen-doc.doc-base b/debian/libocsigen-ocaml-doc.doc-base
similarity index 55%
rename from debian/ocsigen-doc.doc-base
rename to debian/libocsigen-ocaml-doc.doc-base
index f23696a..e5087dc 100644
--- a/debian/ocsigen-doc.doc-base
+++ b/debian/libocsigen-ocaml-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: Documentation for ocsigen's modules.
Section: Programming/OCaml
Format: HTML
-Index: /usr/share/doc/ocsigen-doc/html/index.html
-Files: /usr/share/doc/ocsigen-doc/html/*.html
+Index: /usr/share/doc/libocsigen-ocaml-doc/html/api/index.html
+Files: /usr/share/doc/libocsigen-ocaml-doc/html/api/*.html
diff --git a/debian/ocsigen-doc.examples b/debian/libocsigen-ocaml-doc.examples
similarity index 100%
rename from debian/ocsigen-doc.examples
rename to debian/libocsigen-ocaml-doc.examples
diff --git a/debian/libocsigen-ocaml-doc.install b/debian/libocsigen-ocaml-doc.install
new file mode 100644
index 0000000..209eb74
--- /dev/null
+++ b/debian/libocsigen-ocaml-doc.install
@@ -0,0 +1 @@
+usr/share/doc/ocsigen/* usr/share/doc/libocsigen-ocaml-doc/html/api
diff --git a/debian/ocsigen-doc.links b/debian/libocsigen-ocaml-doc.links
similarity index 100%
rename from debian/ocsigen-doc.links
rename to debian/libocsigen-ocaml-doc.links
diff --git a/debian/libocsigen-ocaml.install.in b/debian/libocsigen-ocaml.install.in
new file mode 100644
index 0000000..b7e19a4
--- /dev/null
+++ b/debian/libocsigen-ocaml.install.in
@@ -0,0 +1,2 @@
+ at OCamlDllDir@/*
+usr/lib/ocsigen
diff --git a/debian/ocsigen-dev.install.in b/debian/ocsigen-dev.install.in
deleted file mode 100644
index 575e1d1..0000000
--- a/debian/ocsigen-dev.install.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlStdlibDir@/ocsigen
diff --git a/debian/ocsigen-doc.dirs b/debian/ocsigen-doc.dirs
deleted file mode 100644
index 8721c25..0000000
--- a/debian/ocsigen-doc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/ocsigen-doc/html
-usr/share/doc/ocsigen
diff --git a/debian/ocsigen-doc.install b/debian/ocsigen-doc.install
deleted file mode 100644
index 8c774d9..0000000
--- a/debian/ocsigen-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/ocsigen/* usr/share/doc/ocsigen-doc/html
diff --git a/debian/ocsigen.dirs.in b/debian/ocsigen.dirs.in
deleted file mode 100644
index d569fd4..0000000
--- a/debian/ocsigen.dirs.in
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/ocsigen
-etc/logrotate.d
-usr/lib/ocsigen
-usr/share/doc/ocsigen
-var/lib/ocsigen
-var/log/ocsigen
- at OCamlDllDir@
diff --git a/debian/ocsigen.install.in b/debian/ocsigen.install.in
index 3e626c1..3ed312e 100644
--- a/debian/ocsigen.install.in
+++ b/debian/ocsigen.install.in
@@ -2,9 +2,7 @@ etc/ocsigen/mime.types
etc/ocsigen/ocsigen.conf
etc/logrotate.d
usr/bin
-usr/lib/ocsigen
usr/share/man
usr/share/ocsigen
var/lib/ocsigen
var/log/ocsigen
- at OCamlDllDir@/*
diff --git a/debian/rules b/debian/rules
index 47fefa4..ffa650c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,9 @@
#export DH_VERBOSE=1
include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
DESTDIR := $(CURDIR)/debian/tmp
-PACKAGES := $(shell sed -nr 's/^Package: (.*)$$/\1/p' debian/control)
-DH := dh
+export OCAMLOBJINFO := ocamlduceobjinfo
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
OPT_CONFFLAGS := --enable-nativecode
@@ -17,6 +15,11 @@ else
OPT_CONFFLAGS := --disable-nativecode
endif
+%:
+ dh --with ocaml $@
+
+
+.PHONY: override_dh_auto_configure
override_dh_auto_configure:
chmod +x configure
./configure \
@@ -41,6 +44,7 @@ override_dh_auto_configure:
debian/examples/Makefile
+.PHONY: override_dh_auto_install
override_dh_auto_install:
$(MAKE) install MODULEINSTALLDIR=$(shell ocamlc -where) CHOWN=true
@@ -55,6 +59,7 @@ override_dh_auto_install:
rm -f $(DESTDIR)/usr/share/ocsigen/ocsigenstuff/LICENSE
+.PHONY: override_dh_auto_build
override_dh_auto_build:
# This directory, present in .orig.tar.gz, is created here because
# git doesn't handle empty directories
@@ -63,26 +68,12 @@ override_dh_auto_build:
$(MAKE) all
-override_dh_install:
- dh_install --list-missing
- for u in $(PACKAGES); do \
- echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
- done
-
+.PHONY: override_dh_auto_clean
override_dh_auto_clean:
[ ! -f Makefile.config ] || $(MAKE) distclean
rm -Rf debian/examples
+
+.PHONY: override_dh_auto_clean
override_dh_compress:
dh_compress -X.ml
-
-clean: ocamlinit-clean
- $(DH) $@
-
-build: ocamlinit-stamp
- $(DH) $@
-
-%:
- $(DH) $@
-
-.PHONY: build clean
--
ocsigen packaging
More information about the Pkg-ocaml-maint-commits
mailing list