[cpl-plugin-kmos] 03/06: Merge branch 'debian-template' into debian

[Ole Streicher]

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

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

commit 38a6174f990c6f5d9728b96b90836afb9c3851b3
Merge: 2a66ce0 e179dc1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 15:09:57 2014 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control

 debian/control | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --cc debian/control
index a16a530,ee87152..5804272
--- a/debian/control
+++ b/debian/control
@@@ -11,11 -11,11 +11,11 @@@ Build-Depends: debhelper (>= 9)
                 python-pyfits,
                 python-sphinx
  Standards-Version: 3.9.5
 -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/kmos
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-kmos.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-kmos.git
++Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-kmos.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-kmos.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-kmos
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl
@@@ -35,22 -33,17 +35,23 @@@ Architecture: al
  Multi-Arch: foreign
  Depends: ${misc:Depends}
  Section: doc
 -Description: ESO data reduction pipeline documentation template
 +Description: ESO data reduction pipeline documentation for KMOS
   This package contains the HTML documentation and manpages for the data
 - reduction pipeline for the Template instrument of the Very Large Telescope
 + reduction pipeline for the KMOS instrument of the Very Large Telescope
   (VLT) from the European Southern Observatory (ESO).
  
 -Package: cpl-plugin-template-calib
 +Package: cpl-plugin-kmos-calib
  Architecture: all
  Multi-Arch: foreign
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
 +Depends: ${misc:Depends}, cpl-plugin-kmos, wget
  Section: contrib/science
 -Description: ESO data reduction pipeline calibration data downloader template
++
 +Description: ESO data reduction pipeline calibration data downloader for KMOS
   This package downloads calibration and other static data of the 
 - data reduction pipeline for the Template instrument of the
 + data reduction pipeline for the KMOS instrument of the
   Very Large Telescope (VLT) from the European Southern Observatory (ESO).
 + .
 + The K-band Multi Object Spectrograph (KMOS) is a second-generation instrument
 + designed for operation on the VLT. The key feature of KMOS is its ability to
 + perform Integral Field Spectroscopy in the near-infrared bands for 24 targets
 + simultaneously.

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