* Update debhelper compatibility level to V4.

    - Remove all *.conffiles control files.  They're no longer needed.
    - Use misc:Depends to get debconf dependencies.
    - Use dh_install rather than the movefiles script.
  * openafs-dbserver doesn't need to depend on debconf.
  * Remove unnecessary preinst for openafs-fileserver.

diff --git a/debian/changelog b/debian/changelog
index cb5825b6db057e505d6be42d72bb9e88e374eb83..cb11d6bb8527da7d9653134a492c04e4dbe106e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,14 @@ openafs (1.3.81-5) unstable; urgency=low
       upstream makefiles don't always honor the configure options.)
     - /etc/init.d/openafs-fileserver restart starts bosserver if it's not
       already running.
-
- --
+  * Update debhelper compatibility level to V4.
+    - Remove all *.conffiles control files.  They're no longer needed.
+    - Use misc:Depends to get debconf dependencies.
+    - Use dh_install rather than the movefiles script.
+  * openafs-dbserver doesn't need to depend on debconf.
+  * Remove unnecessary preinst for openafs-fileserver.
+
+ -- Russ Allbery <rra@stanford.edu>  Sat, 30 Apr 2005 20:05:18 -0700
 
 openafs (1.3.81-4) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/debian/control b/debian/control
index f79aec1826a7dd228b1ef53e1e5992269a5fc52c..4d7e71ab46062bc506d630d3253361b36c10ae28 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.1
 
 Package: openafs-client
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64
-Depends: ${shlibs:Depends}, debconf,  openafs-modules-source (>= 1.2.9)|openafs-modules2
+Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-modules-source (>= 1.2.9) | openafs-modules2
 Conflicts: arla, openafs-modules1
 Description: The AFS distributed filesystem- client support
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -35,7 +35,7 @@ Description: The AFS distributed filesystem- old password changing
 
 Package: openafs-fileserver
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64
-Depends: ${shlibs:Depends}, debconf, openafs-client
+Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client
 Recommends: ntp
 Description: The AFS distributed filesystem- file server
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -47,7 +47,7 @@ Description: The AFS distributed filesystem- file server
 
 Package: openafs-dbserver
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64
-Depends: ${shlibs:Depends}, debconf, openafs-fileserver, openafs-client, perl5
+Depends: ${shlibs:Depends}, openafs-fileserver, openafs-client, perl5
 Conflicts: openafs-ptutil
 Replaces: openafs-ptutil
 Provides: openafs-ptutil

