Fix creation of the openafs-modules-* packages

Also remove server documentation from openafs-modules-source and add
the README to openafs-modules-dkms, and remove DH_OPTIONS from
debian/rules since it's no longer needed.

diff --git a/debian/changelog b/debian/changelog
index efde5d0c9f8af86481b64cb3ae356e6a288c5655..4c22fd007bad19e2c3fca376d4e3a8edd6a0577c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,7 @@ openafs (1.4.8.dfsg1-1) UNRELEASED; urgency=low
   * Add ${misc:Depends} to all dependencies.
   * Add explanations for the Lintian overrides.
   * Use set -e instead of #!/bin/sh -e in maintainer scripts.
+  * Remove server documentation from openafs-modules-source.
   * Translation updates:
     - Spanish, thanks Francisco Javier Cuadrado.  (Closes: #514452)
 

diff --git a/debian/openafs-modules-dkms.docs b/debian/openafs-modules-dkms.docs
new file mode 100644 (file)
index 0000000..e845566
--- /dev/null
+++ b/debian/openafs-modules-dkms.docs
@@ -0,0 +1 @@
+README

diff --git a/debian/openafs-modules-source.docs b/debian/openafs-modules-source.docs
index 3d959f95068a3fd0c88bb3fa7ab41d2f4a30c9da..6cbdf7ce8a2e822795972c147af949ed7a2c46a0 100644 (file)
--- a/debian/openafs-modules-source.docs
+++ b/debian/openafs-modules-source.docs
@@ -1,4 +1,2 @@
 README
-debian/README.servers
-debian/configuration-transcript.txt
 debian/README.modules

diff --git a/debian/rules b/debian/rules
index 5d45712ca487485ccfc25e61961a90a4950c0d5a..b1bdc868daeb8f9549f3edb58e8abd64c5550790 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
 # Tell Autoconf the correct system types.
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -109,13 +106,18 @@ clean:
            || mv doc/man-pages/pod1/afs-up.pod doc/man-pages/pod1/up.pod
        dh clean
 
-# Rules for building the openafs-modules-source package.  We generate both a
-# DKMS package and a typical source tarball package usable by
-# module-assistant.
-install-source-stamp:
-       dh_testdir
-       dh_testroot
-       rm -rf debian/$(srcpkg)
+install: install-stamp
+install-stamp: build-stamp
+       dh install --until dh_prep
+       mkdir -p $(CURDIR)/debian/tmp
+       $(MAKE) install_nolibafs DESTDIR=$(CURDIR)/debian/tmp
+       rm -f debian/tmp/usr/bin/klog.krb
+       chmod +x debian/afs-rootvol debian/afs-newcell
+       dh_installdirs
+       dh_install --fail-missing $(IGNORE)
+       dh_installinit -popenafs-client -r -- defaults 25 20
+       dh_installinit -popenafs-fileserver -r
+
        install -d debian/$(srcpkg)/usr/src/modules/$(package)
        find . \( -name \*.o -o -path ./debian -o -path \*/.svn \
            -o -path ./src/WINNT -o -path ./doc -o -path ./obj \
@@ -143,26 +145,7 @@ install-source-stamp:
            debian/$(dkmspkg)/usr/src/openafs-$(VERSION)
        sed -e 's/[@]VERSION[@]/$(VERSION)/' debian/dkms.conf.in \
            > debian/$(dkmspkg)/usr/src/openafs-$(VERSION)/dkms.conf
-       touch $@
 
-install: install-stamp
-install-stamp: DH_OPTIONS=
-install-stamp: build-stamp install-source-stamp
-       dh install --until dh_prep
-       mkdir -p $(CURDIR)/debian/tmp
-       $(MAKE) install_nolibafs DESTDIR=$(CURDIR)/debian/tmp
-       rm -f debian/tmp/usr/bin/klog.krb
-       chmod +x debian/afs-rootvol debian/afs-newcell
-       dh_installdirs
-       dh_install --fail-missing $(IGNORE)
-       dh_installinit -popenafs-client -r -- defaults 25 20
-       dh_installinit -popenafs-fileserver -r
-
-       set -e; for pkg in $(LINTIAN_PACKAGES) ; do \
-           install -d debian/$$pkg/usr/share/lintian/overrides; \
-           install -m 644 -c debian/$$pkg.lintian \
-               debian/$$pkg/usr/share/lintian/overrides/$$pkg; \
-       done
        set -e; for pkg in $(DOC_PACKAGES) ; do \
            ln -s openafs-client debian/$$pkg/usr/share/doc/$$pkg; \
        done