[cpl-plugin-sinfo] 15/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 fb4148498a6e4977cfc420ac85a4abed800098dc
Merge: 4e615c5 3fd0b10
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue May 7 16:27:41 2013 +0200

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

 debian/README.Debian                  |    4 ++++
 debian/control                        |   10 ----------
 debian/copyright                      |    2 +-
 debian/cpl-plugin-sinfo-calib.install |    1 -
 debian/cpl-plugin-sinfo.install       |    4 +++-
 debian/patches/fix_test_fail.patch    |   15 +++++++++++++++
 debian/repackage.sh                   |   22 ++++++++++++++--------
 7 files changed, 37 insertions(+), 21 deletions(-)

diff --cc debian/control
index 06d6e06,586e39d..9ed5c95
--- a/debian/control
+++ b/debian/control
@@@ -5,36 -5,18 +5,26 @@@ Maintainer: Debian Science Maintainers 
  Uploaders: Ole Streicher <debian at liska.ath.cx>
  Build-Depends: debhelper (>= 9), dh-autoreconf, libcpl-dev (>= 5.3.1)
  Standards-Version: 3.9.4
 -Homepage: http://www.eso.org/sci/software/pipelines/template
 -Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-template.git
 -Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/sinfo
 +Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-sinfo.git
 +Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-sinfo.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-sinfo
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Suggests: cpl-plugin-sinfo-calib
  Recommends: esorex|python-cpl
  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-sinfo-calib
- Architecture: all
- Multi-Arch: foreign
- Depends: ${misc:Depends}
- Description: ESO data reduction pipeline calibration data SINFONI
-  This package contains calibration and other static data of the 
-  data reduction pipeline for the SINFONI instrument of the
-  Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/copyright
index e6d512c,7b8701b..86037e6
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,9 -1,9 +1,9 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 -Upstream-Name: template
 -Upstream-Author: Firstname Lastname  <flastname at eso.org>
 -Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
 +Upstream-Name: sinfo
 +Upstream-Author: Andrea Modigliani <amodigli at eso.org>
 +Source: ftp://ftp.eso.org/pub/dfs/pipelines/sinfo/
  
- Files: * 
+ Files: *
  Copyright: Copyright (C) 2001-2012 European Southern Observatory
  License: GPL-v2+
   This program is free software; you can redistribute it and/or modify
diff --cc debian/cpl-plugin-sinfo.install
index f1d0181,0000000..ac766f0
mode 100644,000000..100644
--- a/debian/cpl-plugin-sinfo.install
+++ b/debian/cpl-plugin-sinfo.install
@@@ -1,1 -1,0 +1,3 @@@
- usr/lib/*
++calib/dic usr/share/cpl-plugins/sinfo
++calib/gasgano usr/share/cpl-plugins/sinfo
++

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