[cpl-plugin-giraf] 11/34: 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-giraf.

commit 56762ffc460fc1ce116a51ce851c9aea2a9c7914
Merge: 61ba633 220f0ea
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 25 12:03:51 2013 +0200

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

 debian/README.Debian                  |    4 ++++
 debian/control                        |   10 ----------
 debian/copyright                      |    2 +-
 debian/cpl-plugin-giraf-calib.install |    1 -
 debian/cpl-plugin-giraf.install       |    1 -
 debian/patches/fix_test_fail.patch    |   15 +++++++++++++++
 debian/repackage.sh                   |    5 ++---
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --cc debian/control
index dea1a40,586e39d..f7f98a0
--- a/debian/control
+++ b/debian/control
@@@ -5,31 -5,18 +5,21 @@@ Maintainer: Debian Science Maintainers 
  Uploaders: Ole Streicher <debian at liska.ath.cx>
  Build-Depends: debhelper (>= 9), dh-autoreconf, libcpl-dev (>= 5.3.1)
  Standards-Version: 3.9.4
 -Homepage: http://www.eso.org/sci/software/pipelines/template
 -Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-template.git
 -Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/giraf
 +Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-giraf.git
 +Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-giraf.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-giraf
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
- Suggests: cpl-plugin-giraf-calib
  Recommends: esorex|python-cpl
  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-giraf-calib
- Architecture: all
- Multi-Arch: foreign
- Depends: ${misc:Depends}
- Description: ESO data reduction pipeline calibration data for GIRAFFE
-  This package contains calibration and other static data of the 
-  data reduction pipeline for the GIRAFFE instrument of the
-  Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/copyright
index 37acc6f,7b8701b..dd08b2d
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,9 -1,9 +1,9 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 -Upstream-Name: template
 -Upstream-Author: Firstname Lastname  <flastname at eso.org>
 -Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
 +Upstream-Name: giraf
 +Upstream-Author: Ralf Palsa  <rpalsa at eso.org>
 +Source: ftp://ftp.eso.org/pub/dfs/pipelines/giraf/
  
- Files: * 
+ Files: *
  Copyright: Copyright (C) 2001-2012 European Southern Observatory
  License: GPL-v2+
   This program is free software; you can redistribute it and/or modify

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