[cpl-plugin-kmos] 08/11: 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 8ef0809047e6666f73c8fcd906c994b0fa045d46
Merge: bdf2850 ed613f1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Dec 12 09:16:22 2013 +0100

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

 debian/README.Source    |  6 +++++
 debian/control          |  4 +--
 debian/create_sphinx.py | 66 +++++++++++++++++++++++++++----------------------
 debian/repackage.sh     | 43 ++++++++++++++++----------------
 debian/rules            |  8 +++++-
 debian/watch            |  1 +
 6 files changed, 73 insertions(+), 55 deletions(-)

diff --cc debian/control
index eef44ff,ed63e22..f2f01fb
--- a/debian/control
+++ b/debian/control
@@@ -19,28 -19,21 +19,28 @@@ Package: cpl-plugin-kmo
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib
 +Suggests: cpl-plugin-kmos-calib
  Multi-Arch: same
- Description: ESO data reduction pipeline KMOS
 -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-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 downloaded KMOS
 -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.
diff --cc debian/watch
index 74174e7,33a79fa..144918d
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,5 +1,5 @@@
  version=3
+ opts=dversionmangle=s/\+dfsg// \
  http://www.eso.org/sci/software/pipelines/ \
 - .*/template-kit-(.*).tar.gz \
 + .*/kmos-kit-(.*).tar.gz \
   debian debian/repackage.sh

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