[med-svn] r16978 - in trunk/packages/python-biom-format/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Tue May 20 19:07:56 UTC 2014
Author: tille
Date: 2014-05-20 19:07:56 +0000 (Tue, 20 May 2014)
New Revision: 16978
Modified:
trunk/packages/python-biom-format/trunk/debian/changelog
trunk/packages/python-biom-format/trunk/debian/control
trunk/packages/python-biom-format/trunk/debian/patches/ignore_local_dist-packages.patch
trunk/packages/python-biom-format/trunk/debian/patches/no-web-adds.patch
trunk/packages/python-biom-format/trunk/debian/patches/series
trunk/packages/python-biom-format/trunk/debian/rules
Log:
Adapt to new upstream version but documentation build fails (will ask on Debian Python list for help)
Modified: trunk/packages/python-biom-format/trunk/debian/changelog
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/changelog 2014-05-20 15:20:48 UTC (rev 16977)
+++ trunk/packages/python-biom-format/trunk/debian/changelog 2014-05-20 19:07:56 UTC (rev 16978)
@@ -1,3 +1,10 @@
+python-biom-format (2.0.0+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream version (adpated Build-Depends and patches)
+ * switch to dh-python using buildsystem=pybuild
+
+ -- Andreas Tille <tille at debian.org> Tue, 20 May 2014 19:16:23 +0200
+
python-biom-format (1.3.1+dfsg-1) unstable; urgency=medium
[ Andreas Tille ]
Modified: trunk/packages/python-biom-format/trunk/debian/control
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/control 2014-05-20 15:20:48 UTC (rev 16977)
+++ trunk/packages/python-biom-format/trunk/debian/control 2014-05-20 19:07:56 UTC (rev 16978)
@@ -4,15 +4,17 @@
Section: python
Priority: optional
Build-Depends: debhelper (>= 9),
+ dh-python,
dh-linktree,
- python-all,
+ python-dev,
python-numpy,
help2man,
python-dateutil,
python-cogent,
pyqi (>= 0.3.1),
python-nose,
- python-sphinx,
+ python-sphinx,
+ python-setuptools,
bash-completion
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/python-biom-format/trunk/
@@ -21,7 +23,7 @@
X-Python-Version: >= 2.6
Package: python-biom-format
-Architecture: all
+Architecture: any
Depends: ${python:Depends},
${misc:Depends},
${js:Depends},
Modified: trunk/packages/python-biom-format/trunk/debian/patches/ignore_local_dist-packages.patch
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/patches/ignore_local_dist-packages.patch 2014-05-20 15:20:48 UTC (rev 16977)
+++ trunk/packages/python-biom-format/trunk/debian/patches/ignore_local_dist-packages.patch 2014-05-20 19:07:56 UTC (rev 16978)
@@ -6,8 +6,8 @@
the full answer here as we have one module hooking in another, and probably
looking for the default installed version is normally what you'd want.
---- a/scripts/biom
-+++ b/scripts/biom
+--- biom-format-2.0.0.orig/scripts/biom
++++ biom-format-2.0.0/scripts/biom
@@ -19,4 +19,6 @@
# __maintainer__ = "Greg Caporaso"
# __email__ = "gregcaporaso at gmail.com"
@@ -15,14 +15,14 @@
+export PYTHONPATH=/usr/lib/python`python --version 2>&1 | grep -o '[1-9]\.[0-9]\+'`/dist-packages
+
exec pyqi --driver-name biom --command-config-module biom.interfaces.optparse.config -- "$@"
---- a/biom/__init__.py
-+++ b/biom/__init__.py
+--- biom-format-2.0.0.orig/biom/__init__.py
++++ biom-format-2.0.0/biom/__init__.py
@@ -8,6 +8,8 @@
# The full license is in the file COPYING.txt, distributed with this software.
- #-----------------------------------------------------------------------------
+ # ----------------------------------------------------------------------------
+from __future__ import absolute_import
+
__author__ = "Daniel McDonald"
__copyright__ = "Copyright 2011-2013, The BIOM Format Development Team"
- __credits__ = ["Daniel McDonald", "Jai Ram Rideout", "Greg Caporaso",
+ __credits__ = ["Daniel McDonald", "Jai Ram Rideout", "Greg Caporaso",
Modified: trunk/packages/python-biom-format/trunk/debian/patches/no-web-adds.patch
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/patches/no-web-adds.patch 2014-05-20 15:20:48 UTC (rev 16977)
+++ trunk/packages/python-biom-format/trunk/debian/patches/no-web-adds.patch 2014-05-20 19:07:56 UTC (rev 16978)
@@ -1,12 +1,21 @@
Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 27 Mar 2014 11:52:15 +0100
+Last-Update: Tue, 20 May 2014 19:16:23 +0200
Description: Save user privacy by preventing inclusion of web adds
---- a/doc/_templates/layout.html
+--- biom-format-2.0.0.orig/doc/_templates/layout.html
+++ /dev/null
-@@ -1,19 +0,0 @@
+@@ -1,28 +0,0 @@
-{% extends "!layout.html" %}
-
+-{# Add github banner (from: https://github.com/blog/273-github-ribbons). #}
+-{% block header %}
+- {{ super() }}
+- <a href="https://github.com/biocore/biom-format"><img
+- style="position: absolute; top: 0; right: 0; border: 0;"
+- src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
+- alt="Fork me on GitHub"></a>
+-{% endblock %}
+-
-{# include the Google Analytics Tracker #}
-{% block footer %}
-{{ super() }}
@@ -24,4 +33,3 @@
-
-</script>
-{% endblock %}
-\ No newline at end of file
Modified: trunk/packages/python-biom-format/trunk/debian/patches/series
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/patches/series 2014-05-20 15:20:48 UTC (rev 16977)
+++ trunk/packages/python-biom-format/trunk/debian/patches/series 2014-05-20 19:07:56 UTC (rev 16978)
@@ -1,3 +1,3 @@
-smart_arse_fix.patch
+# smart_arse_fix.patch
ignore_local_dist-packages.patch
no-web-adds.patch
Modified: trunk/packages/python-biom-format/trunk/debian/rules
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/rules 2014-05-20 15:20:48 UTC (rev 16977)
+++ trunk/packages/python-biom-format/trunk/debian/rules 2014-05-20 19:07:56 UTC (rev 16978)
@@ -16,24 +16,24 @@
pybuilddir := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)-$(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
%:
- dh $@ --with python2 --with linktree
+ dh $@ --with python2 --buildsystem=pybuild --with linktree
override_dh_auto_build:
dh_auto_build
- cd doc && make singlehtml
+ make --directory=doc singlehtml
env PYTHONPATH=. pyqi make-bash-completion \
--command-config-module biom.interfaces.optparse.config \
--driver-name biom -o debian/bash-completion
override_dh_installman:
- cd doc && make man
+ make --directory=doc make man
dh_installman
override_dh_auto_clean:
rm -rf build/tests
dh_auto_clean
find -name "._*" -delete #Remove any Mac metadata files
- cd doc && make clean
+ make --directory=doc clean
rm -f debian/bash-completion
rm -f python-code/support-code/_*.cpp
@@ -57,4 +57,4 @@
get-orig-source:
# . debian/get-orig-source
mkdir -p ../tarballs
- uscan --verbose --force-download --repack --repack-compression xz --destdir=../tarballs
+ uscan --verbose --force-download --repack --compression xz --destdir=../tarballs
More information about the debian-med-commit
mailing list