[cpl-plugin-fors] 05/06: 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 01e579f50038c9c6279794fd1c46bace63dfe393
Merge: 5c381d4 e561a5d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jan 12 15:45:04 2014 +0100

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

 debian/control                                       |  4 ++--
 debian/patches/fix_test_fail.patch                   | 20 +++++++++-----------
 .../{serial-tests => force-serial-tests.patch}       |  0
 debian/patches/series                                |  3 ++-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --cc debian/control
index 04e047c,7ac0db8..fdf8406
--- a/debian/control
+++ b/debian/control
@@@ -13,42 -11,24 +13,42 @@@ Build-Depends: debhelper (>= 9)
                 python-pyfits,
                 python-sphinx
  Standards-Version: 3.9.5
 -Homepage: http://www.eso.org/sci/software/pipelines/template
 -Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-template.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/fors
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-fors.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-fors.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-fors
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, cpl-plugin-fors-doc, sextractor
- Suggests: cpl-plugin-fors-calib (= ${binary:Version})
 -Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
++Recommends: esorex|python-cpl, sextractor
++Suggests: cpl-plugin-fors-calib (= ${binary:Version}), cpl-plugin-fors-doc
  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 for 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-template-doc
 +Package: cpl-plugin-fors-doc
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}
diff --cc debian/patches/series
index a7335a3,20ff8b9..60f11ec
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,5 +1,8 @@@
  libadd_cpl.patch
  set_plugindir.patch
  use-std-paths-for-cpl.patch
 +dont_build_sextractor.patch
 +private_libmosca.patch
 +disable_tests_libmosca.patch
- serial-tests
+ fix_test_fail.patch
+ force-serial-tests.patch

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