[cpl-plugin-hawki] 39/39: 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 abf2819174a8534c07403783848ea4332427d9a1
Merge: 23c3e9f 70fc86d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Sep 16 19:50:42 2013 +0200

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

 debian/README.Debian                         |    6 +++---
 debian/control                               |   10 +++++++++
 debian/cpl-plugin-calib.install.in           |    1 +
 debian/cpl-plugin-calib.lintian-overrides.in |    2 ++
 debian/cpl-plugin-calib.postinst.in          |   22 +++++++++++++++++++
 debian/cpl-plugin-calib.prerm.in             |    7 +++++++
 debian/cpl-plugin.install.in                 |    3 +++
 debian/repackage.sh                          |    2 ++
 debian/rules                                 |   29 ++++++++++++++++++++++++++
 9 files changed, 79 insertions(+), 3 deletions(-)

diff --cc debian/control
index 024b37f,f882cf9..32a7b07
--- a/debian/control
+++ b/debian/control
@@@ -17,14 -13,21 +17,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
  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 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}, cpl-plugin-template, wget
 -Section: contrib/science
 -Description: ESO data reduction pipeline calibration data downloaded 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
++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
++ Southern Observatory (ESO).

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