[med-svn] r13902 - trunk/packages/qiime/trunk/debian

[Timothy Booth]

Author: tbooth-guest
Date: 2013-06-10 17:19:33 +0000 (Mon, 10 Jun 2013)
New Revision: 13902

Modified:
   trunk/packages/qiime/trunk/debian/changelog
   trunk/packages/qiime/trunk/debian/qiime-doc.install
   trunk/packages/qiime/trunk/debian/qiime.docs
   trunk/packages/qiime/trunk/debian/rules
   trunk/packages/qiime/trunk/debian/watch
Log:
SVN is giving me stupid errors again.  Trying to delete and re-add stuff until it
stops bitching at me.


Modified: trunk/packages/qiime/trunk/debian/changelog
===================================================================
--- trunk/packages/qiime/trunk/debian/changelog	2013-06-10 14:50:15 UTC (rev 13901)
+++ trunk/packages/qiime/trunk/debian/changelog	2013-06-10 17:19:33 UTC (rev 13902)
@@ -1,23 +1,53 @@
-qiime (1.5.0+dfsg-2) UNRELEASED; urgency=low
+qiime (1.7.0-0biolinux1) precise; urgency=low
 
-  * debian/rules: Use xz compression for binary packages
+  * New usptream
+  * Adopt new naming convention
 
- -- Andreas Tille <tille at debian.org>  Mon, 03 Jun 2013 10:55:37 +0200
+ -- Tim Booth <tbooth at ceh.ac.uk>  Mon, 10 Jun 2013 18:03:00 +0100
 
-qiime (1.5.0+dfsg-1) unstable; urgency=low
+qiime (1.6.0-0ubuntu2) precise; urgency=low
 
-  * debian/copyright: - Add Files-Excluded to document what was removed
+  * Add some aliases so that the python-biom-format tools can be
+    called with .py extensions inside the qiime shell, because this 
+    is consistent with what QIIME users expect.
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Thu, 02 May 2013 15:05:34 +0100
+
+qiime (1.6.0-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+  * Don't bother re-packing the tarball for PPA.  Package now
+    builds the same with re-packed or pristine.
+  * Remove t-test bug patch as this is in upstream
+  * Re-jig RDP version patch which is simplified but still needed
+  * Note the upstream no longer includes an example parameters.txt
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Fri, 04 Jan 2013 12:51:49 +0000
+
+qiime (1.5.0+repack-2ubuntu11) precise; urgency=low
+
+  * The support_files patch only solved part of the problem,
+    so trying a different, and simpler, tack. 
+  * Changes from Debian:
+
+  qiime (1.5.0+dfsg-2) UNRELEASED; urgency=low
+   * debian/rules: Use xz compression for binary packages
+  -- Andreas Tille <tille at debian.org>  Mon, 03 Jun 2013 10:55:37 +0200
+  
+  qiime (1.5.0+dfsg-1) unstable; urgency=low
+   * debian/copyright: - Add Files-Excluded to document what was removed
     from original source
-  * debian/watch: Enable '+dfsg' suffix in Debian versions
-  * debian/control:
+   * debian/watch: Enable '+dfsg' suffix in Debian versions
+   * debian/control:
      - Remove DM-Upload-Allowed
      - Standards-Version: 3.9.4 (no changes needed)
      - Priority: optional (per Debian Med policy)
      - normalised format
      - Build-Depends: ghc (instead of ghc6)
        Closes: #710774
+   -- Andreas Tille <tille at debian.org>  Mon, 03 Jun 2013 10:38:33 +0200
 
- -- Andreas Tille <tille at debian.org>  Mon, 03 Jun 2013 10:38:33 +0200
+ -- Tim Booth <tbooth at ceh.ac.uk>  Tue, 20 Nov 2012 12:26:24 +0000
 
 qiime (1.5.0+repack-2ubuntu10) precise; urgency=low
 

Modified: trunk/packages/qiime/trunk/debian/qiime-doc.install
===================================================================
--- trunk/packages/qiime/trunk/debian/qiime-doc.install	2013-06-10 14:50:15 UTC (rev 13901)
+++ trunk/packages/qiime/trunk/debian/qiime-doc.install	2013-06-10 17:19:33 UTC (rev 13902)
@@ -1,4 +1,4 @@
-qiime_tutorial/	usr/share/doc/qiime
+examples/	usr/share/doc/qiime
 doc/_build/*	usr/share/doc/qiime
 doc/vb_files	usr/share/doc/qiime
 qiime/support_files/denoiser/TestData   usr/lib/qiime/support_files/denoiser

Modified: trunk/packages/qiime/trunk/debian/qiime.docs
===================================================================
--- trunk/packages/qiime/trunk/debian/qiime.docs	2013-06-10 14:50:15 UTC (rev 13901)
+++ trunk/packages/qiime/trunk/debian/qiime.docs	2013-06-10 17:19:33 UTC (rev 13902)
@@ -1,2 +1 @@
 README
-qiime_parameters.txt

Modified: trunk/packages/qiime/trunk/debian/rules
===================================================================
--- trunk/packages/qiime/trunk/debian/rules	2013-06-10 14:50:15 UTC (rev 13901)
+++ trunk/packages/qiime/trunk/debian/rules	2013-06-10 17:19:33 UTC (rev 13902)
@@ -30,6 +30,8 @@
 	rm -rf doc/_build
 	( cd $(pkg)/support_files/denoiser/FlowgramAlignment && make clean ) || true
 	rm -f $(pkg)/support_files/denoiser/bin/*
+	#In case the tarball was not re-packed, remove any .jars
+	find -name '*.jar' -exec rm '{}' ';'
 
 export ROOTDIR=debian/$(pkg)
 
@@ -54,7 +56,7 @@
 	done
 
 override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs ChangeLog.md
 
 override_dh_builddeb:
 	dh_builddeb -- -Z xz

Modified: trunk/packages/qiime/trunk/debian/watch
===================================================================
--- trunk/packages/qiime/trunk/debian/watch	2013-06-10 14:50:15 UTC (rev 13901)
+++ trunk/packages/qiime/trunk/debian/watch	2013-06-10 17:19:33 UTC (rev 13902)
@@ -1,4 +1,4 @@
 version=3
-opts=dversionmangle=s/\+dfsg[0-9]*// \
-  http://sf.net/qiime/Qiime-([.0-9]+)\.tar\.gz \
-  debian debian/get-orig-source
+opts=dversionmangle=s/\+.*// \
+  ftp://thebeast.colorado.edu/pub/qiime-releases/[Qq]iime-([.0-9]+)\.tar\.gz
+#  debian debian/get-orig-source