[med-svn] r12034 - in trunk/packages/python-biom-format/trunk/debian: . patches

[Timothy Booth]

Author: tbooth-guest
Date: 2012-08-10 17:22:42 +0000 (Fri, 10 Aug 2012)
New Revision: 12034

Modified:
   trunk/packages/python-biom-format/trunk/debian/changelog
   trunk/packages/python-biom-format/trunk/debian/get-orig-source
   trunk/packages/python-biom-format/trunk/debian/patches/enable_cython_beta.patch
   trunk/packages/python-biom-format/trunk/debian/rules
Log:
Small changes that helped me build on Ubuntu


Modified: trunk/packages/python-biom-format/trunk/debian/changelog
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/changelog	2012-08-10 17:13:59 UTC (rev 12033)
+++ trunk/packages/python-biom-format/trunk/debian/changelog	2012-08-10 17:22:42 UTC (rev 12034)
@@ -1,3 +1,10 @@
+python-biom-format (1.0.0-1ubuntu1) precise; urgency=low
+
+  * Rebuild for Precise 
+  * Minor changes to cleanup and get-orig-source that helped me
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Fri, 10 Aug 2012 18:08:06 +0100
+
 python-biom-format (1.0.0-1) unstable; urgency=low
 
   * Initial release (Closes: #682242)

Modified: trunk/packages/python-biom-format/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/get-orig-source	2012-08-10 17:13:59 UTC (rev 12033)
+++ trunk/packages/python-biom-format/trunk/debian/get-orig-source	2012-08-10 17:22:42 UTC (rev 12034)
@@ -1,12 +1,12 @@
 #!/bin/sh
-# get source for beast-mcmc from SVN because there is no source tarball distribution
+# Repack tarball because of ._ files
 
 set -e
 NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
 UNAME=`echo $NAME | sed 's/^python-//'`
 
 if ! echo $@ | grep -q upstream-version ; then
-    VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
+    VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-.\+$/\1/'`
     uscan --force-download
 else
     VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${NAME}.*?\1?"`

Modified: trunk/packages/python-biom-format/trunk/debian/patches/enable_cython_beta.patch
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/patches/enable_cython_beta.patch	2012-08-10 17:13:59 UTC (rev 12033)
+++ trunk/packages/python-biom-format/trunk/debian/patches/enable_cython_beta.patch	2012-08-10 17:22:42 UTC (rev 12034)
@@ -7,8 +7,8 @@
   - in case of to low Cython versions just install a copy
     of the created C++ code from 0.17~beta
 
---- biom-format-1.0.0.orig/setup.py
-+++ biom-format-1.0.0/setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -5,6 +5,7 @@
  from os.path import join, split
  from os import getcwd
@@ -17,7 +17,7 @@
  
  __author__ = "Daniel McDonald"
  __copyright__ = "Copyright 2012, The BIOM Format"
-@@ -25,7 +26,7 @@
+@@ -25,11 +26,15 @@
      import Cython
      from Cython.Distutils import build_ext
      
@@ -26,9 +26,6 @@
      if cy_version >= (0, 14, 1):
          cython_present = True
      else:
-@@ -31,6 +31,10 @@
-         cython_present = True
-     else:
          cython_present = False
 +    if  cy_version >= (0, 17, 0):
 +        cython_works_with_gcc47 = True
@@ -37,7 +34,7 @@
  except ImportError:
      cython_present = False
  
-@@ -52,7 +56,10 @@
+@@ -51,7 +56,10 @@
  if cython_present:
      from subprocess import Popen, PIPE
      from os import system

Modified: trunk/packages/python-biom-format/trunk/debian/rules
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/rules	2012-08-10 17:13:59 UTC (rev 12033)
+++ trunk/packages/python-biom-format/trunk/debian/rules	2012-08-10 17:22:42 UTC (rev 12034)
@@ -25,6 +25,7 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
+	find -name "._*" -exec rm -f '{}' ';'  #Needed if you try to build from pristine tarball
 	rm -rf python-code/support-code/_sparsemat.cpp
 
 override_dh_install: