From: Bdale Garbee <bdale@gag.com>
Date: Thu, 20 Aug 2009 07:03:25 +0000 (-0600)
Subject: many more lintian-related warnings addressed
X-Git-Tag: debian/2.6.1p1-1~11
X-Git-Url: https://git.gag.com/?p=debian%2Famanda;a=commitdiff_plain;h=b2afeabd945019dc648c1b51c10c01557c930434

many more lintian-related warnings addressed
---

diff --git a/debian/amanda-client.postinst b/debian/amanda-client.postinst
index 40a0b80..f8d7f1f 100644
--- a/debian/amanda-client.postinst
+++ b/debian/amanda-client.postinst
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 update-inetd --group "OTHER" --add "amanda dgram udp wait backup /usr/sbin/tcpd /usr/lib/amanda/amandad -auth=bsd amdump amindexd amidxtaped"
 
diff --git a/debian/amanda-client.prerm b/debian/amanda-client.prerm
index b86df5c..3645d0f 100644
--- a/debian/amanda-client.prerm
+++ b/debian/amanda-client.prerm
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 update-inetd --remove "amanda "
 
diff --git a/debian/amanda-server.postinst b/debian/amanda-server.postinst
index 0b76082..45d8772 100644
--- a/debian/amanda-server.postinst
+++ b/debian/amanda-server.postinst
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 update-inetd --group "OTHER" --add "amandaidx stream tcp nowait backup /usr/sbin/tcpd /usr/lib/amanda/amindexd amindexd -auth=bsd amdump amindexd amidxtaped"
 update-inetd --group "OTHER" --add "amidxtape stream tcp nowait backup /usr/sbin/tcpd /usr/lib/amanda/amidxtaped amidxtaped -auth=bsd amdump amindexd amidxtaped"
diff --git a/debian/amanda-server.prerm b/debian/amanda-server.prerm
index 2bcb874..4288026 100644
--- a/debian/amanda-server.prerm
+++ b/debian/amanda-server.prerm
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 update-inetd --remove amandaidx
 update-inetd --remove amidxtape
diff --git a/debian/config b/debian/config
index 6917623..5b622bb 100644
--- a/debian/config
+++ b/debian/config
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 . /usr/share/debconf/confmodule
 
diff --git a/debian/control b/debian/control
index a172aa9..87cdff5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.3
 
 Package: amanda-common
 Architecture: any
-Depends: ${shlibs:Depends}, update-inetd, tar (>=1.12), perl5, mailx, debconf | debconf-2.0, adduser, openbsd-inetd | inet-superserver
+Depends: ${misc:Depends}, ${shlibs:Depends}, update-inetd, tar (>=1.12), perl5, mailx, debconf | debconf-2.0, adduser, openbsd-inetd | inet-superserver
 Suggests: amanda-server (= ${binary:Version}) | amanda-client (= ${binary:Version})
 Conflicts: amanda
 Replaces: amanda, amanda-client
@@ -19,7 +19,7 @@ Description: Advanced Maryland Automatic Network Disk Archiver (Libs)
 
 Package: amanda-server
 Architecture: any
-Depends: ${shlibs:Depends}, amanda-common (= ${binary:Version}), mailx
+Depends: ${misc:Depends}, ${shlibs:Depends}, amanda-common (= ${binary:Version}), mailx
 Suggests: perl5, gnuplot, amanda-client (= ${binary:Version}), cpio | mt-st
 Conflicts: amanda, amanda-common (<< 1:2.5.2p1-3)
 Replaces: amanda-common (<< 1:2.5.2p1-3)
@@ -67,7 +67,7 @@ Description: Advanced Maryland Automatic Network Disk Archiver (Server)
 
 Package: amanda-client
 Architecture: any
-Depends: ${shlibs:Depends}, amanda-common (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, amanda-common (= ${binary:Version})
 Suggests: gnuplot, dump, smbclient
 Conflicts: amanda, amanda-common (<< 1:2.5.2p1-3)
 Replaces: amanda-common (<< 1:2.5.2p1-3)
diff --git a/debian/postinst b/debian/postinst
index dcba6bf..be6a549 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 . /usr/share/debconf/confmodule
 
diff --git a/debian/preinst b/debian/preinst
index b7a735b..e541f24 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # if a .amandahosts exists and is not a symlink, move it to /etc
 if [ ! -L ~backup/.amandahosts ]
diff --git a/debian/rules b/debian/rules
index 764713c..c9c34fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ configure-stamp:
 		--bindir=/usr/sbin \
 		--libexecdir=/usr/lib/amanda \
 		--without-amlibexecdir \
+		--with-amperldir=/usr/share/perl
 		--sysconfdir=/etc \
 		--sharedstatedir=/var/lib \
 		--localstatedir=/var/lib \