[cpl-plugin-giraf] 10/13: 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-giraf.

commit d2d335732da6341bb2d6bd3130f7cd626f8709c6
Merge: 46e4ff8 6852346
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 3 22:05:20 2013 +0100

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

 debian/README.Source     |  6 ++++++
 debian/control           |  7 ++++---
 debian/create_manpage.py |  4 ++--
 debian/create_sphinx.py  |  8 ++++++--
 debian/repackage.sh      | 47 ++++++++++++++++++++---------------------------
 debian/rules             |  8 +++++++-
 debian/watch             |  1 +
 7 files changed, 46 insertions(+), 35 deletions(-)

diff --cc debian/control
index 18a9751,ed63e22..85a7863
--- a/debian/control
+++ b/debian/control
@@@ -19,23 -19,21 +19,24 @@@ Package: cpl-plugin-gira
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib
 +Suggests: cpl-plugin-giraf-calib (= ${binary:Version})
  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 GIRAFFE
 + This is the data reduction pipeline for the GIRAFFE 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.
 + GIRAFFE is a medium-high resolution (R=7500-30000) spectrograph for the
 + entire visible range 370-900 nm. GIRAFFE is aimed at carrying out
 + intermediate and high resolution spectroscopy of galactic and extragalactic
 + objects having a high spatial density. The name comes from the first design,
 + where the spectrograph was standing vertically on a platform. 
  
 -Package: cpl-plugin-template-calib
 +Package: cpl-plugin-giraf-calib
  Architecture: all
  Multi-Arch: foreign
- Depends: ${misc:Depends}
- Description: ESO data reduction pipeline calibration data for GIRAFFE
-  This package contains calibration data of the data reduction pipeline for the
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
++Depends: ${misc:Depends}, cpl-plugin-giraf, 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
 - Very Large Telescope (VLT) from the European Southern Observatory (ESO).
++Description: ESO data reduction pipeline calibration data downloader for GIRAFFE
++ This package downloads calibration data of the data reduction pipeline for the
 + GIRAFFE instrument of the Very Large Telescope (VLT) from the European
 + Southern Observatory (ESO).
diff --cc debian/watch
index 42aba01,33a79fa..3951044
--- 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 \
 + .*/giraf-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-giraf.git