[cpl-plugin-sinfo] 02/02: Merge branch 'debian-template' into debian

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository cpl-plugin-sinfo.

commit 5b9c9a3a4821a72eabb364ebec8054620c2c6be0
Merge: d5d1fe1 095820c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 25 15:40:44 2015 +0200

    Merge branch 'debian-template' into debian

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/control
index 31c82a5,e1faf87..e2fe8ab
--- a/debian/control
+++ b/debian/control
@@@ -7,15 -7,15 +7,15 @@@ Build-Depends: debhelper (>= 9)
                 dh-autoreconf,
                 libcpl-dev (>= 5.3.1),
                 python,
+                python-astropy,
                 python-cpl,
-                python-pyfits,
                 python-sphinx
  Standards-Version: 3.9.6
 -Homepage: http://www.eso.org/sci/software/pipelines/template
 -Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-template.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/sinfoni/sinfoni-pipe-recipes.html
 +Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-sinfo.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-sinfo.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-sinfo
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-sinfo.git