[med-svn] r12031 - in trunk/packages/qiime/trunk/debian: . patches

[Timothy Booth]

Author: tbooth-guest
Date: 2012-08-10 14:02:30 +0000 (Fri, 10 Aug 2012)
New Revision: 12031

Modified:
   trunk/packages/qiime/trunk/debian/changelog
   trunk/packages/qiime/trunk/debian/control
   trunk/packages/qiime/trunk/debian/patches/series
   trunk/packages/qiime/trunk/debian/rules
Log:
Remove one unneeded patch and cleanup cleanup



Modified: trunk/packages/qiime/trunk/debian/changelog
===================================================================
--- trunk/packages/qiime/trunk/debian/changelog	2012-08-10 13:57:45 UTC (rev 12030)
+++ trunk/packages/qiime/trunk/debian/changelog	2012-08-10 14:02:30 UTC (rev 12031)
@@ -1,3 +1,12 @@
+qiime (1.5.0-2ubuntu1) precise; urgency=low
+
+  * Remove python26_trim_sff_primers.patch as Qiime now requires 
+    2.7 anyway
+  * Avoid calling dh_auto_clean at all as it triggers a partial
+    rebuild
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Fri, 10 Aug 2012 14:42:10 +0100
+
 qiime (1.5.0-2) unstable; urgency=low
 
   * debian/control:

Modified: trunk/packages/qiime/trunk/debian/control
===================================================================
--- trunk/packages/qiime/trunk/debian/control	2012-08-10 13:57:45 UTC (rev 12030)
+++ trunk/packages/qiime/trunk/debian/control	2012-08-10 14:02:30 UTC (rev 12031)
@@ -99,4 +99,4 @@
  PyCogent toolkit. It makes extensive use of unit tests, and is highly
  modular to facilitate custom analyses.
  .
- This package contains the documentation and a tutorial.
\ No newline at end of file
+ This package contains the documentation and a tutorial.

Modified: trunk/packages/qiime/trunk/debian/patches/series
===================================================================
--- trunk/packages/qiime/trunk/debian/patches/series	2012-08-10 13:57:45 UTC (rev 12030)
+++ trunk/packages/qiime/trunk/debian/patches/series	2012-08-10 14:02:30 UTC (rev 12031)
@@ -1,2 +1 @@
-python26_trim_sff_primers.patch
 fix_binary_helper_location.patch

Modified: trunk/packages/qiime/trunk/debian/rules
===================================================================
--- trunk/packages/qiime/trunk/debian/rules	2012-08-10 13:57:45 UTC (rev 12030)
+++ trunk/packages/qiime/trunk/debian/rules	2012-08-10 14:02:30 UTC (rev 12031)
@@ -26,8 +26,10 @@
 override_dh_builddeb:
 	dh_builddeb -- -Z xz
 
-override_dh_clean:
-	dh_clean
+override_dh_auto_clean:
+	#Calling "python setup.py clean -a" actually triggers a
+	#rebuild, so don't do it.
+	rm -rf build
 	rm -rf doc/_build
 	( cd $(pkg)/support_files/denoiser/FlowgramAlignment && make clean ) || true
 	rm -f $(pkg)/support_files/denoiser/bin/*