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

commit fe0cf5fbfea6503c254ba79959c60854b826c993
Merge: f1b76c3 3fd0b10
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 8 14:24:28 2013 +0200

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

 debian/README.Debian                 |    4 ++++
 debian/control                       |   10 ----------
 debian/copyright                     |    2 +-
 debian/cpl-plugin-fors-calib.install |    1 -
 debian/cpl-plugin-fors.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 c322653,586e39d..f4ae666
--- a/debian/control
+++ b/debian/control
@@@ -5,46 -5,18 +5,36 @@@ 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/fors
 +Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-fors.git
 +Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-fors.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-fors
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Suggests: cpl-plugin-fors-calib
 -Recommends: esorex|python-cpl
 +Recommends: esorex|python-cpl, sextractor
  Multi-Arch: same
 -Description: ESO data reduction pipeline template
 - This is 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 FORS
 + FORS pipeline recipes for the reduction of data obtained with the FORS1 and
 + FORS2 instruments in the LSS, MOS, MXU, PMOS, and direct imaging instrument
 + modes.
   .
 - This package is used as a template for the other ESO recipes. It is not
 - meant to built as a package.
 + FORS is the visual and near UV FOcal Reducer and low dispersion Spectrograph
 + for the Very Large Telescope (VLT) of the European Southern Observatory
 + (ESO). Two versions of FORS have been built, upgraded and moved to the
 + Cassegrain foci of different telescopes in the past years. In April 2009,
 + FORS1 was dismounted to make room for X-shooter, so only FORS2 is in
 + operation. FORS is designed as an all-dioptric instrument for the wavelength
 + range from 330 nm to 1100 nm and provides an image scale of 0".25/pixel (or
 + 0".125/pixel with the high resolution collimator) in the standard readout
 + mode (2x2 binning). FORS2 is installed on UT1 (Antu) and is by default
 + equipped with a detector system that is optimised for the red with a very low
 + level of fringes thanks to a mosaic of two 2k x 4k MIT CCDs (with 15 μm
 + pixels). However, the blue-optimised detector system that was previously
 + available on FORS1 has been commissioned on FORS2 and can be requested for
 + Visitor Mode observation. The geometries of both detector systems are
 + similar, with the optical axis falling ~30" above the gap and offsets of a
 + few arc-seconds between the two chips. FORS2 has many modes, including
 + multi-object spectroscopy with exchangable masks, long-slit spectroscopy,
 + imaging and spectro-polarimetry and high-time resolution imaging and
 + spectroscopy. 
- 
- Package: cpl-plugin-fors-calib
- Architecture: all
- Multi-Arch: foreign
- Depends: ${misc:Depends}
- Description: ESO data reduction pipeline calibration data FORS
-  This package contains calibration and other static data of the 
-  data reduction pipeline for the FORS instrument of the
-  Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/copyright
index 779da71,7b8701b..59990ce
--- 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-Name: fors
  Upstream-Author: Firstname Lastname  <flastname at eso.org>
 -Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
 +Source: ftp://ftp.eso.org/pub/dfs/pipelines/fors/
  
- 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-fors.install
index f1d0181,0000000..c275320
mode 100644,000000..100644
--- a/debian/cpl-plugin-fors.install
+++ b/debian/cpl-plugin-fors.install
@@@ -1,1 -1,0 +1,3 @@@
- usr/lib/*
++calib/dic usr/share/cpl-plugins/fors
++calib/gasgano usr/share/cpl-plugins/fors
++reflex usr/share/cpl-plugins/fors

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