[cpl-plugin-uves] 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-uves.

commit 5ecae5be57f8473309a2c0f24388de87b619ccec
Merge: 351d943 095820c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 25 15:41:12 2015 +0200

    Merge branch 'debian-template' into debian

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

diff --cc debian/control
index 403a41c,e1faf87..f084ad5
--- a/debian/control
+++ b/debian/control
@@@ -5,19 -5,17 +5,19 @@@ Maintainer: Debian Astronomy Maintainer
  Uploaders: Ole Streicher <olebole at debian.org>
  Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
 +	       libcfitsio-dev | libcfitsio3-dev,
                 libcpl-dev (>= 5.3.1),
 +	       libqfits-dev,
                 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/uves
 +Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-uves.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-uves.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-uves
  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-uves.git