[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-20-gb811d9d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit b811d9d1433051c967ce3f7781e535923dea6661
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 14 08:27:18 2013 +0200

    Update packaging for apache 2.4 (Closes: #666825)

diff --git a/debian/control b/debian/control
index 09e0fa8..dcb5e3d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  dh-ocaml (>= 0.9),
+ dh-apache2,
  ocaml-nox (>= 3.11.1-3~),
  camlp4 (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.5),
@@ -17,7 +18,7 @@ Build-Depends:
  libssl-ocaml-dev (>= 0.4.3-3~),
  libzip-ocaml-dev,
  libcryptokit-ocaml-dev,
- apache2-prefork-dev
+ apache2-dev
 Standards-Version: 3.9.4
 Homepage: http://projects.camlcity.org/projects/ocamlnet.html
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git
@@ -275,7 +276,6 @@ Package: libapache2-mod-ocamlnet
 Architecture: any
 Section: httpd
 Depends:
- apache2.2-common,
  libocamlnet-ocaml-dev (= ${binary:Version}),
  ${ocaml:Depends},
  ${shlibs:Depends},
diff --git a/debian/etc/netcgi_apache.load b/debian/etc/netcgi_apache.load
deleted file mode 100644
index a922221..0000000
--- a/debian/etc/netcgi_apache.load
+++ /dev/null
@@ -1,2 +0,0 @@
-LoadModule netcgi_module /usr/lib/apache2/modules/mod_netcgi_apache.so
-NetcgiRequire netcgi2-apache
diff --git a/debian/libapache2-mod-ocamlnet.apache2.in b/debian/libapache2-mod-ocamlnet.apache2.in
new file mode 100644
index 0000000..e21057b
--- /dev/null
+++ b/debian/libapache2-mod-ocamlnet.apache2.in
@@ -0,0 +1,3 @@
+conf debian/netcgi_apache.conf
+mod debian/tmp/@OCamlDllDir@/mod_netcgi_apache.so
+mod debian/netcgi_apache.load
diff --git a/debian/libapache2-mod-ocamlnet.dirs.in b/debian/libapache2-mod-ocamlnet.dirs.in
deleted file mode 100644
index 871a471..0000000
--- a/debian/libapache2-mod-ocamlnet.dirs.in
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/apache2/mods-available
-usr/lib/apache2/modules
diff --git a/debian/libapache2-mod-ocamlnet.install.in b/debian/libapache2-mod-ocamlnet.install.in
deleted file mode 100644
index 3567db7..0000000
--- a/debian/libapache2-mod-ocamlnet.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
- at OCamlDllDir@/mod_netcgi_apache.so		usr/lib/apache2/modules
-debian/etc/netcgi_apache.*			etc/apache2/mods-available
diff --git a/debian/etc/netcgi_apache.conf b/debian/netcgi_apache.conf
similarity index 100%
rename from debian/etc/netcgi_apache.conf
rename to debian/netcgi_apache.conf
diff --git a/debian/netcgi_apache.load b/debian/netcgi_apache.load
new file mode 100644
index 0000000..383743d
--- /dev/null
+++ b/debian/netcgi_apache.load
@@ -0,0 +1,2 @@
+LoadModule netcgi_apache_module /usr/lib/apache2/modules/mod_netcgi_apache.so
+NetcgiRequire netcgi2-apache
diff --git a/debian/rules b/debian/rules
index ceaed21..a624ea9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
 CFGFLAGS += -enable-pcre -enable-zip -enable-crypto
 
 %:
-	dh $@ --with ocaml
+	dh $@ --with ocaml,apache2
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
@@ -51,7 +51,7 @@ override_dh_auto_install:
 
 .PHONY: override_dh_install
 override_dh_install:
-	dh_install --fail-missing -X.so.owner
+	dh_install --fail-missing -X.so.owner -Xmod_netcgi_apache.so
 
 .PHONY: override_dh_compress
 override_dh_compress:

-- 
ocamlnet packaging