[cpl-plugin-amber] 13/40: 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-amber.

commit be97c66570f832f25a4a1b6f424427a5b05a1184
Merge: 20d1ae8 3fd0b10
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon May 6 17:40:49 2013 +0200

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

 debian/README.Debian               |    4 ++++
 debian/control                     |   10 ----------
 debian/copyright                   |    2 +-
 debian/patches/fix_test_fail.patch |   15 +++++++++++++++
 debian/repackage.sh                |   22 ++++++++++++++--------
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --cc debian/control
index 745da3d,586e39d..3597335
--- a/debian/control
+++ b/debian/control
@@@ -3,33 -3,20 +3,23 @@@ 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), libfftw3-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/amber
 +Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-amber.git
 +Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-amber.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-amber
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Suggests: cpl-plugin-amber-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 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-amber-calib
- Architecture: all
- Multi-Arch: foreign
- Depends: ${misc:Depends}
- Description: ESO data reduction pipeline calibration data for Amber
-  This package contains calibration and other static data of the 
-  data reduction pipeline for the Amber instrument of the
-  Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/copyright
index b942026,7b8701b..6427243
--- 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-Name: amber
  Upstream-Author: Firstname Lastname  <flastname at eso.org>
 -Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
 +Source: ftp://ftp.eso.org/pub/dfs/pipelines/amber/
  
- 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-amber.git