[cpl-plugin-xsh] 33/33: 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 59fb8fdb5c7ee81f13597648a602eb7decfba851
Merge: 417f43e c449240
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Oct 18 10:05:44 2013 +0200

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

 debian/README.Debian                         |    4 ----
 debian/README.Debian.in                      |    4 ++++
 debian/control                               |    7 +++---
 debian/copyright                             |    8 ++-----
 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                          |   20 ++++++++++++++--
 debian/rules                                 |   33 ++++++++++++++++++++++++++
 11 files changed, 96 insertions(+), 15 deletions(-)

diff --cc debian/control
index ecac463,f882cf9..210dbee
--- a/debian/control
+++ b/debian/control
@@@ -17,20 -13,21 +17,21 @@@ Package: cpl-plugin-xs
  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 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.
  
 -Package: cpl-plugin-template-calib
 +Package: cpl-plugin-xsh-calib
  Architecture: all
  Multi-Arch: foreign
- Depends: ${misc:Depends}
- Description: ESO data reduction pipeline calibration data XSHOOTER
-  This package contains calibration and other static data of the
 -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
++Depends: ${misc:Depends}, cpl-plugin-xsh, wget
++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/copyright
index f7eab08,755dceb..4be5203
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,7 -1,7 +1,7 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 -Upstream-Name: template
 +Upstream-Name: xsh
- Upstream-Author: Andrea Modigliani <Andrea.Modigliani at eso.org>
+ Upstream-Contact: ESO User Support Department <usd-help at eso.org>
 -Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
 +Source: ftp://ftp.eso.org/pub/dfs/pipelines/xsh/
  
  Files: *
  Copyright: Copyright (C) 2001-2012 European Southern Observatory

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