[Pkg-ocaml-maint-commits] r4474 - in /trunk/packages/ocamlnet/trunk/debian: changelog control libapache2-mod-ocamlnet.dirs.in libapache2-mod-ocamlnet.install.in libocamlnet-ocaml-dev.install.in patches/00list patches/no_apache_info.dpatch
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Sun Sep 9 08:09:42 UTC 2007
Author: zack
Date: Sun Sep 9 08:09:41 2007
New Revision: 4474
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4474
Log:
* change the split of the netcgi2 Apache connector: the OCaml development
libraries are now in libocamlnet-ocaml-dev while the Apache module is
alone in libapache2-mod-ocamlnet. This way one can develop applications
for the connector without having to install Apache
* debian/patches/
- add patch no_apache_info to inhibit installation of *apache.info file in
libapache2-mod-ocamlent, not needed for Apache 2
Added:
trunk/packages/ocamlnet/trunk/debian/patches/no_apache_info.dpatch (with props)
Modified:
trunk/packages/ocamlnet/trunk/debian/changelog
trunk/packages/ocamlnet/trunk/debian/control
trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.dirs.in
trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.install.in
trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in
trunk/packages/ocamlnet/trunk/debian/patches/00list
Modified: trunk/packages/ocamlnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=4474&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Sun Sep 9 08:09:41 2007
@@ -1,8 +1,14 @@
-ocamlnet (2.2.8.1-3) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Stefano Zacchiroli <zack at debian.org> Sat, 08 Sep 2007 17:53:26 +0200
+ocamlnet (2.2.8.1-3) experimental; urgency=low
+
+ * change the split of the netcgi2 Apache connector: the OCaml development
+ libraries are now in libocamlnet-ocaml-dev while the Apache module is
+ alone in libapache2-mod-ocamlnet. This way one can develop applications
+ for the connector without having to install Apache
+ * debian/patches/
+ - add patch no_apache_info to inhibit installation of *apache.info file in
+ libapache2-mod-ocamlent, not needed for Apache 2
+
+ -- Stefano Zacchiroli <zack at debian.org> Sun, 09 Sep 2007 09:57:42 +0200
ocamlnet (2.2.8.1-2) experimental; urgency=low
Modified: trunk/packages/ocamlnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/control?rev=4474&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/trunk/debian/control Sun Sep 9 08:09:41 2007
@@ -43,7 +43,9 @@
Ocamlnet libraries in your programs. The following libraries are
packaged separately: SSL-related libraries (libocamlnet-ssl-ocaml-dev),
GTK-related libraries (libocamlnet-gtk2-ocaml-dev), nethttpd
- (libnethttpd-ocaml-dev).
+ (libnethttpd-ocaml-dev). The netcgi2 Apache connector is also part of
+ this package; to run applications built for that connector you will
+ need the mod_netcgi_apache Apache module (libapache2-mod-ocamlnet).
Package: libocamlnet-ocaml
Architecture: any
@@ -273,10 +275,10 @@
.
Homepage: http://ocamlnet.sourceforge.net/
.
- This package contains the connector between Apache 2 and netcgi2. The
- connector comes as an Apache 2 module and an OCaml library to access the
- Apache API. Using the connector you can write web application in OCaml and
- have Apache serves them directly as OCaml compiled modules.
+ This package contains the mod_netcgi_apache Apache module. You will
+ need this module to run web applications built using the netcgi2 Apache
+ connector of OCamlnet. With this package Apache can serve them directly
+ as OCaml compiled modules.
Package: libocamlnet-ocaml-doc
Architecture: all
Modified: trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.dirs.in?rev=4474&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.dirs.in (original)
+++ trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.dirs.in Sun Sep 9 08:09:41 2007
@@ -1,3 +1,2 @@
etc/apache2/mods-available
usr/lib/apache2/modules
- at OCamlStdlibDir@
Modified: trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.install.in?rev=4474&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.install.in (original)
+++ trunk/packages/ocamlnet/trunk/debian/libapache2-mod-ocamlnet.install.in Sun Sep 9 08:09:41 2007
@@ -1,3 +1,2 @@
-debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi_apache @OCamlStdlibDir@
src/netcgi2-apache/mod_netcgi_apache.so usr/lib/apache2/modules
debian/etc/netcgi_apache.* etc/apache2/mods-available
Modified: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in?rev=4474&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in (original)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in Sun Sep 9 08:09:41 2007
@@ -2,6 +2,7 @@
debian/tmp/usr/lib/ocaml/@OCamlABI@/equeue @OCamlStdlibDir@
debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi1 @OCamlStdlibDir@
debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi2 @OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi_apache @OCamlStdlibDir@
debian/tmp/usr/lib/ocaml/@OCamlABI@/netcgi2-plex @OCamlStdlibDir@
debian/tmp/usr/lib/ocaml/@OCamlABI@/netclient @OCamlStdlibDir@
debian/tmp/usr/lib/ocaml/@OCamlABI@/netplex @OCamlStdlibDir@
Modified: trunk/packages/ocamlnet/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/00list?rev=4474&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlnet/trunk/debian/patches/00list Sun Sep 9 08:09:41 2007
@@ -2,3 +2,4 @@
mkdir_destdir.dpatch
missing_shebangs.dpatch
build_w_camlp5.dpatch
+no_apache_info.dpatch
Added: trunk/packages/ocamlnet/trunk/debian/patches/no_apache_info.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/no_apache_info.dpatch?rev=4474&op=file
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/no_apache_info.dpatch (added)
+++ trunk/packages/ocamlnet/trunk/debian/patches/no_apache_info.dpatch Sun Sep 9 08:09:41 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_apache_info.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: do not install *apache.info file, not needed with Apache 2
+
+ at DPATCH@
+diff -urNad trunk~/src/netcgi2-apache/Makefile.def trunk/src/netcgi2-apache/Makefile.def
+--- trunk~/src/netcgi2-apache/Makefile.def 2007-07-31 18:20:59.000000000 +0200
++++ trunk/src/netcgi2-apache/Makefile.def 2007-09-09 09:57:00.000000000 +0200
+@@ -10,7 +10,7 @@
+ DOBJECTS = netcgi_apache.mli netcgi_modtpl.mli
+
+ ALL_EXTRA = mod_netcgi_apache.so
+-INSTALL_EXTRA = mod_netcgi_apache.so 500netcgi_apache.info
++INSTALL_EXTRA = mod_netcgi_apache.so
+
+ include $(TOP_DIR)/Makefile.rules
+
Propchange: trunk/packages/ocamlnet/trunk/debian/patches/no_apache_info.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-ocaml-maint-commits
mailing list