[med-svn] r17349 - trunk/packages/velvet/trunk/debian

[Timothy Booth]

Author: tbooth-guest
Date: 2014-06-30 10:38:10 +0000 (Mon, 30 Jun 2014)
New Revision: 17349

Modified:
   trunk/packages/velvet/trunk/debian/rules
Log:
Remove MeteVelvet and VelvetOptimiser in dh_clean, not dh_install.


Modified: trunk/packages/velvet/trunk/debian/rules
===================================================================
--- trunk/packages/velvet/trunk/debian/rules	2014-06-30 10:28:00 UTC (rev 17348)
+++ trunk/packages/velvet/trunk/debian/rules	2014-06-30 10:38:10 UTC (rev 17349)
@@ -16,6 +16,8 @@
 	rm -rf debian.upstream
 	rm -f *.pdf
 	find -name '._*' -delete
+	rm -rf contrib/MetaVelvet*
+	rm -rf contrib/VelvetOptimiser*
 	rm -rf test_data.tar.*
 
 build_long_versions :
@@ -55,11 +57,7 @@
 	#MetaVelvet should be scrubbed, and VelvetOptimiser is now separate.  Note that these
 	#will not have been installed if this was a binarry-only build.
 	[ ! -e debian/velvet-example/usr ] || \
-	  rm -r debian/velvet-example/usr/share/doc/velvet/contrib/MetaVelvet*
-	[ ! -e debian/velvet-example/usr ] || { \
-	  rm -r debian/velvet-example/usr/share/doc/velvet/contrib/VelvetOptimiser* && \
-	  cp debian/VelvetOptimiser.README debian/velvet-example/usr/share/doc/velvet/contrib/ \
-	; }
+	    cp debian/VelvetOptimiser.README debian/velvet-example/usr/share/doc/velvet/contrib/
 
 #Prevent compression of user manual and sample code
 override_dh_compress :