[cpl-plugin-hawki] 07/08: 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-hawki.

commit eca3f70a641c962f007c3c5c7cb5beaa90f5c187
Merge: 0e9f354 e561a5d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jan 12 18:24:28 2014 +0100

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

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

diff --cc debian/control
index 27d57eb,7ac0db8..7bfc203
--- a/debian/control
+++ b/debian/control
@@@ -13,28 -11,24 +13,28 @@@ 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/hawki
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-hawki.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-hawki.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-hawki
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, cpl-plugin-hawki-doc
- Suggests: cpl-plugin-hawki-calib (= ${binary:Version})
+ Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
++Suggests: cpl-plugin-hawki-calib (= ${binary:Version}), cpl-plugin-hawki-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 HAWK-I
 + This is the data reduction pipeline for the HAWK-I 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.
 + HAWK-I is a near-infrared (0.85-2.5 μm ) wide-field imager. It is being
 + offered for the first time in Period 81. The instrument is cryogenic (120 K,
 + detectors at 80 K) and has a full reflective design. The light passes four
 + mirrors and two filter wheels before hitting a mosaic of four Hawaii 2RG 2048
 + * 2048 pixels detectors. The final F-ratio is F/4.36 ( 1 arcsec on the sky
 + corresponds to 169 μm on the detector).
  
 -Package: cpl-plugin-template-doc
 +Package: cpl-plugin-hawki-doc
  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-hawki.git