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

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

    Merge branch 'debian-template' into debian

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

diff --cc debian/control
index 6e3a45d,e1faf87..84860a0
--- a/debian/control
+++ b/debian/control
@@@ -7,31 -7,28 +7,31 @@@ 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/vimos
 +Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-vimos.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-vimos.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-vimos
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
 -Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
 +Recommends: esorex|python-cpl, sextractor
 +Suggests: cpl-plugin-vimos-calib, cpl-plugin-vimos-doc
  Multi-Arch: same
 -Description: ESO data reduction pipeline template
 - This is the data reduction pipeline for the Template instrument of the
 +Description: ESO data reduction pipeline for VIMOS
 + This is the data reduction pipeline for the Vimos instrument of the
   Very Large Telescope (VLT) from the European Southern Observatory (ESO).
   .
 - This package is used as a template for the other ESO recipes. It is not
 - meant to built as a package.
 + VIMOS is a multi-mode wide-field optical instrument mounted at the Nasmyth
 + focus B of UT3. VIMOS allows imaging in UBVRIz and multi-object low (R ~ 200)
 + to high (R ~ 2500) resolution spectroscopy. The wavelength range covered in
 + the two spectroscopic modes goes from 360 to 1000 nm. VIMOS is made of 4
 + quadrants of 7'x8' each separated by a gap of about 2'.
  
 -Package: cpl-plugin-template-doc
 +Package: cpl-plugin-vimos-doc
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}

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