debian: Fix doc file list and lintian issues

- dh_installdocs(1) didn't literally mean "package.docs"
- Make "debian/rules clean" fully clean
- Use newer standards/compat
- Add missing debian/rules targets
- Add explicit build-depends for debhelper
- Add long description

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8

diff --git a/debian/control b/debian/control
index 24f919f..05ac05d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,15 @@ Source: libapache-mod-waklog
 Section: web
 Priority: optional
 Maintainer: Jacob Welsh <jwelsh@sinenomine.net>
-Build-Depends: apache2-prefork-dev, libkrb5-dev, autoconf,
+Build-Depends: debhelper (>= 8), apache2-prefork-dev, libkrb5-dev, autoconf,
  automake, libopenafs-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.9.6
 
 Package: libapache2-mod-waklog
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description:  AFS Authentication for Apache2
-
+ mod_waklog is an Apache module that provides aklog-like semantics for the web.
+ mod_waklog will acquire (and store in the kernel) an AFS credential when a
+ connection is opened, use the credential for the duration of the connection,
+ and will remove the credential when the connection is closed.

diff --git a/debian/package.docs b/debian/libapache2-mod-waklog.docs
similarity index 100%
rename from debian/package.docs
rename to debian/libapache2-mod-waklog.docs

diff --git a/debian/rules b/debian/rules
index d919445..f62e79b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,7 @@ else
        CFLAGS += -O2
 endif
 
-default:binary
-
-apache20:
+build-apache2:
        dh_testdir
        chmod +x regen.sh
        ./regen.sh
@@ -26,17 +24,24 @@ apache20:
        mkdir -p debian/libapache2-mod-waklog/etc/apache2/mods-available
        cp mod_waklog.so debian/libapache2-mod-waklog/usr/lib/apache2/modules/
        cp debian/waklog.load debian/libapache2-mod-waklog/etc/apache2/mods-available
+       touch build-apache2
 
 clean:
        dh_testdir
        dh_testroot
        rm -rf build-stamp .libs
-       -$(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) distclean
+       rm -f aclocal.m4 configure compile install-sh missing Makefile.in mod_waklog.la mod_waklog.so
        dh_clean  --exclude ./_darcs/current/Makefile.orig --exclude ./Makefile.orig
 
-binary-indep:
+build: build-indep build-arch
+build-indep:
+build-arch: build-apache2
 
-binary-arch: apache20
+binary: binary-indep binary-arch
+binary-indep: build-indep
+binary-arch: build-arch
        dh_testdir
        dh_testroot
        dh_installchangelogs 
@@ -53,5 +58,4 @@ binary-arch: apache20
        dh_md5sums
        dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary build-indep build-arch