[cpl-plugin-amber] 07/09: 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 e9c8d2a76189f7d35d99ed516e6c60b49296f3ca
Merge: 75667a8 e179dc1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 12:09:51 2014 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control
    	debian/patches/fix_test_fail.patch
    	debian/patches/series

 debian/control                                            | 10 +++++-----
 debian/patches/{serial-tests => force-serial-tests.patch} |  0
 debian/patches/series                                     |  1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --cc debian/control
index f599692,ee87152..d14abf9
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,7 +1,7 @@@
 -Source: cpl-plugin-template
 +Source: cpl-plugin-amber
  Section: science
  Priority: optional
- Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+ Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.debian.org>
  Uploaders: Ole Streicher <debian at liska.ath.cx>
  Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
@@@ -12,27 -11,24 +12,27 @@@
                 python-pyfits,
                 python-sphinx
  Standards-Version: 3.9.5
 -Homepage: http://www.eso.org/sci/software/pipelines/template
 -Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-template.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/amber
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-amber.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-amber.git
++Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-amber.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-amber.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-amber
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, cpl-plugin-amber-doc
- Suggests: cpl-plugin-amber-calib (= ${binary:Version})
+ Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
++Suggests: cpl-plugin-amber-calib (= ${binary:Version}), cpl-plugin-amber-doc
  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 for 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-doc
 +Package: cpl-plugin-amber-doc
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}
diff --cc debian/patches/series
index e7ca8ef,20ff8b9..45cc69f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,5 +1,5 @@@
  libadd_cpl.patch
  set_plugindir.patch
  use-std-paths-for-cpl.patch
 -fix_test_fail.patch
 -force-serial-tests.patch
 +format_security.patch
 +propagate_cppflags.patch
- serial-tests

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