[Debian-astro-commits] [cpl-plugin-template] 42/76: Merge branch 'debian-template' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository cpl-plugin-template.

commit 9e5195cd752dc46b9ceb04e9cd6eef2554d48077
Merge: 9dcd39f e561a5d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jan 12 16:44:13 2014 +0100

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

 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 7767bf3,7ac0db8..14c5082
--- a/debian/control
+++ b/debian/control
@@@ -11,27 -11,24 +11,27 @@@ 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/giraffe/giraf-pipe-recipes.html
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-giraf.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-giraf.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-giraf
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, cpl-plugin-giraf-doc
- Suggests: cpl-plugin-giraf-calib (= ${binary:Version})
+ Recommends: esorex|python-cpl
 -Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
++Suggests: cpl-plugin-giraf-calib (= ${binary:Version}), cpl-plugin-giraf-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 GIRAFFE
 + This is the data reduction pipeline for the GIRAFFE 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.
 + GIRAFFE is a medium-high resolution (R=7500-30000) spectrograph for the
 + entire visible range 370-900 nm. GIRAFFE is aimed at carrying out
 + intermediate and high resolution spectroscopy of galactic and extragalactic
 + objects having a high spatial density. The name comes from the first design,
 + where the spectrograph was standing vertically on a platform. 
  
 -Package: cpl-plugin-template-doc
 +Package: cpl-plugin-giraf-doc
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends}

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