[python-astropy] 05/07: Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/python-astropy into debian

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository python-astropy.

commit 782ad635b1d3173d908581594fc6c5062dfab86f
Merge: e40ffef 314a133
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jan 24 11:11:24 2014 +0100

    Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/python-astropy into debian
    
    Conflicts:
    	debian/changelog

 debian/changelog               |   7 ++
 debian/control                 |   2 +-
 debian/patches/python3.4.patch | 210 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |   1 +
 4 files changed, 219 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 896b76b,905e722..303e52c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +python-astropy (0.3+dfsg-1) unstable; urgency=low
 +
 +  * Remove sourceless files jqery*.js. Closes: #735770
 +
 + -- Ole Streicher <debian at liska.ath.cx>  Fri, 24 Jan 2014 09:43:27 +0100
 +
+ python-astropy (0.3-5) unstable; urgency=low
+ 
+   * Include upstream fixes to build on python-3.4. Closes: #734293
+   * Upgrade to Standards-Version 3.9.5 (no changes needed)
+ 
+  -- Ole Streicher <debian at liska.ath.cx>  Wed, 15 Jan 2014 09:57:05 +0100
+ 
  python-astropy (0.3-4) unstable; urgency=low
  
    * Mark known s390 failures as xfail.

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