[cpl-plugin-hawki] 19/39: 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-hawki.

commit f734f1f89ee79d79eb4596f63f0c136fbbad4570
Merge: 2bc8aec 220f0ea
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 25 11:38:56 2013 +0200

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

 debian/README.Debian                  |    4 ++++
 debian/control                        |   10 ----------
 debian/copyright                      |    2 +-
 debian/cpl-plugin-hawki-calib.install |    1 -
 debian/repackage.sh                   |    5 ++---
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --cc debian/control
index 8f30945,586e39d..024b37f
--- a/debian/control
+++ b/debian/control
@@@ -3,38 -3,20 +3,28 @@@ 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,
 +               pkg-config
  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/hawki
 +Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-hawki.git
 +Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-hawki.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-hawki
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Suggests: cpl-plugin-hawki-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 HAWK-I
 + This is the data reduction pipeline for the HAWK-I 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.
 + HAWK-I is a near-infrared (0.85-2.5 μm ) wide-field imager. It is being
 + offered for the first time in Period 81. The instrument is cryogenic (120 K,
 + detectors at 80 K) and has a full reflective design. The light passes four
 + mirrors and two filter wheels before hitting a mosaic of four Hawaii 2RG 2048
 + * 2048 pixels detectors. The final F-ratio is F/4.36 ( 1 arcsec on the sky
 + corresponds to 169 μm on the detector).
- 
- Package: cpl-plugin-hawki-calib
- Architecture: all
- Multi-Arch: foreign
- Depends: ${misc:Depends}
- Description: ESO data reduction pipeline calibration data HAWK-I
-  This package contains calibration and other static data of the
-  data reduction pipeline for the HAWK-I instrument of the
-  Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/copyright
index 10ac044,7b8701b..2f55737
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,9 -1,9 +1,9 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 -Upstream-Name: template
 -Upstream-Author: Firstname Lastname  <flastname at eso.org>
 -Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
 +Upstream-Name: hawki
 +Upstream-Author: César Enrique García Dabó   <cgarcia at eso.org>
 +Source: ftp://ftp.eso.org/pub/dfs/pipelines/hawki/
  
- Files: * 
+ Files: *
  Copyright: Copyright (C) 2001-2012 European Southern Observatory
  License: GPL-v2+
   This program is free software; you can redistribute it and/or modify

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