From cda8f3799ea20b0d39223fbeb16e3b9a074a4ae6 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 24 Sep 2013 00:25:48 -0600 Subject: [PATCH] fix bugs associated with new tar-scripts package --- debian/changelog | 6 ++++-- debian/rules | 13 +++++++------ debian/tar-scripts.dirs | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08f266d5..80e7c09b 100644 --- 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 Sun, 22 Sep 2013 18:00:35 -0600 + -- Bdale Garbee 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 fe0fc0a3..5ab1d39a 100755 --- 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 236670a2..db9fa801 100644 --- a/debian/tar-scripts.dirs +++ b/debian/tar-scripts.dirs @@ -1 +1,2 @@ +usr/lib/tar usr/sbin -- 2.30.2