From d0c97758a8da51ed1671209e70b17ba5986c2bb4 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 03:04:01 +0000 Subject: [PATCH] Merge r7368 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7628 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- debian/rules | 6 ++---- debian/scstadmin.install | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index c2591379c..b7ca75918 100755 --- a/debian/rules +++ b/debian/rules @@ -72,11 +72,9 @@ install: grep -E '^Makefile$$|^(fcst|iscsi-scst|qla2x00t|scst|scst_local|srpt)/'|\ tar -T- -cf- | \ tar -C $(DESTDIR)/usr/src/scst-$(VERSION) -xf- && \ - chmod -R 0644 $(DESTDIR)/usr/src/scst-$(VERSION) && \ - chmod 0644 "$(DESTDIR)"/usr/lib/*/perl/*/auto/SCST_SCST/.packlist "$(DESTDIR)"/usr/share/perl/*/SCST/SCST.pm && \ - chmod 0755 "$(DESTDIR)"/usr/lib/*/perl/*/auto/SCST_SCST && \ + find $(DESTDIR) -type f -print0 | xargs -0 -r chmod 0644 && \ + find $(DESTDIR) -type d -print0 | xargs -0 -r chmod 0755 && \ mv "$(DESTDIR)"/usr/man "$(DESTDIR)"/usr/share/man && \ - rm -rf "$(DESTDIR)"/usr/man && \ dh_install && \ dh_installman && \ dh_installchangelogs && \ diff --git a/debian/scstadmin.install b/debian/scstadmin.install index f1d5a2822..00d0fe178 100644 --- a/debian/scstadmin.install +++ b/debian/scstadmin.install @@ -1,7 +1,7 @@ etc/init.d/scst usr/sbin/scstadmin -usr/share/perl/*/SCST/SCST.pm -usr/lib/*/perl/*/auto/SCST_SCST +usr/share/perl/ +usr/lib/ usr/share/man/man3/SCST::SCST.3pm* usr/share/man/man1/scstadmin.1* usr/share/man/man5/scst.5*