[Debian-astro-commits] [cpl-plugin-template] 47/81: Merge branch 'debian-template' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository cpl-plugin-template.

commit 5acdb50a57fb0fbf95b887f28268085c328e6856
Merge: 8ced6ce 6852346
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Dec 4 14:59:50 2013 +0100

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

 debian/README.Source     |  6 ++++++
 debian/control           | 12 ++++++------
 debian/create_manpage.py |  2 +-
 debian/create_sphinx.py  |  8 ++++++--
 debian/repackage.sh      | 39 +++++++++++++++++++--------------------
 debian/rules             |  6 ++++--
 debian/watch             |  1 +
 7 files changed, 43 insertions(+), 31 deletions(-)

diff --cc debian/control
index 7e6d80e,ed63e22..50c3f8b
--- a/debian/control
+++ b/debian/control
@@@ -20,24 -19,21 +20,24 @@@ Package: cpl-plugin-ambe
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib
 +Suggests: cpl-plugin-amber-calib (= ${binary:Version})
  Multi-Arch: same
- Description: ESO data reduction pipeline amber
-  This is the data reduction pipeline for the Amber instrument of the
 -Description: ESO data reduction pipeline template
 - This is the data reduction pipeline for the Template instrument of the
++Description: ESO data reduction pipeline for AMBER
++ This is the data reduction pipeline for the AMBER 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.
 + AMBER is a near-infrared, multi-beam interferometric instrument, combining
 + simultaneously up to 3 telescopes. AMBER can be used in Period 82 and
 + following with UTs or ATs (see below for current performance
 + specifications). All possible triplets of UTs are available, and a number of
 + selected AT combinations.
  
 -Package: cpl-plugin-template-calib
 +Package: cpl-plugin-amber-calib
  Architecture: all
- Depends: ${misc:Depends}, wget
++Depends: ${misc:Depends}, cpl-plugin-amber, wget
  Multi-Arch: foreign
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
  Section: contrib/science
- Description: ESO data reduction pipeline calibration data installer for Amber
-  This package installs calibration data of the data reduction pipeline for the
-  Amber instrument of the Very Large Telescope (VLT) from the European Southern
 -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 AMBER
++ This package downloads calibration data of the data reduction pipeline for the
++ AMBER instrument of the Very Large Telescope (VLT) from the European Southern
 + Observatory (ESO).
diff --cc debian/watch
index 52be581,33a79fa..8539634
--- 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 \
 + .*/amber-kit-(.*).tar.gz \
   debian debian/repackage.sh

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