fix bugs associated with new tar-scripts package

diff --git a/debian/changelog b/debian/changelog
index 08f266d5e8d222e432bc70c4b580a491f1765e95..80e7c09bdc52dc3427a62245abe35ec1b1e47503 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 tar (1.26+dfsg-11) unstable; urgency=low
 
-  * tar-scripts must conflict with openafs-client, closes: #724064
+  * prefix backup and restore scripts with tar- to avoid conflicts with
+    other packages like openafs-client, closes: #724064, #724240
+  * move "libexec" content from tar-scripts to /usr/lib/tar, closes: #724238
 
- -- Bdale Garbee <bdale@gag.com>  Sun, 22 Sep 2013 18:00:35 -0600
+ -- Bdale Garbee <bdale@gag.com>  Mon, 23 Sep 2013 23:46:56 -0600
 
 tar (1.26+dfsg-10) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index fe0fc0a3f41c59556eda6808ca65b3ecac60af58..5ab1d39a84da58d0ab4e8e756b425635cfa0f41b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ configure-stamp:
        cp -f /usr/share/misc/config.guess build-aux/config.guess
        RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
                --prefix=/usr \
-               --libexecdir=/usr/sbin \
+               --libexecdir=/usr/lib/tar \
                --enable-backup-scripts \
                --with-lzma=xz \
                $(CONFARGS) 
@@ -60,14 +60,15 @@ install: build
        dh_installdirs
 
        make install bindir=`pwd`/debian/tar/bin prefix=`pwd`/debian/tar/usr \
-               libexecdir=`pwd`/debian/tar/usr/sbin 
+               libexecdir=`pwd`/debian/tar/usr/lib/tar 
        install -m 755 debian/rmt.sh debian/tar/etc/rmt
-       mv debian/tar/usr/sbin/rmt debian/tar/usr/sbin/rmt-tar
+       mv debian/tar/usr/lib/tar/rmt debian/tar/usr/sbin/rmt-tar
        install -m 755 debian/tarcat debian/tar/usr/sbin/tarcat
 
-       mv debian/tar/usr/sbin/backup* debian/tar-scripts/usr/sbin/
-       mv debian/tar/usr/sbin/restore debian/tar-scripts/usr/sbin/
-       mv debian/tar/usr/sbin/dump-remind debian/tar-scripts/usr/sbin/
+       mv debian/tar/usr/sbin/backup debian/tar-scripts/usr/sbin/tar-backup
+       mv debian/tar/usr/sbin/restore debian/tar-scripts/usr/sbin/tar-restore
+       mv debian/tar/usr/lib/tar/backup.sh debian/tar-scripts/usr/lib/tar/
+       mv debian/tar/usr/lib/tar/dump-remind debian/tar-scripts/usr/lib/tar/
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/debian/tar-scripts.dirs b/debian/tar-scripts.dirs
index 236670a2d0f482de71df55c13f785fadb3cd13df..db9fa801a06515202ffdd6a593d8428071ff8321 100644 (file)
--- a/debian/tar-scripts.dirs
+++ b/debian/tar-scripts.dirs
@@ -1 +1,2 @@
+usr/lib/tar
 usr/sbin