[cpl-plugin-fors] 06/08: 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 a1c28a350475e5f41c125c350800ca352579f5dd
Merge: 4f25057 6852346
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 3 21:50:38 2013 +0100

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

 debian/README.Source |  6 ++++++
 debian/control       |  6 +++---
 debian/repackage.sh  | 41 ++++++++++++++++++++---------------------
 debian/rules         |  8 +++++++-
 debian/watch         |  1 +
 5 files changed, 37 insertions(+), 25 deletions(-)

diff --cc debian/control
index e1cd553,ed63e22..4da52df
--- a/debian/control
+++ b/debian/control
@@@ -13,47 -11,29 +13,47 @@@ Build-Depends: debhelper (>= 9)
                 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}
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
++Depends: ${misc:Depends}, cpl-plugin-fors, wget
  Section: contrib/science
- Description: ESO data reduction pipeline calibration data for FORS2
-  This package contains calibration and other static data of the 
 -Description: ESO data reduction pipeline calibration data downloader template
++Description: ESO data reduction pipeline calibration data downloader 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/rules
index a7a8573,49e7b00..7c853de
--- a/debian/rules
+++ b/debian/rules
@@@ -66,8 -66,8 +66,14 @@@ override_dh_installchangelogs
  	  dh_installchangelogs ; \
  	fi
  
 +override_dh_fixperms:
 +	dh_fixperms
 +	if [ -d debian/cpl-plugin-fors-calib/usr/share/cpl-plugins/ ] ; then \
 +	    chmod 644 debian/cpl-plugin-fors-calib/usr/share/cpl-plugins/*/cal/*.fits ; \
 +	fi
++
+ override_dh_gencontrol-indep:
+ 	dh_gencontrol
+ 	if [ ! -d calib/cal ] ; then \
+ 	  sed "s/Installed-Size:.*/Installed-Size: $(shell cat calib/cal_size)/" -i debian/${DEBPKGNAME}-calib/DEBIAN/control ; \
+ 	fi
diff --cc debian/watch
index b7dcb5d,33a79fa..afcdc63
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,5 +1,5 @@@
  version=3
+ opts=dversionmangle=s/\+dfsg// \
  http://www.eso.org/sci/software/pipelines/ \
 - .*/template-kit-(.*).tar.gz \
 + .*/fors-kit-(.*).tar.gz \
   debian debian/repackage.sh

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