[SCM] Set of routines for handling the FITS WCS standard branch, master, updated. upstream/1.10-12-g01bda62

[Ole Streicher]

The following commit has been merged in the master branch:
commit 01bda62208415a4fa68056d44f4e365e7b6e13c3
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jan 6 20:47:10 2012 +0100

    Adjust patch and paths for 1.10

diff --git a/debian/changelog b/debian/changelog
index 27787f2..9e1e3d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-pywcs (1.11-1) unstable; urgency=low
+
+  * New upstream version 1.10-4.8.2
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 06 Jan 2012 20:16:00 +0100
+
 python-pywcs (1.10-1) unstable; urgency=low
 
   * New package. Closes: #641635
diff --git a/debian/patches/pywcs-unbundle.patch b/debian/patches/pywcs-unbundle.patch
index db20d0a..26002d5 100644
--- a/debian/patches/pywcs-unbundle.patch
+++ b/debian/patches/pywcs-unbundle.patch
@@ -3,7 +3,7 @@ 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
-@@ -256,21 +256,20 @@
+@@ -282,22 +282,21 @@
  
  PYWCS_EXTENSIONS = [
      Extension('pywcs._pywcs',
@@ -19,6 +19,7 @@ Description: Use the wcslib provided by the Debian system instead of the
                define_macros=define_macros,
                undef_macros=undef_macros,
                extra_compile_args=extra_compile_args,
+               extra_link_args=extra_link_args,
 -              libraries=libraries
 +              libraries=libraries + ['wcs', 'm']
                )
@@ -29,15 +30,15 @@ Description: Use the wcslib provided by the Debian system instead of the
  
  setupargs = {
      'version' :     VERSION,
-@@ -282,10 +281,7 @@
+@@ -309,11 +308,7 @@
      'ext_modules' : PYWCS_EXTENSIONS,
      'data_files' : [
          ( 'pywcs/include', ['src/*.h']),
 -        ( 'pywcs/include/wcslib', [ WCSLIBC + '/*.h'] ),
--        ( 'pywcs/tests/maps', ['lib/tests/maps/*.fits']),
--        ( 'pywcs/tests/spectra', ['lib/tests/spectra/*.fits'])
+-        ( 'pywcs/tests/maps', ['lib/pywcs/tests/maps/*.hdr']),
+-        ( 'pywcs/tests/spectra', ['lib/pywcs/tests/spectra/*.hdr']),
+-        ( 'pywcs/tests/data', ['lib/pywcs/tests/data/*.hdr'])
          ],
--    'package_dir' : {pkg[0]: 'lib', pkg[1]: 'lib/tests'},
-+    'package_dir' : {pkg[0]: 'lib'},
+-    'package_dir' : { 'pywcs' : 'lib/pywcs', 'pywcs.tests' : 'lib/pywcs/tests'},
++    'package_dir' : { 'pywcs' : 'lib/pywcs'},
  }
- 
diff --git a/debian/rules b/debian/rules
index bf799bf..e3bcaa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
 	dh $@ --with python2
 
 override_dh_auto_test:
-	python setup.py build_ext -i && nosetests tests/test.py
+	python setup.py build_ext -i && nosetests lib/pywcs/tests/test.py

-- 
Set of routines for handling the FITS WCS standard