[cpl-plugin-kmos] 03/03: 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 b5b67e6c8e33843e3ed2240da355dd4e164bc7db
Merge: f9323f9 8872094
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jan 8 19:34:48 2014 +0100

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

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

diff --cc debian/control
index f581fce,7ac0db8..6b7626d
--- a/debian/control
+++ b/debian/control
@@@ -11,26 -11,24 +11,26 @@@ 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-science/packages/cpl-plugin-template.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/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
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-kmos
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, cpl-plugin-kmos-doc
- Suggests: cpl-plugin-kmos-calib
+ Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
++Suggests: cpl-plugin-kmos-calib, cpl-plugin-kmos-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 KMOS
 + This is the data reduction pipeline for the KMOS 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.
 + 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.
  
 -Package: cpl-plugin-template-doc
 +Package: cpl-plugin-kmos-doc
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}

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