[python-fabio] 38/73: Merge branch 'master' of git.epn-campus.eu:python-fabio

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository python-fabio.

commit 38d63749bd3c443968789ae5f7b969ebea06eda6
Merge: 435224c b8d32a4
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Dec 27 20:49:36 2013 +0100

    Merge branch 'master' of git.epn-campus.eu:python-fabio
    
    Conflicts:
    	debian/changelog
    	debian/patches/series
    	debian/rules

 debian/changelog          |  5 ++++
 debian/copyright          | 64 ++++++++++++++++++++++++-----------------------
 debian/patches/compat_2.5 | 35 ++++++++++++++++++++++++++
 debian/patches/series     |  1 +
 debian/python-fabio.NEWS  | 53 +++++++++++++++++++++++++++++++++++++++
 debian/watch              |  1 +
 6 files changed, 128 insertions(+), 31 deletions(-)

diff --cc debian/changelog
index ee0b4e9,cf46c84..c798cc4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,20 @@@
 -python-fabio (0.1.3-2) unstable; urgency=low
 +python-fabio (0.1.3-2) UNRELEASED; urgency=medium
  
++  [kieffer]
+   * Fix Lintian remarks
+   * Correct compatibility with Python 2.5
+ 
 - -- Jerome Kieffer <jerome.kieffer at esrf.fr>  Tue, 29 Oct 2013 20:20:09 +0100
++  [picca]
 +  * debian/control
 +    - Bump Standard-Versions to 3.9.5 (no change)
 +    - Add the python-fabio-dbg package
 +    - Add the python-fabio-doc package
 +    - Team maintained under debian-science
 +    - Build-Depends: add cython
 +  * debian/patch
 +    + 0001-forwarded-upstream-cythonize-during-the-build.patch (new)
 +
 + -- Picca Frédéric-Emmanuel <picca at debian.org>  Fri, 27 Dec 2013 09:46:21 +0100
  
  python-fabio (0.1.3-1) unstable; urgency=low
  
diff --cc debian/patches/series
index 6363ec5,03a3c30..b19166e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,1 +1,2 @@@
 +0001-forwarded-upstream-cythonize-during-the-build.patch
+ compat_2.5

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-fabio.git