[med-svn] [python-pysam] 02/05: Merge tag 'upstream/0.7.6'

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch master
in repository python-pysam.

commit c26522eaf509e5bf3583cbe08390792deea88ec8
Merge: e630e81 15fc052
Author: Charles Plessy <plessy at debian.org>
Date:   Sat Apr 19 11:41:42 2014 +0900

    Merge tag 'upstream/0.7.6'
    
    Upstream version 0.7.6
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/python-pysam-tests.README.Debian
    	debian/python-pysam-tests.install
    	debian/rules
    	debian/tests/control
    	debian/tests/run-unit-test
    	debian/watch

 PKG-INFO                                         |     2 +-
 debian/compat                                    |     1 -
 debian/patches/do_not_use_distribute_setup.patch |    17 -
 debian/patches/fix_cleanup_tests.patch           |    19 -
 debian/patches/offline-tests.patch               |  1824 ---
 debian/patches/series                            |     3 -
 debian/source/format                             |     1 -
 distribute_setup.py                              |   546 -
 doc/faq.rst                                      |    68 +
 doc/release.rst                                  |     8 +
 doc/usage.rst                                    |     7 +-
 pysam.egg-info/PKG-INFO                          |     2 +-
 pysam.egg-info/SOURCES.txt                       |     1 -
 pysam/TabProxies.c                               |    52 +-
 pysam/TabProxies.pyx                             |     2 +-
 pysam/csamtools.c                                | 12573 ++++++++++++---------
 pysam/csamtools.pxd                              |    31 +
 pysam/csamtools.pyx                              |   260 +-
 pysam/ctabix.c                                   |   304 +-
 pysam/cvcf.c                                     |   396 +-
 pysam/pysam_util.c                               |     3 +
 pysam/pysam_util.h                               |     6 +
 pysam/tabix_util.c                               |    22 +
 pysam/version.py                                 |     2 +-
 setup.py                                         |    11 +-
 tests/Makefile                                   |     3 +-
 tests/pysam_test.py                              |    49 +
 27 files changed, 8088 insertions(+), 8125 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-pysam.git