diff --git a/debian/changelog b/debian/changelog index 95ba45a88075f5a1d28c3c6128d929b3a33a6329..1a08f9d2263fdcd2c541660f20398c9233a61329 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ tar (1.30+dfsg-5) unstable; urgency=medium - * don't deliver empty /usr/lib/tar in tar package, closes: #919493 + * change libexecdir in configure to /usr/sbin, closes: #760247, #919493 * switched to upstream man pages as of 1.29b, closes: #729980, #391060 * add references to the non-free tar-doc package, and the URL for the tar documentation on the FSF's web site to README.Debian, closes: #711726 - -- Bdale Garbee <bdale@gag.com> Sun, 03 Feb 2019 21:07:52 -0700 + -- Bdale Garbee <bdale@gag.com> Mon, 04 Feb 2019 10:43:28 -0700 tar (1.30+dfsg-4) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index fd5d4bc61b7782d183988c2ad18771ab3fae7dbf..dd54a9d98f0d9691cabb42060088484a35bc23c7 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ configure-stamp: autoreconf --force -v --install RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib/tar \ + --libexecdir=/usr/sbin \ --enable-backup-scripts \ --with-lzma=xz \ --disable-silent-rules \ @@ -69,16 +69,15 @@ install: build dh_installdirs make install bindir=`pwd`/debian/tar/bin prefix=`pwd`/debian/tar/usr \ - libexecdir=`pwd`/debian/tar/usr/lib/tar + libexecdir=`pwd`/debian/tar/usr/sbin + mv debian/tar/usr/sbin/rmt debian/tar/usr/sbin/rmt-tar ln -s /usr/sbin/rmt debian/tar/etc/rmt - 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/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/ - rmdir debian/tar/usr/lib + mv debian/tar/usr/sbin/backup.sh debian/tar-scripts/usr/sbin/ + mv debian/tar/usr/sbin/dump-remind debian/tar-scripts/usr/sbin/ # Build architecture-independent files here. binary-indep: build install diff --git a/debian/tar-scripts.dirs b/debian/tar-scripts.dirs index db9fa801a06515202ffdd6a593d8428071ff8321..236670a2d0f482de71df55c13f785fadb3cd13df 100644 --- a/debian/tar-scripts.dirs +++ b/debian/tar-scripts.dirs @@ -1,2 +1 @@ -usr/lib/tar usr/sbin