[cpl-plugin-sinfo] 32/42: 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-sinfo.

commit 209224ef04c1549c515fb499e7a26e278a919fb5
Merge: dffeb57 ac34eb1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Sep 16 09:51:28 2013 +0200

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

 debian/README.Debian                         |    6 +++---
 debian/control                               |   11 ++++++++++
 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                                 |   28 ++++++++++++++++++++++++++
 9 files changed, 79 insertions(+), 3 deletions(-)

diff --cc debian/control
index 9ed5c95,f882cf9..cd20978
--- a/debian/control
+++ b/debian/control
@@@ -13,18 -13,21 +13,29 @@@ Package: cpl-plugin-sinf
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib
++Suggests: cpl-plugin-sinfo-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 SINFONI
 + This is the data reduction pipeline for the SINFONI 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.
 + SINFONI is a near-infrared (1.1 - 2.45 µm) integral field spectrograph fed by
 + an adaptive optics module, currently installed at the Cassegrain focus of
 + UT4. The spectrograph operates with 4 gratings (J, H, K, H+K) providing a
 + spectral resolution around 2000, 3000, 4000 in J, H, K, respectively, and
 + 1500 in H+K - each wavelength band fitting fully on the 2048 pixels of the
 + Hawaii 2RG (2kx2k) detector in the dispersion direction. The spatial
 + resolution is selectable from 0.25", 0.1" to 0.025" per image slice, which
 + corresponds to a field-of-view of 8"x8", 3"x3", or 0.8"x0.8"
 + respectively. The instrument can be also used for seeing limited open loop
 + observations.
+ 
 -Package: cpl-plugin-template-calib
++Package: cpl-plugin-sinfo-calib
+ Architecture: all
+ Multi-Arch: foreign
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
++Depends: ${misc:Depends}, cpl-plugin-sinfo, 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).
++Description: ESO data reduction pipeline calibration data installer for SINFONI
++ This package installs calibration data of the data reduction pipeline for the
++ SINFONI 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-sinfo.git