[python-pywcs] 03/03: 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-pywcs.

commit bf755a1695236a78644e1b9c9ed328f6f3956909
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon May 5 15:54:17 2014 +0200

    Adjust patches for new version
---
 debian/changelog                              |  6 ++++
 debian/clean                                  |  5 +++
 debian/patches/fix-format-errors.patch        | 13 --------
 debian/patches/pywcs-unbundle.patch           | 12 ++++---
 debian/patches/series                         |  2 +-
 debian/patches/use_stsci_distutils_hack.patch | 45 +++++++++++++++++++++++++++
 debian/rules                                  |  3 ++
 7 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98cdadb..f76c94c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-pywcs (1.12-1) unstable; urgency=low
+
+  * New upstream version. Closes: #730869
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 05 May 2014 15:09:02 +0200
+
 python-pywcs (1.11-2) unstable; urgency=low
 
   * Set standard version to 3.9.5. No changes needed.
diff --git a/debian/clean b/debian/clean
index f52a8a7..496f9b4 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,7 @@
 lib/svn_version.py
 lib/pywcs/_pywcs.so
+lib/pywcs/include/*.h
+lib/pywcs/include/wcslib/*.h
+src/docstrings.c
+src/docstrings.h
+src/wcsconfig.h
diff --git a/debian/patches/fix-format-errors.patch b/debian/patches/fix-format-errors.patch
deleted file mode 100644
index dae14a9..0000000
--- a/debian/patches/fix-format-errors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix format security error of printf
---- a/src/wcslib_tabprm_wrap.c
-+++ b/src/wcslib_tabprm_wrap.c
-@@ -184,7 +184,7 @@
- 
-   ignored = tabprt(self->x);
- 
--  printf(wcsprintf_buf());
-+  printf("%s", wcsprintf_buf());
- 
-   Py_INCREF(Py_None);
-   return Py_None;
diff --git a/debian/patches/pywcs-unbundle.patch b/debian/patches/pywcs-unbundle.patch
index 26002d5..03d6391 100644
--- a/debian/patches/pywcs-unbundle.patch
+++ b/debian/patches/pywcs-unbundle.patch
@@ -1,9 +1,9 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use the wcslib provided by the Debian system instead of the 
  convienience copy in the upstream package.
---- a/defsetup.py   2011-03-17 15:27:00.000000000 +0100
-+++ b/defsetup.py      2011-03-17 16:11:45.738319057 +0100
-@@ -282,22 +282,21 @@
+--- a/defsetup.py
++++ b/defsetup.py
+@@ -407,22 +407,21 @@
  
  PYWCS_EXTENSIONS = [
      Extension('pywcs._pywcs',
@@ -30,15 +30,17 @@ Description: Use the wcslib provided by the Debian system instead of the
  
  setupargs = {
      'version' :     VERSION,
-@@ -309,11 +308,7 @@
+@@ -434,12 +433,7 @@
      'ext_modules' : PYWCS_EXTENSIONS,
      'data_files' : [
          ( 'pywcs/include', ['src/*.h']),
 -        ( 'pywcs/include/wcslib', [ WCSLIBC + '/*.h'] ),
 -        ( 'pywcs/tests/maps', ['lib/pywcs/tests/maps/*.hdr']),
+-        ( 'pywcs/tests/nrao', ['lib/pywcs/tests/nrao/*.hdr']),
 -        ( 'pywcs/tests/spectra', ['lib/pywcs/tests/spectra/*.hdr']),
--        ( 'pywcs/tests/data', ['lib/pywcs/tests/data/*.hdr'])
+-        ( 'pywcs/tests/data', ['lib/pywcs/tests/data/*.hdr', 'lib/pywcs/tests/data/*.fits'])
          ],
 -    'package_dir' : { 'pywcs' : 'lib/pywcs', 'pywcs.tests' : 'lib/pywcs/tests'},
 +    'package_dir' : { 'pywcs' : 'lib/pywcs'},
  }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c37dc7e..9f217de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 pywcs-unbundle.patch
-fix-format-errors.patch
+use_stsci_distutils_hack.patch
diff --git a/debian/patches/use_stsci_distutils_hack.patch b/debian/patches/use_stsci_distutils_hack.patch
new file mode 100644
index 0000000..8d33116
--- /dev/null
+++ b/debian/patches/use_stsci_distutils_hack.patch
@@ -0,0 +1,45 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: go back to the old distutils_hack to avoid dependencies
+ on packages not debianized yet.
+--- a/setup.py
++++ b/setup.py
+@@ -1,15 +1,8 @@
+ #!/usr/bin/env python
++from __future__ import division # confidence high
+ 
+ try:
+-    from setuptools import setup
++    import stsci.tools.stsci_distutils_hack as H
+ except ImportError:
+-    from distribute_setup import use_setuptools
+-    use_setuptools()
+-    from setuptools import setup
+-
+-setup(
+-    setup_requires=['d2to1>=0.2.3', 'stsci.distutils>=0.3.2'],
+-    d2to1=True,
+-    use_2to3=True,
+-    zip_safe=False
+-)
++    import stsci_distutils_hack as H
++H.run()
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -36,7 +36,7 @@
+ 	pywcs/tests/data = lib/pywcs/tests/data/*.fits
+ 
+ [install_data]
+-pre-hook.glob-data-files = stsci.distutils.hooks.glob_data_files
++#pre-hook.glob-data-files = stsci.distutils.hooks.glob_data_files
+ 
+ [global]
+ setup_hooks = 
+@@ -93,7 +93,7 @@
+ 	_GNU_SOURCE
+ 
+ [build_ext]
+-pre-hook.numpy-extension-hook = stsci.distutils.hooks.numpy_extension_hook
++#pre-hook.numpy-extension-hook = stsci.distutils.hooks.numpy_extension_hook
+ 
+ [egg_info]
+ tag_build = 
diff --git a/debian/rules b/debian/rules
index 73fbbb7..caa572d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy = http://127.0.9.1:9
+
 %:
 	dh $@ --with python2
 

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