[SCM] Core functionality for performing astronomy and astrophysics with Python branch, debian, updated. da51b6c68556e4bbf10818b6f422102834e689c8

[Ole Streicher]

The following commit has been merged in the debian branch:
commit da51b6c68556e4bbf10818b6f422102834e689c8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 12 16:42:21 2012 +0200

    Set priority of legacy modules to "extra" so that they may conflict with
    the original ones.

diff --git a/debian/control b/debian/control
index ae13e3a..f0de73f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9),
                python-nose,
                python-numpy,
                python-setuptools,
-	       python-sphinx (>= 1.0.7+dfsg),
+               python-sphinx (>= 1.0.7+dfsg),
                python-support,
                wcslib-dev (>= 4.7),
                zlib1g-dev
@@ -30,8 +30,8 @@ Depends: libexpat1,
 Provides: ${python:Provides}
 Suggests: python-astropy-doc
 Description: Core functionality for performing astrophysics with Python
- The astropy package contains core functionality and some common tools 
- needed for performing astronomy and astrophysics research with Python. 
+ The astropy package contains core functionality and some common tools
+ needed for performing astronomy and astrophysics research with Python.
  It is expected to be extended by a number of "affilated packages" that are
  intended to work with the core package.
  .
@@ -40,10 +40,10 @@ Description: Core functionality for performing astrophysics with Python
 Package: python-astropy-doc
 Architecture: all
 Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: Core functionality for performing astrophysics with Python (doc)
- The astropy package contains core functionality and some common tools 
- needed for performing astronomy and astrophysics research with Python. 
+ The astropy package contains core functionality and some common tools
+ needed for performing astronomy and astrophysics research with Python.
  It is expected to be extended by a number of "affilated packages" that are
  intended to work with the core package.
  .
@@ -51,9 +51,10 @@ Description: Core functionality for performing astrophysics with Python (doc)
 
 Package: python-astropy-pywcs
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-astropy
+Depends: python-astropy, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Conflicts: python-pywcs
 Provides: ${python:Provides}
+Priority: extra
 Description: Pywcs legacy module
  This is a thin wrapper around the high- and mid-level  interfaces of
  Dr. Mark Calabretta's WCSLIB for handling the World Coordinate System.
@@ -67,7 +68,8 @@ Description: Pywcs legacy module
 Package: python-astropy-pyfits
 Architecture: all
 Conflicts: python-pyfits
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-astropy
+Priority: extra
+Depends: python-astropy, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Description: Pyfits legacy module
  FITS (Flexible Image Transport System) is a data format most used in
@@ -81,7 +83,8 @@ Description: Pyfits legacy module
 
 Package: python-astropy-votable
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-astropy
+Priority: extra
+Depends: python-astropy, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Description: VOTable XML handling legacy module
  This subpackage converts VOTable XML files to and from Numpy record arrays.

-- 
Core functionality for performing astronomy and astrophysics with Python