[Pkg-ocaml-maint-commits] r4463 - in /trunk/packages/ocamlnet: branches/apache2-connector/ trunk/debian/TODO trunk/debian/changelog trunk/debian/control trunk/debian/rules

Sat Sep 8 13:07:26 UTC 2007

Author: zack
Date: Sat Sep  8 13:07:25 2007
New Revision: 4463

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4463
Log:
merge initial work on the apache connector in trunk/
(work delayed so that the unstable version of ocamlnet rebuild against 3.10 can
go ahead, since adding the apache connector will create a new package and hence
need passing through NEW)

Removed:
    trunk/packages/ocamlnet/branches/apache2-connector/
Modified:
    trunk/packages/ocamlnet/trunk/debian/TODO
    trunk/packages/ocamlnet/trunk/debian/changelog
    trunk/packages/ocamlnet/trunk/debian/control
    trunk/packages/ocamlnet/trunk/debian/rules

Modified: trunk/packages/ocamlnet/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/TODO?rev=4463&op=diff
==============================================================================

--- trunk/packages/ocamlnet/trunk/debian/TODO (original)
+++ trunk/packages/ocamlnet/trunk/debian/TODO Sat Sep  8 13:07:25 2007
@@ -1,7 +1,16 @@
+
+- create a new package for the apache connector, mathing the naming convention
+  for apache module packages. Note that ATM the apache connector stuff is
+  builded but not installed: upstream Make do not install it? ... Also create
+  the appropriate .load entry in /etc/apache2/mods-available/ there is
+  documentation for how to do that in upstream .mlis
+
+-- Sat, 08 Sep 2007 15:04:06 +0200 zack
 
 - building without invoking "clean" doesn't work
   (to test: "fakeroot debian/rules binary" fails---as probably "debuild binary"
   will--- while debuild works)
+
 - manpages for /usr/bin/ocamlrpcgen and /usr/bin/netplex-admin. The latter is
   almost entirely available in the HTML doc, the former can probably be
   generated with help2man (but I would like to have both of them either in

Modified: trunk/packages/ocamlnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=4463&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Sat Sep  8 13:07:25 2007
@@ -1,6 +1,11 @@
 ocamlnet (2.2.8.1-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * build the apache connector (closes: #430970)
+  * debian/control
+    - add build deps on apache2-mpm-worker and apache2-prefork-dev to build
+      the Apache connector
+
+  see debian/TODO ...
 
  -- Stefano Zacchiroli <zack at debian.org>  Sat, 08 Sep 2007 14:52:00 +0200
 

Modified: trunk/packages/ocamlnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/control?rev=4463&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/trunk/debian/control Sat Sep  8 13:07:25 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/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/rules?rev=4463&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules (original)
+++ trunk/packages/ocamlnet/trunk/debian/rules Sat Sep  8 13:07:25 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:


