Merge commit 'upstream/3.3.0'

[debian/amanda] / debian / rules

diff --git a/debian/rules b/debian/rules
index 74c21710c3acce84cb99eeb2395527b7cfa14877..3ef3fac3f6f209a1fd7cb62af27e1da2781ee7f3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,8 @@ configure-stamp:
                --with-ssh-security \
                --with-bsdtcp-security \
                --with-bsdudp-security \
-               --without-ipv6
+               --without-ipv6 \
+               --enable-s3-device
 
        touch missing
        touch configure-stamp
@@ -125,13 +126,13 @@ binary-arch: build
                $(s)/usr/sbin/amcheck
        install -o root -g root -m 0644 debian/amanda-client.lintian \
                $(c)/usr/share/lintian/overrides/amanda-client
-#      install -o root -g root -m 0644 debian/amanda-common.lintian \
-#              $(r)/usr/share/lintian/overrides/amanda-common
+       install -o root -g root -m 0644 debian/amanda-common.lintian \
+               $(r)/usr/share/lintian/overrides/amanda-common
        install -o root -g root -m 0644 debian/amanda-server.lintian \
                $(s)/usr/share/lintian/overrides/amanda-server
        dh_makeshlibs -pamanda-common --noscripts
        dh_installdeb -a
-       dh_perl -a
+       dh_perl -a usr/lib/amanda/perl
        dh_shlibdeps -a -l"debian/amanda-common/usr/lib:debian/amanda-client/usr/lib:debian/amanda-server/usr/lib"
        # strip out the non-versioned amanda-common references, we need
        # the versioned ones in the control file and dupes are ugly...