[Pkg-ocaml-maint-commits] r4456 - in /trunk/packages/ocamlnet/branches/apache2-connector: ./ debian/ debian/patches/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Sat Sep 8 12:09:05 UTC 2007
Author: zack
Date: Sat Sep 8 12:09:05 2007
New Revision: 4456
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4456
Log:
initial changes needed to build the apache connector (which is, with this changes, builded but not installed)
Added:
trunk/packages/ocamlnet/branches/apache2-connector/
- copied from r4450, trunk/packages/ocamlnet/trunk/
trunk/packages/ocamlnet/branches/apache2-connector/debian/changelog
- copied, changed from r4453, trunk/packages/ocamlnet/trunk/debian/changelog
trunk/packages/ocamlnet/branches/apache2-connector/debian/control
- copied, changed from r4452, trunk/packages/ocamlnet/trunk/debian/control
trunk/packages/ocamlnet/branches/apache2-connector/debian/patches/build_w_camlp5.dpatch
- copied unchanged from r4452, trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch
Removed:
trunk/packages/ocamlnet/branches/apache2-connector/debian/libocamlnet-ocaml-dev.postinst
trunk/packages/ocamlnet/branches/apache2-connector/debian/libocamlnet-ocaml-dev.postrm
trunk/packages/ocamlnet/branches/apache2-connector/debian/libocamlnet-ocaml-dev.preinst
Modified:
trunk/packages/ocamlnet/branches/apache2-connector/debian/rules
Copied: trunk/packages/ocamlnet/branches/apache2-connector/debian/changelog (from r4453, trunk/packages/ocamlnet/trunk/debian/changelog)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/branches/apache2-connector/debian/changelog?rev=4456&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/branches/apache2-connector/debian/changelog Sat Sep 8 12:09:05 2007
@@ -1,9 +1,12 @@
ocamlnet (2.2.8.1-1) UNRELEASED; urgency=low
* new upstream release
+ * build the apache connector (closes: #430970)
* debian/control
- bump camlp5 version to the latest available (to ensure some syntax quirk
work properly)
+ - add build deps on apache2-mpm-worker and apache2-prefork-dev to build
+ the Apache connector
* debian/patches/
- refresh build_w_camlp5 patch: some old changes are no longer needed with
the current version of camlp5, some new code require patches
Copied: trunk/packages/ocamlnet/branches/apache2-connector/debian/control (from r4452, trunk/packages/ocamlnet/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/branches/apache2-connector/debian/control?rev=4456&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/branches/apache2-connector/debian/control Sat Sep 8 12:09:05 2007
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.10.0), camlp5 (>= 4.08), ocaml-findlib, libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev, libssl-ocaml-dev
+Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.10.0), camlp5 (>= 4.08), ocaml-findlib, libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev, libssl-ocaml-dev, apache2-mpm-worker, apache2-prefork-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlnet
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/
Modified: trunk/packages/ocamlnet/branches/apache2-connector/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/branches/apache2-connector/debian/rules?rev=4456&op=diff
==============================================================================
--- trunk/packages/ocamlnet/branches/apache2-connector/debian/rules (original)
+++ trunk/packages/ocamlnet/branches/apache2-connector/debian/rules Sat Sep 8 12:09:05 2007
@@ -25,13 +25,7 @@
CFGFLAGS += -enable-gtk2 -enable-ssl
CFGFLAGS += -with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh
CFGFLAGS += -bindir /usr/bin -datadir /usr/share/ocamlnet
-
-# To enable the apache connector and build it against apache2 (currently
-# b0rk3d) uncomment the following line. Note that in order to support the
-# apache connector in a proper debian package adding "apache2-mpm-worker" (for
-# /usr/sbin/apache2) and "apache2-prefork-dev" (for /usr/bin/apxs2) as
-# build-deps to debian/control is needed as well.
-#CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
+CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
configure/$(PKGNAME):: debian/configure-stamp
debian/configure-stamp:
More information about the Pkg-ocaml-maint-commits
mailing list