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

diff --git a/packaging/deb/rules b/packaging/deb/rules
index 511e3f7..dbad503 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.1p2
 
 # These are variables that the user can override.  They get used in various
 # places during configure, build, and install.
@@ -22,7 +22,7 @@ MANDIR=$(PREFIX)/share/man
 DOCDIR=$(PREFIX)/share/doc
 SYSCONFDIR=/etc
 LOCALSTATEDIR=/var
-AMHOMEDIR=$(LOCALSTATEDIR)/lib/amanda
+AMANDAHOMEDIR=$(LOCALSTATEDIR)/lib/amanda
 LOGDIR=$(LOCALSTATEDIR)/log/amanda
 # Extract the perl site_lib directory.  This is used to install amanda's perl 
 # libs. If configure finds a different install or you specify a different path using
@@ -60,8 +60,9 @@ build-stamp: /sbin/dump /usr/bin/smbclient
 		--libexecdir=$(LIBEXECDIR) \
 		--enable-shared \
 		--sysconfdir=$(SYSCONFDIR) \
-		--localstatedir=$(LOCALSTATEDIR)\
-		--with-gnutar-listdir=$(AMHOMEDIR)/gnutar-lists \
+		--localstatedir=$(LOCALSTATEDIR) \
+		--with-amdatadir=$(AMANDAHOMEDIR) \
+		--with-gnutar-listdir=$(AMANDAHOMEDIR)/gnutar-lists \
 		--with-index-server=localhost \
 		--with-tape-server=localhost \
 		--with-user=$(AMANDAUSER) \
@@ -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
 
@@ -138,14 +146,18 @@ binary-arch: build
 	#chmod -R u=rwX,g=rwX,o-rwx $(server)/$(LOGDIR)
 	chown -R $(AMANDAUSER):$(AMANDAGROUP)  $(client)/$(SYSCONFDIR)/amanda $(server)/$(SYSCONFDIR)/amanda
 	#chmod -R u=rwX,g=rwX,o-rwx $(server)/$(SYSCONFDIR)/amanda
-	chown -R $(AMANDAUSER):$(AMANDAGROUP) $(client)/$(AMHOMEDIR)/gnutar-lists $(server)/$(AMHOMEDIR)/gnutar-lists
-	chmod -R u=rwX,g=rwX,o-rwx  $(client)/$(AMHOMEDIR)/gnutar-lists $(server)/$(AMHOMEDIR)/gnutar-lists
+	chown -R $(AMANDAUSER):$(AMANDAGROUP) $(client)/$(AMANDAHOMEDIR)/gnutar-lists $(server)/$(AMANDAHOMEDIR)/gnutar-lists
+	chmod -R u=rwX,g=rwX,o-rwx  $(client)/$(AMANDAHOMEDIR)/gnutar-lists $(server)/$(AMANDAHOMEDIR)/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 \
@@ -165,8 +181,8 @@ binary-arch: build
 		$(server)$(AMLIBEXECDIR)/dumper \
 		$(server)$(AMLIBEXECDIR)/planner \
 		$(server)/usr/sbin/amcheck
-	echo "Amanda version $(AMVER)" >  $(server)/$(AMHOMEDIR)/amanda-release 
-	echo "Amanda version $(AMVER)" >  $(client)/$(AMHOMEDIR)/amanda-release 
+	echo "Amanda version $(AMVER)" >  $(server)/$(AMANDAHOMEDIR)/amanda-release 
+	echo "Amanda version $(AMVER)" >  $(client)/$(AMANDAHOMEDIR)/amanda-release 
 	install -o root -g root -m 0644 debian/amanda-backup-client.lintian \
 		$(client)/usr/share/lintian/overrides/amanda-backup-client
 	#install -o root -g root -m 0644 debian/amanda-common.lintian \