Sync with current Debian version.

[netatalk.git] / distrib / debian / rules

diff --git a/distrib/debian/rules b/distrib/debian/rules
index b2abc03badfab0712dc47ac12e1562695e61fd5d..4e3646585e2677f7c35e6a7d3378ef1af024f3e7 100755 (executable)
--- a/distrib/debian/rules
+++ b/distrib/debian/rules
@@ -22,7 +22,9 @@ configure-stamp:
        ./configure --with-shadow --enable-fhs \
                --sysconfdir=/etc/netatalk --with-config-dir=/etc/netatalk \
                --with-tcp-wrappers --mandir=/usr/share/man --prefix=/usr \
-               --enable-timelord --with-did=last --without-ssl-dir
+               --enable-timelord --with-did=last --without-ssl-dir \
+               --with-cracklib=/var/cache/cracklib/cracklib_dict \
+               --enable-overwrite
 
        touch configure-stamp
 
@@ -51,17 +53,12 @@ install: build
 
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-       # Remove a config file that is not used by the Debian init script.
-       rm debian/tmp/etc/netatalk/netatalk.conf
+       # Manually move a file that would get installed in the wrong place.
+       mv debian/tmp/etc/netatalk/netatalk.conf debian/netatalk/etc/default/netatalk
 
-       # Manually remove a header file that is shipped with glibc and
-       # the Linux Kernel.
-       rm debian/tmp/usr/include/netatalk/at.h
-
-       # Remove /usr/bin/timeout and timeout(1) as they conflict with
-       # the timeout package.
-       rm debian/tmp/usr/bin/timeout
-       rm debian/tmp/usr/share/man/man1/timeout.1
+       # Install logcheck files
+       install -m 644 debian/logcheck/ignore.d.server debian/netatalk/etc/logcheck/ignore.d.server/netatalk
+       install -m 644 debian/logcheck/violations.ignore.d debian/netatalk/etc/logcheck/violations.ignore.d/netatalk
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -73,6 +70,7 @@ binary-arch: build install
        dh_movefiles
 
        dh_installdocs
+       dh_installexamples
        dh_installinit --update-rcd-params="defaults 50 50"
        dh_installman
        dh_undocumented
@@ -84,6 +82,7 @@ binary-arch: build install
        dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
+       dh_perl
        dh_gencontrol
        dh_md5sums
        dh_builddeb