[python-astropy] 01/01: Fix conflicts/replaces of astropy-utils with pyfits-utils. Closes: #790530

[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 83f9a2c4214144179be49f135aea1c0c69a83d12
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Jun 30 08:50:17 2015 +0200

    Fix conflicts/replaces of astropy-utils with pyfits-utils. Closes: #790530
---
 debian/changelog | 2 ++
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e566f2c..728eb93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ python-astropy (1.0.3-3) UNRELEASED; urgency=low
 
   * Extend Suggests, and build/test-depend on scipy for more
     extended tests
+  * Fix conflicts/replaces of astropy-utils with pyfits-utils.
+    Closes: #790530
 
  -- Ole Streicher <olebole at debian.org>  Fri, 26 Jun 2015 10:57:13 +0200
 
diff --git a/debian/control b/debian/control
index 16bda03..51a61bd 100644
--- a/debian/control
+++ b/debian/control
@@ -86,10 +86,10 @@ Package: astropy-utils
 Architecture: all
 Depends: python-astropy, ${misc:Depends}, ${python:Depends}
 Breaks: fitscheck (<< 1:3.1.2-1~),
-        pyfits-utils (<<1:3.3-2~),
+        pyfits-utils (<<1:3.3-4~),
         python-pyfits (<< 1:3.0.7-2~)
 Replaces: fitscheck (<< 1:3.1.2-1~),
-          pyfits-utils (<<1:3.3-2~),
+          pyfits-utils (<<1:3.3-4~),
           python-pyfits (<< 1:3.0.7-2~)
 Description: Command line tools from astropy
  The astropy package contains core functionality and some common tools

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