[python-astropy] 03/03: Adjust for RC

[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 7e8389f047780c22e436b4b3b4641fdc34036a22
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jan 30 09:23:24 2015 +0100

    Adjust for RC
---
 debian/changelog                          |  6 +++---
 debian/patches/disable_helper.patch       | 11 ++++++++---
 debian/patches/helper_compatibility.patch | 14 ++++++++++++++
 debian/patches/series                     |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8084b7..4847afb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-python-astropy (0.4.4-1) UNRELEASED; urgency=low
+python-astropy (1.0~rc1-1) experimental; urgency=low
 
-  * New upstream release
+  * New upstream release candidate
 
- -- Ole Streicher <olebole at debian.org>  Thu, 22 Jan 2015 08:49:51 +0100
+ -- Ole Streicher <olebole at debian.org>  Wed, 28 Jan 2015 09:17:42 +0100
 
 python-astropy (0.4.2-2) unstable; urgency=medium
 
diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
index 06c951c..83f0d7c 100644
--- a/debian/patches/disable_helper.patch
+++ b/debian/patches/disable_helper.patch
@@ -1,11 +1,16 @@
 Author: Ole Streicher <olebole at debian.org>
 Description: Disable astropy-helpers copy
 Bug: https://bugs.debian.org/761055
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -22,4 +22,4 @@
+Index: astropy/setup.cfg
+===================================================================
+--- astropy.orig/setup.cfg
++++ astropy/setup.cfg
+@@ -22,7 +22,7 @@ background = static/dmg_background.png
  bitmap = static/wininst_background.bmp
  
  [ah_bootstrap]
 -auto_use = True
 +auto_use = False
+ 
+ [pep8]
+ # E101 - mix of tabs and spaces
diff --git a/debian/patches/helper_compatibility.patch b/debian/patches/helper_compatibility.patch
new file mode 100644
index 0000000..a25e801
--- /dev/null
+++ b/debian/patches/helper_compatibility.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Temporarily enable comatibility to astropy-helpers < 1.0.
+Bug: https://github.com/astropy/astropy/issues/3377
+--- astropy.orig/setup.py
++++ astropy/setup.py
+@@ -18,7 +18,7 @@ builtins._ASTROPY_SETUP_ = True
+ import astropy
+ from astropy_helpers.setup_helpers import (
+     register_commands, adjust_compiler, get_package_info, get_debug_option)
+-from astropy_helpers.distutils_helpers import is_distutils_display_option
++from astropy_helpers.setup_helpers import is_distutils_display_option
+ from astropy_helpers.git_helpers import get_git_devstr
+ from astropy_helpers.version_helpers import generate_version_py
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 31a0178..d608d33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 mark_known_failures.patch
 use_extern_ply.patch
 disable_helper.patch
-use_wcslib_4.24.patch
+helper_compatibility.patch

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