Update mod_waklog for 2012

* Build with apache2 by default (1.3 still works in theory)
* Only build Debian package `libapache2-mod-waklog' (apache 1.3 is no
  longer in Debian)
* Left alone otherwise (not quite conformant with the latest package standards)

diff --git a/configure.in b/configure.in
index 0ec2ebe..172ce66 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_SUBST(AFS_INC)
 AC_ARG_WITH([apr-headers],
             [AC_HELP_STRING([--with-apr-headers],[path to apr headers])],
             [APR_INC=$withval],
-            [APR_INC=/usr/include/apr-1])
+            [APR_INC=/usr/include/apr-1.0])
 AC_SUBST(APR_INC)
 
 AC_ARG_WITH([krb5-libs],
@@ -42,13 +42,13 @@ AC_SUBST(APACHE_LIBS)
 AC_ARG_WITH([apache-headers],
             [AC_HELP_STRING([--with-apache-headers],[path to apache headers])],
             [APACHE_INC=$withval],
-            [APACHE_INC=/usr/include/apache-1.3])
+            [APACHE_INC=/usr/include/apache2])
 AC_SUBST(APACHE_INC)
 
 AC_ARG_WITH([apxs],
             [AC_HELP_STRING([--with-apxs],[path to apxs])],
             [APXS=$withval],
-            [APXS=apxs])
+            [APXS=apxs2])
 AC_SUBST(APXS)
 
 AC_ARG_ENABLE(debug,

diff --git a/debian/control b/debian/control
index 79c06a5..da511bc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,13 @@ Source: libapache-mod-waklog
 Section: web
 Priority: optional
 Maintainer: Adam Megacz <megacz@cs.berkeley.edu>
-Build-Depends: apache-dev, apache2-prefork-dev, libkrb5-dev, autoconf, 
+Build-Depends: apache2-prefork-dev, libkrb5-dev, autoconf, 
  automake, libopenafs-dev
 Standards-Version: 3.6.1
 
-Package: libapache-mod-waklog
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache-common, krb5-config
-Description:  AFS Authentication for Apache
-
 Package: libapache2-mod-waklog
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-mpm-prefork, krb5-config
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-mpm-prefork | apache2-mpm-itk, 
+ krb5-config
 Description:  AFS Authentication for Apache2
 

diff --git a/debian/rules b/debian/rules
index 9b4028a..51840de 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,22 +10,6 @@ endif
 
 default:binary
 
-apache13:
-       dh_testdir
-       chmod +x regen.sh
-       ./regen.sh
-       ./configure \
-         --with-afs-libs=/usr/lib/afs \
-         --with-afs-headers=/usr/include/afs \
-         --with-apxs=/usr/bin/apxs
-       make clean
-       $(MAKE)
-       dh_installdirs
-       mkdir -p debian/libapache-mod-waklog/usr/lib/apache/1.3/
-       mkdir -p debian/libapache-mod-waklog/etc/apache/conf.d/
-       cp mod_waklog.so debian/libapache-mod-waklog/usr/lib/apache/1.3/
-       cp debian/waklog.load debian/libapache-mod-waklog/etc/apache/conf.d/waklog.conf
-
 apache20:
        dh_testdir
        chmod +x regen.sh
@@ -53,7 +37,7 @@ clean:
 
 binary-indep:
 
-binary-arch: apache13 apache20
+binary-arch: apache20
        dh_testdir
        dh_testroot
        dh_installchangelogs