diff --git a/debian/filelist b/debian/filelist
deleted file mode 100644 (file)
index fbbda7b..0000000
--- a/debian/filelist
+++ /dev/null
@@ -1,17 +0,0 @@
-openafs-client/usr/sbin etc/fms etc/butc etc/backup
-openafs-client/usr/bin bin/fs bin/pts bin/bos etc/vos bin/tokens bin/sys 
-openafs-client/usr/bin bin/udebug bin/cmdebug bin/pagsh etc/rxdebug 
-openafs-client/usr/sbin root.client/usr/vice/etc/afsd
-openafs-client/usr/bin bin/klog  bin/kpwvalid bin/unlog bin/translate_et
-openafs-fileserver/usr/lib/openafs  root.server/usr/afs/bin/fileserver root.server/usr/afs/bin/volserver
-openafs-kpasswd/usr/bin bin/kpasswd etc/kas
-openafs-fileserver/usr/sbin    root.server/usr/afs/bin/bosserver
-openafs-fileserver/usr/lib/openafs root.server/usr/afs/bin/salvager 
-openafs-dbserver/usr/sbin root.server/usr/afs/bin/pt_util
-openafs-dbserver/usr/lib/openafs root.server/usr/afs/bin/buserver
-openafs-dbserver/usr/lib/openafs       root.server/usr/afs/bin/vlserver 
-openafs-dbserver/usr/lib/openafs root.server/usr/afs/bin/ptserver
-libopenafs-dev/usr/lib lib/*.a lib/afs
-libopenafs-dev/usr include
-libopenafs-dev/usr/bin bin/rxgen
-openafs-fileserver/usr/sbin root.server/usr/afs/bin/up*

diff --git a/debian/libopenafs-dev.install b/debian/libopenafs-dev.install
new file mode 100644 (file)
index 0000000..3790d82
--- /dev/null
+++ b/debian/libopenafs-dev.install
@@ -0,0 +1,4 @@
+dest/bin/rxgen                          usr/bin
+dest/include                            usr
+dest/lib/*.a                            usr/lib
+dest/lib/afs                            usr/lib

diff --git a/debian/movefiles b/debian/movefiles
deleted file mode 100755 (executable)
index ebed8ce..0000000
--- a/debian/movefiles
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-set -e
-
-
-# This script reads in  a set of lines in the form
-# destination sources
-# andmoves sources to destination
-# destination is relative to the debian directory
-target=`pwd`
-
-cd dest
-
-while read dest srcs ; do
-    mkdir -p ${target}/debian/$dest ||true
-    for foo in "$srcs"; do
-       cp -rp $foo ${target}/debian/$dest
-           done
-done

diff --git a/debian/openafs-client.conffiles b/debian/openafs-client.conffiles
deleted file mode 100644 (file)
index 5f74788..0000000
--- a/debian/openafs-client.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/openafs/afs.conf
-/etc/init.d/openafs-client

diff --git a/debian/openafs-client.install b/debian/openafs-client.install
new file mode 100644 (file)
index 0000000..ed9289b
--- /dev/null
+++ b/debian/openafs-client.install
@@ -0,0 +1,21 @@
+dest/bin/bos                            usr/bin
+dest/bin/cmdebug                        usr/bin
+dest/bin/fs                             usr/bin
+dest/bin/klog                           usr/bin
+dest/bin/kpwvalid                       usr/bin
+dest/bin/pagsh                          usr/bin
+dest/bin/pts                            usr/bin
+dest/bin/sys                            usr/bin
+dest/bin/tokens                         usr/bin
+dest/bin/translate_et                   usr/bin
+dest/bin/udebug                         usr/bin
+dest/bin/unlog                          usr/bin
+
+dest/etc/rxdebug                        usr/bin
+dest/etc/vos                            usr/bin
+
+dest/etc/backup                         usr/sbin
+dest/etc/butc                           usr/sbin
+dest/etc/fms                            usr/sbin
+
+dest/root.client/usr/vice/etc/afsd      usr/sbin

diff --git a/debian/openafs-dbserver.install b/debian/openafs-dbserver.install
new file mode 100644 (file)
index 0000000..fb0e64b
--- /dev/null
+++ b/debian/openafs-dbserver.install
@@ -0,0 +1,4 @@
+dest/root.server/usr/afs/bin/pt_util    usr/sbin
+dest/root.server/usr/afs/bin/buserver   usr/lib/openafs
+dest/root.server/usr/afs/bin/ptserver   usr/lib/openafs
+dest/root.server/usr/afs/bin/vlserver   usr/lib/openafs

diff --git a/debian/openafs-fileserver.conffiles b/debian/openafs-fileserver.conffiles
deleted file mode 100644 (file)
index 154a613..0000000
--- a/debian/openafs-fileserver.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/init.d/openafs-fileserver

diff --git a/debian/openafs-fileserver.install b/debian/openafs-fileserver.install
new file mode 100644 (file)
index 0000000..1cf5862
--- /dev/null
+++ b/debian/openafs-fileserver.install
@@ -0,0 +1,5 @@
+dest/root.server/usr/afs/bin/bosserver  usr/sbin
+dest/root.server/usr/afs/bin/up*        usr/sbin
+dest/root.server/usr/afs/bin/fileserver usr/lib/openafs
+dest/root.server/usr/afs/bin/salvager   usr/lib/openafs
+dest/root.server/usr/afs/bin/volserver  usr/lib/openafs

diff --git a/debian/openafs-fileserver.preinst b/debian/openafs-fileserver.preinst
deleted file mode 100644 (file)
index 6536fc0..0000000
--- a/debian/openafs-fileserver.preinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ upgrade = $1 ] ; then
-       . /usr/share/debconf/confmodule
-fi
-#DEBHELPER#
-
-exit 0

diff --git a/debian/openafs-kpasswd.install b/debian/openafs-kpasswd.install
new file mode 100644 (file)
index 0000000..2f6f72a
--- /dev/null
+++ b/debian/openafs-kpasswd.install
@@ -0,0 +1,2 @@
+dest/bin/kpasswd                        usr/bin
+dest/etc/kas                            usr/bin

diff --git a/debian/rules b/debian/rules
index d76a51d273f91c94d78d1e62a368e7a445575b42..609c5e93b3d35af40c40bdc1bc8bdccb01367049 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=2
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -87,6 +84,7 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
+       dh_install
        mkdir -p debian/openafs-dbserver/usr/share/man/man8
                /usr/bin/docbook-to-man debian/pt_util.sgml >debian/openafs-dbserver/usr/share/man/man8/pt_util.8
        for foo in $(LINTIAN_PACKAGES) ; do \
@@ -97,7 +95,6 @@ install: build
                ln -s openafs-client debian/$$pkg/usr/share/doc/$$pkg; \
                done
        # Add here commands to install the package into debian/tmp.
-       cat debian/filelist |sh debian/movefiles
        mv debian/openafs-client/usr/bin/pagsh  \
        debian/openafs-client/usr/bin/pagsh.openafs
        install -m644 -c dest/lib/pam_afs.so.1 \