use dh_prep instead of dh_clean -k

[ckermit.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 447524e..e9faea2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 # debian/rules for ckermit
 # GNU copyright 1997 to 1999 by Joey Hess.
-# modified for ckermit by Ian Beckwith <ianb@nessie.mcc.ac.uk>
+# modified for ckermit by Ian Beckwith <ianb@debian.org>
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -20,15 +20,11 @@ else
        CFLAGS += -O2
 endif
 
-MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-lsocksd -Wl,-z,defs -Wl,--as-needed"
+MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-lsocks -Wl,-z,defs -Wl,--as-needed"
 
 #MAKETARGET=linux+krb5+krb4+openssl+shadow+pam
 MAKETARGET=linux+shadow+pam
 
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
-endif
-
 configure: configure-stamp
 configure-stamp:
        dh_testdir
@@ -58,7 +54,7 @@ clean:
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
 
        # Add here commands to install the package into debian/ckermit.
@@ -88,6 +84,7 @@ binary-arch: build install
        dh_installdebconf
        dh_installpam --name=kermit
        dh_installman
+       dh_lintian
        dh_link
        dh_strip
        dh_compress