[Debian-astro-commits] [cpl-plugin-template] 12/76: 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 129496b0bfe96be81c653c1f8f1aaa79cf0ab86f
Merge: 837cbcb 70fc86d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Sep 16 19:13:09 2013 +0200

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

 debian/README.Debian                         |  6 +++---
 debian/control                               | 10 ++++++++++
 debian/cpl-plugin-calib.install.in           |  1 +
 debian/cpl-plugin-calib.lintian-overrides.in |  2 ++
 debian/cpl-plugin-calib.postinst.in          | 22 +++++++++++++++++++++
 debian/cpl-plugin-calib.prerm.in             |  7 +++++++
 debian/cpl-plugin.install.in                 |  3 +++
 debian/repackage.sh                          |  2 ++
 debian/rules                                 | 29 ++++++++++++++++++++++++++++
 9 files changed, 79 insertions(+), 3 deletions(-)

diff --cc debian/control
index f7f98a0,f882cf9..5d191ee
--- a/debian/control
+++ b/debian/control
@@@ -13,13 -13,21 +13,23 @@@ 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
  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}, cpl-plugin-template, wget
 -Section: contrib/science
 -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).
++Depends: ${misc:Depends}, cpl-plugin-giraf
++Description: ESO data reduction pipeline calibration data for GIRAFFE
++ This package contains calibration data of the data reduction pipeline for the
++ GIRAFFE 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