[python-astropy] 02/04: Adjust patches for new version

[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 2c543206ce65a56e166ce2d529fd6b76bec9d305
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Aug 10 13:24:27 2014 +0200

    Adjust patches for new version
---
 debian/changelog                         |  6 ++++++
 debian/patches/fix_build.patch           | 23 -----------------------
 debian/patches/mark_known_failures.patch |  9 +++++++++
 debian/patches/series                    |  1 -
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac29c83..88b41ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (0.4.1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Sun, 10 Aug 2014 10:22:07 +0200
+
 python-astropy (0.4-4) unstable; urgency=low
 
   * build-depend on wcslib >= 4.23. Closes: #755485
diff --git a/debian/patches/fix_build.patch b/debian/patches/fix_build.patch
deleted file mode 100644
index 6f5a61d..0000000
--- a/debian/patches/fix_build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Eric Bray
-Subject: Fix wrong encoding on build
-Bug: https://github.com/astropy/astropy/issues/2749
---- a/ah_bootstrap.py
-+++ b/ah_bootstrap.py
-@@ -429,7 +429,16 @@
-                 '`git submodule status` command:\n{0}'.format(str(e)))
- 
- 
--    stdio_encoding = locale.getdefaultlocale()[1]
-+    # Can fail of the default locale is not configured properly.  See
-+    # https://github.com/astropy/astropy/issues/2749.  For the purposes under
-+    # consideration 'latin1' is an acceptable fallback.
-+    try:
-+        stdio_encoding = locale.getdefaultlocale()[1] or 'latin1'
-+    except ValueError:
-+        # Due to an OSX oddity locale.getdefaultlocale() can also crash
-+        # depending on the user's locale/language settings.  See:
-+        # http://bugs.python.org/issue18378
-+        stdio_encoding = 'latin1'
- 
-     if p.returncode != 0 or stderr:
-         stderr = stderr.decode(stdio_encoding)
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 91a101b..06415df 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -46,3 +46,12 @@ Description: Mark all known test failures as xfail.
  def test_Rotation2D_inverse():
      model = models.Rotation2D(angle=234.23494)
      inverse = model.inverse()
+--- a/astropy/config/tests/test_configs.py
++++ b/astropy/config/tests/test_configs.py
+@@ -331,4 +331,5 @@
+     # Test that the config file is written at most once
+     config_dir = os.path.join(os.path.dirname(__file__), '..', '..')
+     configuration.update_default_config('astropy', config_dir)
+-    assert configuration.update_default_config('astropy', config_dir) is False
++# see https://github.com/astropy/astropy/issues/2841
++    assert configuration.update_default_config('astropy', config_dir) is None
diff --git a/debian/patches/series b/debian/patches/series
index 17039d3..a0afe8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 mark_known_failures.patch
 use_extern_ply.patch
-fix_build.patch

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