X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=3ef3fac3f6f209a1fd7cb62af27e1da2781ee7f3;hb=e45061df5aeed15082a079565608ef9716921392;hp=a26fcc19bcbfd7166ebe54e975130e5c9170e01a;hpb=c01a2e8c981d145455de63653123a7b52756a9b5;p=debian%2Famanda

diff --git a/debian/rules b/debian/rules
index a26fcc1..3ef3fac 100755
--- 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
@@ -53,11 +54,6 @@ build-stamp: configure-stamp
 	MAILER=/usr/bin/mail $(MAKE) CFLAGS="-O2 -g -Wall \
 		-DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \
 		-DIGNORE_TAR_ERRORS "
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	$(MAKE) check
-endif
-endif
 	touch build-stamp
 
 clean:
@@ -97,7 +93,6 @@ binary-arch: build
 	dh_compress -a
 	dh_movefiles -a --sourcedir=debian/amanda-common
 	rm -r $(r)/usr/share/amanda
-	rm $(s)/usr/lib/amanda/chg-mtx
 	dh_fixperms -av
 	# fix perms manually
 	chown -R backup:backup debian/*/var/lib/*
@@ -131,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...