[cpl-plugin-fors] 08/09: 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 ba65f36a9509c05706377f2379ce2a208d1ced2d
Merge: 19be410 34c17bc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 14:47:46 2013 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control
    	debian/create_manpage.py
    	debian/create_sphinx.py
    	debian/rules

 debian/control             |    1 +
 debian/cpl-plugin.doc-base |   13 +++++++++++++
 debian/create_manpage.py   |    2 +-
 debian/repackage.sh        |    6 ++++++
 debian/rules               |    6 ++++--
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/control
index 165fad2,15d2392..7e543d7
--- a/debian/control
+++ b/debian/control
@@@ -8,49 -8,32 +8,50 @@@ Build-Depends: debhelper (>= 9)
                 libcpl-dev (>= 5.3.1),
                 python,
                 python-cpl,
+                python-pyfits,
                 python-sphinx
  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://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
 -Suggests: cpl-plugin-template-calib
 +Recommends: esorex|python-cpl, sextractor
 +Suggests: cpl-plugin-fors-calib (= ${binary:Version})
  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-template-calib
 +Package: cpl-plugin-fors-calib
  Architecture: all
  Multi-Arch: foreign
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
 +Depends: ${misc:Depends}
  Section: contrib/science
 -Description: ESO data reduction pipeline calibration data downloaded template
 +Description: ESO data reduction pipeline calibration data for FORS2
   This package downloads calibration and other static data of the 
 - data reduction pipeline for the Template instrument of the
 + data reduction pipeline for the FORS2 instrument of the
   Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/repackage.sh
index 5e60aa4,eb4be41..f9bc6d9
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@@ -18,15 -18,15 +18,21 @@@ VERSION=$
  # Include full calibration set?
  # If not, the "calib" package will act as a "downloader" package for the 
  # calibration files.
 -INCLUDE_CALIB="no"
 -#INCLUDE_CALIB="yes"
 +#INCLUDE_CALIB="no"
 +INCLUDE_CALIB="yes"
 +
 +# Include test data?
 +# If not, the test (fits) data are removed from the source package.
 +# In this case, also the tests need to be adjusted.
 +#INCLUDE_TEST_DATA="no"
 +INCLUDE_TEST_DATA="yes"
  
+ # Include test data?
+ # If not, the test (fits) data are removed from the source package.
+ # In this case, also the tests need to be adjusted.
+ #INCLUDE_TEST_DATA="no"
+ INCLUDE_TEST_DATA="yes"
+ 
  BASEDIR=$(dirname $3)
  FILENAME=${BASEDIR}/${PIPELINE}-kit-${VERSION}.tar.gz
  tar xf ${FILENAME} -C ${BASEDIR}

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