[cpl-plugin-xsh] 08/12: 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-xsh.

commit 3343827647c8738972dde35734844ced7f241483
Merge: 992835a ed613f1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Dec 11 10:16:56 2013 +0100

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

 debian/README.Source    |  6 +++++
 debian/control          |  1 +
 debian/create_sphinx.py | 66 +++++++++++++++++++++++++++----------------------
 debian/repackage.sh     | 39 ++++++++++++++---------------
 debian/rules            |  6 +++--
 debian/watch            |  1 +
 6 files changed, 67 insertions(+), 52 deletions(-)

diff --cc debian/control
index 257743d,ed63e22..32c1af9
--- a/debian/control
+++ b/debian/control
@@@ -23,23 -21,19 +23,24 @@@ Depends: ${misc:Depends}, ${shlibs:Depe
  Recommends: esorex|python-cpl
  Suggests: cpl-plugin-template-calib
  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 for XSHOOTER
 + This is the data reduction pipeline for the XSHOOTER 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.
 + XSHOOTER is a multi wavelength (300-2500nm) medium resolution spectrograph
 + mounted at the UT2 Cassegrain focus. XSHOOTER consists of 3 arms, each with
 + optimized optics, dispersive elements and detectors:
 + .
 +  * UVB, covering the wavelength range 300-559.5 nm,
 +  * VIS, covering the wavelength range 559.5-1024 nm,
 +  * NIR, covering the wavelength range 1024-2480 nm.
  
 -Package: cpl-plugin-template-calib
 +Package: cpl-plugin-xsh-calib
  Architecture: all
  Multi-Arch: foreign
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
 +Depends: ${misc:Depends}, cpl-plugin-xsh, wget
+ Section: contrib/science
 -Description: ESO data reduction pipeline calibration data downloader template
 - This package downloads calibration and other static data of the 
 - data reduction pipeline for the Template instrument of the
 +Description: ESO data reduction pipeline calibration data downloader for XSHOOTER
 + This package downloads calibration and other static data of the
 + data reduction pipeline for the XSHOOTER instrument of the
   Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/watch
index 24a11b4,33a79fa..5d6d0fc
--- 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 \
 + .*/xsh-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-xsh.git