[python-fabio] 31/73: Merge remote-tracking branch 'origin'

[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 b8d32a41a661dab106eb88483e03f1479af42da0
Merge: 00716ee 5f51ec8
Author: Jerome Kieffer <jerome.kieffer at terre-adelie.org>
Date:   Mon Nov 4 15:18:33 2013 +0100

    Merge remote-tracking branch 'origin'
    
    Conflicts:
    	debian/control
    	debian/copyright

 debian/changelog | 20 ++++++++------------
 debian/clean     |  1 -
 debian/control   | 24 +++++++++++++++++-------
 debian/copyright |  4 ++--
 debian/rules     |  6 +++++-
 5 files changed, 32 insertions(+), 23 deletions(-)

diff --cc debian/changelog
index 7cb5121,76e09e6..cf46c84
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,16 +1,23 @@@
 +python-fabio (0.1.3-2) unstable; urgency=low
 +
 +  * Fix Lintian remarks
 +  * Correct compatibility with Python 2.5
 +
 + -- Jerome Kieffer <jerome.kieffer at esrf.fr>  Tue, 29 Oct 2013 20:20:09 +0100
 +
  python-fabio (0.1.3-1) unstable; urgency=low
  
+   [kieffer]
    * New upstream version (v0.1.3)
  
-  -- Jerome Kieffer <jerome.kieffer at esrf.fr>  Sun, 27 Oct 2013 21:37:09 +0100
+   [picca]
+   * debian/control
+     - use the right python-all-dev version dependencies for dh_python2.
+     - remove had coded numpy dependencies which are generated by dh_numpy.
+     - add myself as Uploaders.
+     - update the homepage add the VCS informations.
  
- python-fabio (0.1.1-1) unstable; urgency=low
- 
-   * bug-fix release
- 
-  -- Jerome Kieffer <jerome.kieffer at esrf.fr>  Thu, 22 Aug 2012 11:00:00 +0200
- 
- python-fabio (0.1.0-1) unstable; urgency=low
- 
-   * New upstream release
- 
-  -- Jerome Kieffer <jerome.kieffer at esrf.fr>  Thu, 19 Jul 2012 11:00:00 +0200
+  -- Picca Frédéric-Emmanuel <picca at debian.org>  Sat, 02 Nov 2013 21:40:48 +0100
  
  python-fabio (0.0.8-1) unstable; urgency=low
  
diff --cc debian/copyright
index 536c75b,b2656e8..dd75de4
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,6 -1,6 +1,6 @@@
- Format: http://dep.debian.net/deps/dep5
+ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
  Upstream-Name: fabio
 -Source: http://sourceforge.net/projects/fable/files/fabio/0.0.8/
 +Source: http://sourceforge.net/projects/fable/files/fabio/0.1.3/
  
  Files: *
  Copyright: 2007-2009 Henning O. Sorensen & Erik Knudsen
@@@ -46,10 -46,6 +46,10 @@@ Files: test/utilstest.p
  Copyright: 2011 European Synchrotron Radiation Facility
  License: LGPL-3.0+
  
 +Files: src/stdint.h
- Copyright: 22006-2008 Alexander Chemeris
++Copyright: 2006-2008 Alexander Chemeris
 +License: BSD
 +
  Files: debian/*
  Copyright: 2011 Jerome Kieffer <jerome.kieffer at esrf.fr>
  License: GPL-2.0+
diff --cc debian/rules
index 871479b,1765b71..c1a46aa
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,12 +1,15 @@@
  #!/usr/bin/make -f
  
  %:
- 	dh $@ --with python2 --buildsystem=python_distutils
+ 	dh $@ --with python2
+ 
+ override_dh_clean:
+ 	dh_clean
+ 	rm -rf *.egg-info
  
 +#override_dh_installchangelogs:
 +#	dh_installchangelogs changelog.txt
 +
  override_dh_auto_install:
  	dh_numpy
  	dh_auto_install

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