[cpl-plugin-sinfo] 01/02: 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-sinfo.

commit 5db94838388fb251ce954f032d912675d144a742
Merge: 6f4f687 e561a5d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jan 12 18:22:11 2014 +0100

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

 debian/control                                       |  4 ++--
 debian/patches/fix_test_fail.patch                   | 20 +++++++++-----------
 .../{serial-tests => force-serial-tests.patch}       |  0
 debian/patches/series                                |  3 ++-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --cc debian/control
index 35332a8,7ac0db8..9e078ad
--- a/debian/control
+++ b/debian/control
@@@ -11,32 -11,24 +11,32 @@@ Build-Depends: debhelper (>= 9)
                 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-science/packages/cpl-plugin-template.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/sinfoni/sinfo-pipe-recipes.html
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-sinfo.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-sinfo.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-sinfo
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, cpl-plugin-sinfo-doc
- Suggests: cpl-plugin-sinfo-calib (= ${binary:Version})
+ Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
++Suggests: cpl-plugin-sinfo-calib (= ${binary:Version}), cpl-plugin-sinfo-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 SINFONI
 + This is the data reduction pipeline for the SINFONI 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.
 + SINFONI is a near-infrared (1.1 - 2.45 µm) integral field spectrograph fed by
 + an adaptive optics module, currently installed at the Cassegrain focus of
 + UT4. The spectrograph operates with 4 gratings (J, H, K, H+K) providing a
 + spectral resolution around 2000, 3000, 4000 in J, H, K, respectively, and
 + 1500 in H+K - each wavelength band fitting fully on the 2048 pixels of the
 + Hawaii 2RG (2kx2k) detector in the dispersion direction. The spatial
 + resolution is selectable from 0.25", 0.1" to 0.025" per image slice, which
 + corresponds to a field-of-view of 8"x8", 3"x3", or 0.8"x0.8"
 + respectively. The instrument can be also used for seeing limited open loop
 + observations.
  
 -Package: cpl-plugin-template-doc
 +Package: cpl-plugin-sinfo-doc
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}
diff --cc debian/patches/series
index e1b6789,20ff8b9..9665599
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,5 +1,5 @@@
 -libadd_cpl.patch
  set_plugindir.patch
  use-std-paths-for-cpl.patch
 +explicite_function_declaration.patch
- serial-tests
+ fix_test_fail.patch
+ force-serial-tests.patch

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