[Pkg-ocaml-maint-commits] r3876 - in /trunk/packages/mod-caml/trunk/debian: changelog control patches/00list rules
munga-guest at users.alioth.debian.org
munga-guest at users.alioth.debian.org
Thu Jun 28 15:33:06 UTC 2007
Author: munga-guest
Date: Thu Jun 28 15:33:02 2007
New Revision: 3876
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3876
Log:
experimental libapache2-mod-caml package
Modified:
trunk/packages/mod-caml/trunk/debian/changelog
trunk/packages/mod-caml/trunk/debian/control
trunk/packages/mod-caml/trunk/debian/patches/00list
trunk/packages/mod-caml/trunk/debian/rules
Modified: trunk/packages/mod-caml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/debian/changelog?rev=3876&op=diff
==============================================================================
--- trunk/packages/mod-caml/trunk/debian/changelog (original)
+++ trunk/packages/mod-caml/trunk/debian/changelog Thu Jun 28 15:33:02 2007
@@ -1,3 +1,12 @@
+mod-caml (1.3.8-2) unstable; urgency=low
+
+ * new configure script
+ * split the package in libapache-mod-caml and libapache2-mod-caml
+ * fixed various problems to compile against apache2
+ * added dep to apache2.2-common
+
+ -- Pietro Abate <pietro.abate at pps.jussieu.fr> Thu, 28 Jun 2007 13:18:51 +0000
+
mod-caml (1.3.8-1) unstable; urgency=low
* new upstream release
Modified: trunk/packages/mod-caml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/debian/control?rev=3876&op=diff
==============================================================================
--- trunk/packages/mod-caml/trunk/debian/control (original)
+++ trunk/packages/mod-caml/trunk/debian/control Thu Jun 28 15:33:02 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Richard W.M. Jones <rich at annexia.org>
Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libdbi-ocaml-dev (>= 0.9.13), libpcre-ocaml-dev (>= 5.10.1), ocaml-findlib (>= 1.1), ocaml-nox (>= 3.09.0), apache-dev, dpatch
+Build-Depends: debhelper (>= 4.0.0), libdbi-ocaml-dev (>= 0.9.13), libpcre-ocaml-dev (>= 5.10.1), ocaml-findlib (>= 1.1), ocaml-nox (>= 3.09.0), apache-dev, apache2-threaded-dev (>= 2.2.3-1) | apache2-prefork-dev (>= 2.2.3-1), dpatch
Standards-Version: 3.6.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/mod-caml
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/
@@ -11,7 +11,7 @@
Package: libapache-mod-caml
Section: web
Architecture: any
-Depends: libdbi-ocaml-dev (>= 0.9.13), libpcre-ocaml-dev (>= 5.10.1), ocaml-findlib (>= 1.1), ocaml-nox-3.09.0, apache
+Depends: libpcre-ocaml (>= 5.10.1), ocaml-nox (>= 3.09.0), apache
Recommends: libtemplate-ocaml-dev (= ${Source-Version})
Replaces: libapache-ocaml, libapache-ocaml-dev
Description: Objective CAML (OCaml) bindings for the Apache API
@@ -25,10 +25,27 @@
* CGI library and templating system (allows separation of code and
presentation).
+Package: libapache2-mod-caml
+Section: web
+Architecture: any
+Depends: libpcre-ocaml (>= 5.10.1), ocaml-nox (>= 3.09.0), apache2.2-common
+Recommends: libtemplate-ocaml-dev (= ${Source-Version})
+Replaces: libapache-ocaml, libapache-ocaml-dev
+Description: Objective CAML (OCaml) bindings for the Apache API
+ mod_caml is a set of Objective CAML (OCaml) bindings for the Apache2
+ API. It allows you to run "CGI scripts" written in OCaml directly inside
+ the Apache webserver. However, it is much much more than just that:
+ .
+ * Bind to any part of the Apache request cycle.
+ * Read and modify internal Apache structures.
+ * Share modules of code between handlers and scripts.
+ * CGI library and templating system (allows separation of code and
+ presentation).
+
Package: libtemplate-ocaml-dev
Section: libdevel
Architecture: any
-Depends: libpcre-ocaml-dev (>= 5.10.1), ocaml-nox-3.09.0
+Depends: libpcre-ocaml-dev (>= 5.10.1), ocaml-nox (>= 3.09.0), libdbi-ocaml-dev (>= 0.9.13), libpcre-ocaml-dev (>= 5.10.1), ocaml-findlib (>= 1.1)
Description: Simple templating system for Objective CAML (OCaml)
This is a simple web page templating system for Objective CAML
(OCaml) intended to be used in conjunction with mod_caml (the Debian
Modified: trunk/packages/mod-caml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/debian/patches/00list?rev=3876&op=diff
==============================================================================
--- trunk/packages/mod-caml/trunk/debian/patches/00list (original)
+++ trunk/packages/mod-caml/trunk/debian/patches/00list Thu Jun 28 15:33:02 2007
@@ -1,1 +1,2 @@
17_install_dest.dpatch
+18_apache2.dpatch
Modified: trunk/packages/mod-caml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mod-caml/trunk/debian/rules?rev=3876&op=diff
==============================================================================
--- trunk/packages/mod-caml/trunk/debian/rules (original)
+++ trunk/packages/mod-caml/trunk/debian/rules Thu Jun 28 15:33:02 2007
@@ -6,6 +6,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_DESTDIR_APACHE2 = $(CURDIR)/debian/libapache2-mod-caml
+DEB_DESTDIR_APACHE1 = $(CURDIR)/debian/libapache-mod-caml
+
include /usr/share/dpatch/dpatch.make
configure: configure-stamp
@@ -13,20 +16,52 @@
dh_testdir
touch configure-stamp
-build: build-stamp
-build-stamp: patch-stamp configure-stamp
+build: build-stamp-apache1 build-stamp-apache2
+build-stamp-apache1: patch-stamp configure-stamp
dh_testdir
+
+ rm -rf build-apache1
+ mkdir build-apache1
if [ -x /usr/bin/ocamlopt ]; then \
BUILD_OPT=1; \
else \
BUILD_OPT=0; \
fi; \
+ cd build-apache1; \
+ cp -a ../ . ;\
+ ocaml ./configure.ml \
+ --apxs=/usr/bin/apxs \
+ --prefix=/usr \
+ --docdir=/usr/share/doc/libapache-mod-caml ; \
$(MAKE) \
HAVE_OCAMLODBC=0 \
HAVE_CAMLTEMPLATE=0 \
BUILD_OPT=$$BUILD_OPT
- touch build-stamp
+ touch build-stamp-apache1
+
+build-stamp-apache2: patch-stamp configure-stamp
+ dh_testdir
+
+ rm -rf build-apache2
+ mkdir build-apache2
+
+ if [ -x /usr/bin/ocamlopt ]; then \
+ BUILD_OPT=1; \
+ else \
+ BUILD_OPT=0; \
+ fi; \
+ cd build-apache2; \
+ cp -a ../ . ;\
+ ocaml ./configure.ml \
+ --apxs=/usr/bin/apxs2 \
+ --prefix=/usr \
+ --docdir=/usr/share/doc/libapache2-mod-caml ; \
+ $(MAKE) \
+ HAVE_OCAMLODBC=0 \
+ HAVE_CAMLTEMPLATE=0 \
+ BUILD_OPT=$$BUILD_OPT
+ touch build-stamp-apache2
clean: clean1 unpatch
clean1:
@@ -43,6 +78,7 @@
dh_clean -k
dh_installdirs
+ cd build-apache1; \
if [ -x /usr/bin/ocamlopt ]; then \
BUILD_OPT=1; \
else \
@@ -52,11 +88,26 @@
HAVE_MYSQL=0 HAVE_PERL4CAML=0 HAVE_OCAMLODBC=0 \
HAVE_CAMLTEMPLATE=0 \
BUILD_OPT=$$BUILD_OPT \
- DESTDIR=$(CURDIR)/debian/libapache-mod-caml
+ DESTDIR=$(DEB_DESTDIR_APACHE1)
+
+ cd build-apache2; \
+ if [ -x /usr/bin/ocamlopt ]; then \
+ BUILD_OPT=1; \
+ else \
+ BUILD_OPT=0; \
+ fi; \
+ $(MAKE) install \
+ HAVE_MYSQL=0 HAVE_PERL4CAML=0 HAVE_OCAMLODBC=0 \
+ HAVE_CAMLTEMPLATE=0 \
+ BUILD_OPT=$$BUILD_OPT \
+ DESTDIR=$(DEB_DESTDIR_APACHE2)
# Move the Template-related files across.
dh_movefiles -plibtemplate-ocaml-dev \
- --sourcedir=debian/libapache-mod-caml
+ --sourcedir=debian/libapache-mod-caml \
+ usr/share/mod_caml/caml-bin \
+ usr/share/mod_caml/caml-icons \
+ usr/share/mod_caml/templates
# Build architecture-independent files here.
binary-indep: build install
@@ -89,7 +140,9 @@
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -plibtemplate-ocaml-dev
+ dh_gencontrol -plibapache2-mod-caml
+ dh_gencontrol -plibapache-mod-caml
dh_md5sums
dh_builddeb
More information about the Pkg-ocaml-maint-commits
mailing list