[cpl-plugin-xsh] 08/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 25ff2d4349eea96160b6bcc1523f70356a335115
Merge: a655349 2bff572
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 25 11:16:37 2013 +0200

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

 debian/control                     |    1 -
 debian/patches/fix_test_fail.patch |   15 +++++++++++++++
 debian/repackage.sh                |    5 ++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --cc debian/control
index e7f7d05,586e39d..ecac463
--- a/debian/control
+++ b/debian/control
@@@ -3,35 -3,20 +3,34 @@@ Section: scienc
  Priority: optional
  Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
  Uploaders: Ole Streicher <debian at liska.ath.cx>
 -Build-Depends: debhelper (>= 9), dh-autoreconf, libcpl-dev (>= 5.3.1)
 +Build-Depends: debhelper (>= 9),
 +               dh-autoreconf,
 +               libcpl-dev (>= 5.3.1),
 +               libgsl0-dev,
 +	       liblapack-dev
  Standards-Version: 3.9.4
 -Homepage: http://www.eso.org/sci/software/pipelines/template
 -Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-template.git
 -Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/xsh
 +Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git
 +Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-xsh.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-xsh
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Suggests: cpl-plugin-xsh-calib
  Recommends: esorex|python-cpl
  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-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
 + data reduction pipeline for the XSHOOTER 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-science/packages/cpl-plugin-xsh.git