Imported Debian patch 2.5.2p1-2

[debian/amanda] / debian / rules

diff --git a/debian/rules b/debian/rules
index a25c049e57a93f16563e69dbe8729012dedc506f..8055cf664161dd2a1068fca3c4fb3c2ae9f6af9e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,9 @@ build-stamp: /sbin/dump /usr/bin/smbclient debian/po/templates.pot
                --with-debugging=/var/log/amanda \
                --with-dumperdir=/usr/lib/amanda/dumper.d \
                --with-tcpportrange=50000,50100 --with-udpportrange=840,860 \
-               --with-maxtapeblocksize=256
+               --with-maxtapeblocksize=256 \
+               --with-ssh-security \
+               --with-bsdtcp-security --with-bsdudp-security
        touch missing
        make CFLAGS="-O2 -g -Wall \
                -DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \
@@ -40,9 +42,10 @@ build-stamp: /sbin/dump /usr/bin/smbclient debian/po/templates.pot
 clean:
        dh_testdir
        dh_testroot
-       -make clean
-       -make distclean
+       [ ! -f Makefile ] || make clean
+       [ ! -f Makefile ] || make distclean
        -rm -f build-stamp missing config/config.h common-src/genversion
+       -rm -f debian/po/templates.pot
        -find . -type d -name .deps -exec rm -rf {} \;
 
        -test -r /usr/share/misc/config.sub && \
@@ -50,6 +53,7 @@ clean:
        -test -r /usr/share/misc/config.guess && \
                cp -f /usr/share/misc/config.guess config/config.guess
 
+       debconf-updatepo
        dh_clean
 
 # Build architecture-independent files here.
@@ -71,6 +75,9 @@ binary-arch: build
        install -d $(r)/usr/share/doc/amanda-common/examples
        cp -a example/* $(r)/usr/share/doc/amanda-common/examples
        cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog
+       cp debian/xinetd.d/amandaidx $(server)/etc/xinetd.d
+       cp debian/xinetd.d/amidxtape $(server)/etc/xinetd.d
+       cp debian/xinetd.d/amanda $(r)/etc/xinetd.d                     
        dh_installmenu -a
        dh_installcron -a
        dh_installchangelogs -a