[cpl-plugin-hawki] 11/13: 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-hawki.

commit 6425945b3eedb5c15ba95f8e6b0b65e282dda140
Merge: 4af8b50 6852346
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Dec 6 13:05:52 2013 +0100

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

 debian/README.Source     |  6 ++++++
 debian/control           | 10 +++++-----
 debian/create_manpage.py |  4 ++--
 debian/create_sphinx.py  |  8 ++++++--
 debian/repackage.sh      | 47 ++++++++++++++++++++---------------------------
 debian/rules             |  8 +++++++-
 debian/watch             |  1 +
 7 files changed, 47 insertions(+), 37 deletions(-)

diff --cc debian/control
index ef6e047,ed63e22..f61291f
--- a/debian/control
+++ b/debian/control
@@@ -21,24 -19,21 +21,24 @@@ Package: cpl-plugin-hawk
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib
 +Suggests: cpl-plugin-hawki-calib (= ${binary:Version})
  Multi-Arch: same
- Description: ESO data reduction pipeline HAWK-I
 -Description: ESO data reduction pipeline template
 - This is the data reduction pipeline for the Template instrument of the
++Description: ESO data reduction pipeline for HAWK-I
 + This is the data reduction pipeline for the HAWK-I 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.
 + HAWK-I is a near-infrared (0.85-2.5 μm ) wide-field imager. It is being
 + offered for the first time in Period 81. The instrument is cryogenic (120 K,
 + detectors at 80 K) and has a full reflective design. The light passes four
 + mirrors and two filter wheels before hitting a mosaic of four Hawaii 2RG 2048
 + * 2048 pixels detectors. The final F-ratio is F/4.36 ( 1 arcsec on the sky
 + corresponds to 169 μm on the detector).
  
 -Package: cpl-plugin-template-calib
 +Package: cpl-plugin-hawki-calib
  Architecture: all
  Multi-Arch: foreign
- Depends: ${misc:Depends}
- Description: ESO data reduction pipeline calibration data for HAWK-I
-  This package contains calibration data of the data reduction pipeline for the
-  HAWK-I instrument of the Very Large Telescope (VLT) from the European
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
 -Section: contrib/science
 -Description: ESO data reduction pipeline calibration data downloader template
 - This package downloads calibration and other static data of the 
 - data reduction pipeline for the Template instrument of the
 - Very Large Telescope (VLT) from the European Southern Observatory (ESO).
++Depends: ${misc:Depends}, cpl-plugin-hawki, wget
++Description: ESO data reduction pipeline calibration data downloader for HAWK-I
++ This package downloads calibration data of the data reduction pipeline for
++ the HAWK-I instrument of the Very Large Telescope (VLT) from the European
 + Southern Observatory (ESO).
diff --cc debian/watch
index e58cd91,33a79fa..cfafbac
--- 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 \
 + .*/hawki-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-hawki.git