[Glibc-bsd-commits] r6065 - trunk/zfsutils/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-05-30 14:00:37 +0000 (Mon, 30 May 2016)
New Revision: 6065

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/rules
   trunk/zfsutils/debian/zfsutils.install
Log:
Rename ztest executable to zfstest, to avoid conflict with zutils
(Closes: #825268)


Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2016-05-30 13:27:52 UTC (rev 6064)
+++ trunk/zfsutils/debian/changelog	2016-05-30 14:00:37 UTC (rev 6065)
@@ -4,6 +4,8 @@
   * svn export with --ignore-keywords and re-pack upstream source
   * Refresh patch debian/patches/disable_libjail.diff
   * Abort on any error during svn export
+  * Rename ztest executable to zfstest, to avoid conflict with zutils
+    (Closes: #825268)
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Mon, 30 May 2016 14:11:59 +0100
 

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2016-05-30 13:27:52 UTC (rev 6064)
+++ trunk/zfsutils/debian/rules	2016-05-30 14:00:37 UTC (rev 6065)
@@ -153,7 +153,8 @@
 
 	$(PMAKE) -C $(CURDIR)/cddl/usr.sbin/zdb
 	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/zinject
-	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/ztest/
+	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/ztest/ && \
+	 mv -f $(CURDIR)/cddl/usr.bin/ztest/ztest $(CURDIR)/cddl/usr.bin/ztest/zfstest
 	touch $@
 
 clean:

Modified: trunk/zfsutils/debian/zfsutils.install
===================================================================
--- trunk/zfsutils/debian/zfsutils.install	2016-05-30 13:27:52 UTC (rev 6064)
+++ trunk/zfsutils/debian/zfsutils.install	2016-05-30 14:00:37 UTC (rev 6065)
@@ -4,7 +4,7 @@
 cddl/sbin/zpool/zpool				/sbin
 cddl/sbin/zfs/zfs				/sbin
 cddl/usr.bin/zinject/zinject  			/usr/bin
-cddl/usr.bin/ztest/ztest			/usr/bin
+cddl/usr.bin/ztest/zfstest			/usr/bin
 cddl/usr.sbin/zdb/zdb				/usr/sbin
 debian/local/bash_completion.d/zfsutils		/etc/bash_completion.d
 debian/local/default/zfs			/etc/default