[Debian-astro-commits] [cpl-plugin-template] 10/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 9dd0bf4cf80c01e2fc3c61b20a05a30d5e555961
Merge: 4cd7db7 7febc04
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Sep 13 16:20:09 2013 +0200

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

 debian/control                      | 10 ++++++++++
 debian/cpl-plugin-calib.postinst.in | 22 ++++++++++++++++++++++
 debian/cpl-plugin-calib.prerm.in    |  7 +++++++
 debian/cpl-plugin.install.in        |  3 +++
 debian/rules                        | 14 ++++++++++++++
 5 files changed, 56 insertions(+)

diff --cc debian/control
index 3597335,531b3f9..1155f76
--- a/debian/control
+++ b/debian/control
@@@ -13,13 -13,20 +13,23 @@@ Package: cpl-plugin-ambe
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  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 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
+ Multi-Arch: foreign
+ Depends: ${misc:Depends}, cpl-plugin-template, wget
+ Description: ESO data reduction pipeline calibration data downloaded 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).

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