[cpl-plugin-xsh] 05/06: 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-xsh.

commit aa6d3fbe9692f6e48a4158889eff707747842794
Merge: bd7ae5f e561a5d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jan 12 16:59:23 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                                |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --cc debian/control
index 963b3e9,7ac0db8..379b0ad
--- a/debian/control
+++ b/debian/control
@@@ -13,29 -11,24 +13,29 @@@ 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/xshooter/
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-xsh.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-xsh.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-xsh
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, cpl-plugin-xsh-doc
- Suggests: cpl-plugin-xsh-calib
+ Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
++Suggests: cpl-plugin-xsh-calib, cpl-plugin-xsh-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 XSHOOTER
 + This is the data reduction pipeline for the XSHOOTER 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.
 + XSHOOTER is a multi wavelength (300-2500nm) medium resolution spectrograph
 + mounted at the UT2 Cassegrain focus. XSHOOTER consists of 3 arms, each with
 + optimized optics, dispersive elements and detectors:
 + .
 +  * UVB, covering the wavelength range 300-559.5 nm,
 +  * VIS, covering the wavelength range 559.5-1024 nm,
 +  * NIR, covering the wavelength range 1024-2480 nm.
  
 -Package: cpl-plugin-template-doc
 +Package: cpl-plugin-xsh-doc
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}
diff --cc debian/patches/series
index cafd6a8,20ff8b9..678b99d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,5 +1,7 @@@
  libadd_cpl.patch
  set_plugindir.patch
  use-std-paths-for-cpl.patch
 -fix_test_fail.patch
 +lapack.patch
 +fix_typos.patch
 +shlib-calls-exit.patch
- serial-tests
+ force-serial-tests.patch

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