[cpl-plugin-sinfo] 04/04: 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 d097bd593c51f10a79f7db9ff7b708c56e2a194f
Merge: 55a25e6 d2ddf63
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 3 14:04:51 2013 +0100

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control
    	debian/repackage.sh

 debian/control      |  9 +++++----
 debian/repackage.sh | 35 ++++++++++++-----------------------
 debian/rules        |  6 ++++++
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --cc debian/control
index f69852f,ed63e22..6b8ca3c
--- a/debian/control
+++ b/debian/control
@@@ -19,28 -19,21 +19,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 (= ${binary:Version})
  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}
- Description: ESO data reduction pipeline calibration data for SINFONI
-  This package contains calibration data of the data reduction pipeline for the
-  SINFONI 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-sinfo, wget
++Description: ESO data reduction pipeline calibration data downloader for SINFONI
++ This package downloads 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