[python-astropy] 03/04: Disable astropy helper.

[Ole Streicher]

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

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

commit ddd3e15ac6366aa3405080d6d46cc0e8ac3dd58a
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Sep 14 15:14:01 2014 +0200

    Disable astropy helper.
---
 debian/changelog                             |  4 ++--
 debian/control                               |  2 ++
 debian/patches/disable_helper.patch          | 11 +++++++++++
 debian/patches/disable_helper_download.patch | 19 -------------------
 debian/patches/series                        |  2 +-
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8334a8e..607f514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-python-astropy (0.4.1+dfsg-2) UNRELEASED; urgency=low
+python-astropy (0.4.1+dfsg-2) unstable; urgency=low
 
-  * Disable astropy helper download. Closes: #761055
+  * Disable astropy helper. Closes: #761055
   * Support numpy 1.9. Closes: #761392
 
  -- Ole Streicher <olebole at debian.org>  Sun, 14 Sep 2014 13:50:29 +0200
diff --git a/debian/control b/debian/control
index 167366d..82ba9df 100644
--- a/debian/control
+++ b/debian/control
@@ -12,12 +12,14 @@ Build-Depends: cython,
                libexpat1-dev,
                pkg-config,
                python-all-dev (>= 2.6.6-3~),
+	       python-astropy-helpers,
                python-nose,
                python-matplotlib,
                python-numpy (>= 1.4),
                python-setuptools (>= 0.6.4),
                python-sphinx (>= 1.0.7+dfsg),
                python3-all-dev,
+	       python3-astropy-helpers,
                python3-nose,
                python3-matplotlib,
                python3-numpy (>= 1:1.6.2),
diff --git a/debian/patches/disable_helper.patch b/debian/patches/disable_helper.patch
new file mode 100644
index 0000000..06c951c
--- /dev/null
+++ b/debian/patches/disable_helper.patch
@@ -0,0 +1,11 @@
+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 @@
+ bitmap = static/wininst_background.bmp
+ 
+ [ah_bootstrap]
+-auto_use = True
++auto_use = False
diff --git a/debian/patches/disable_helper_download.patch b/debian/patches/disable_helper_download.patch
deleted file mode 100644
index 9ef35d3..0000000
--- a/debian/patches/disable_helper_download.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Sergio Gelato <Sergio.Gelato at astro.su.se>
-Description: Disable update attempt of astropy-helpers
- astropy_helpers (included in the source distribution) tries by default to
- update itself over the network. This can have a negative impact on the
- reproducibility of the build, to say nothing of privacy and security
- concerns. (Licensing would also be an issue if this were a GPL package.)
- .
- This patch turns off the downloading and automatic upgrade features.
- If bug fixes are needed they should be incorporated explicitly by the
- package maintainer.
-Bug: https://bugs.debian.org/761055
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -23,3 +23,5 @@
- 
- [ah_bootstrap]
- auto_use = True
-+auto_upgrade = False
-+download_if_needed = False
diff --git a/debian/patches/series b/debian/patches/series
index e38b6ef..6abf890 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 mark_known_failures.patch
 use_extern_ply.patch
-disable_helper_download.patch
+disable_helper.patch
 support_numpy_1.9.patch

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