X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=packaging%2Fdeb%2Frules;h=f92d2b9318d882b61198eed8d38e6d35292973b5;hb=d74dc4d908fcbc1a4ef474edaf51e61ec90eab6b;hp=511e3f71d393b49b9ef62d9a7e5e1beb1d764765;hpb=a6127998ee6dcab6bb034f6ca985b07804a86f9a;p=debian%2Famanda

diff --git a/packaging/deb/rules b/packaging/deb/rules
index 511e3f7..f92d2b9 100755
--- a/packaging/deb/rules
+++ b/packaging/deb/rules
@@ -8,7 +8,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-AMVER=2.6.0p1
+AMVER=2.6.1p1
 
 # These are variables that the user can override.  They get used in various
 # places during configure, build, and install.
@@ -60,7 +60,8 @@ build-stamp: /sbin/dump /usr/bin/smbclient
 		--libexecdir=$(LIBEXECDIR) \
 		--enable-shared \
 		--sysconfdir=$(SYSCONFDIR) \
-		--localstatedir=$(LOCALSTATEDIR)\
+		--localstatedir=$(LOCALSTATEDIR) \
+		--with-amdatadir=$(AMHOMEDIR) \
 		--with-gnutar-listdir=$(AMHOMEDIR)/gnutar-lists \
 		--with-index-server=localhost \
 		--with-tape-server=localhost \
@@ -81,6 +82,13 @@ build-stamp: /sbin/dump /usr/bin/smbclient
 		--enable-s3-device \
 		--disable-installperms
 	touch missing
+	# There's probably a better way to do this.  Preinst and postrm are the
+	# same for client and server, but we leave room for differences by just
+	# appending here.
+	cat $(shell pwd)/debian/preinst >> $(shell pwd)/debian/amanda-backup-client.preinst
+	cat $(shell pwd)/debian/preinst >> $(shell pwd)/debian/amanda-backup-server.preinst
+	cat $(shell pwd)/debian/postrm >> $(shell pwd)/debian/amanda-backup-client.postrm
+	cat $(shell pwd)/debian/postrm >> $(shell pwd)/debian/amanda-backup-server.postrm
 	make 
 	touch build-stamp
 
@@ -142,10 +150,14 @@ binary-arch: build
 	chmod -R u=rwX,g=rwX,o-rwx  $(client)/$(AMHOMEDIR)/gnutar-lists $(server)/$(AMHOMEDIR)/gnutar-lists
 	# .. setuid
 	chown root:disk \
+ 		$(client)/$(AMLIBEXECDIR)/application/amgtar \
+ 		$(client)/$(AMLIBEXECDIR)/application/amstar \
 		$(client)/$(AMLIBEXECDIR)/killpgrp \
 		$(client)/$(AMLIBEXECDIR)/rundump \
 		$(client)/$(AMLIBEXECDIR)/runtar \
 		$(client)/$(AMLIBEXECDIR)/calcsize \
+ 		$(server)/$(AMLIBEXECDIR)/application/amgtar \
+ 		$(server)/$(AMLIBEXECDIR)/application/amstar \
 		$(server)/$(AMLIBEXECDIR)/killpgrp \
 		$(server)/$(AMLIBEXECDIR)/rundump \
 		$(server)/$(AMLIBEXECDIR)/runtar \
@@ -154,10 +166,14 @@ binary-arch: build
 		$(server)/$(AMLIBEXECDIR)/planner \
 		$(server)/usr/sbin/amcheck
 	chmod u=srwx,g=rx,o=r \
+ 		$(client)/$(AMLIBEXECDIR)/application/amgtar \
+ 		$(client)/$(AMLIBEXECDIR)/application/amstar \
 		$(client)$(AMLIBEXECDIR)/killpgrp \
 		$(client)$(AMLIBEXECDIR)/rundump \
 		$(client)$(AMLIBEXECDIR)/runtar \
 		$(client)$(AMLIBEXECDIR)/calcsize \
+ 		$(server)/$(AMLIBEXECDIR)/application/amgtar \
+ 		$(server)/$(AMLIBEXECDIR)/application/amstar \
 		$(server)$(AMLIBEXECDIR)/killpgrp \
 		$(server)$(AMLIBEXECDIR)/rundump \
 		$(server)$(AMLIBEXECDIR)/runtar \