[cpl-plugin-amber] 07/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 60681d597a0ef4567b6c03442c153c75b3b1e59b
Merge: 7138037 a4ecb26
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jan 3 16:44:42 2013 +0100

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

 debian/control |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/control
index f104dc9,b83f1ae..cf349a4
--- a/debian/control
+++ b/debian/control
@@@ -4,28 -4,25 +4,28 @@@ Priority: optiona
  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)
- Standards-Version: 3.9.3
+ 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-template-calib
 +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-template-calib
 +Package: cpl-plugin-amber-calib
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}

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