[cpl-plugin-fors] 03/03: 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-fors.

commit 53683b1a981ebae314047f0db3ac55bb6216f535
Merge: df412ca 48ad790
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 14 15:36:03 2013 +0200

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

 debian/copyright |    4 +---
 debian/rules     |    3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --cc debian/copyright
index 92c40cb,d3da9a0..4328ff4
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,13 -1,10 +1,11 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 -Upstream-Name: template
 +Upstream-Name: fors
- Upstream-Author: Carlo Izzo <cizzo at eso.org>,
-  Jonas Larsen <jmlarsen at eso.org>,
-  Cesar Enrique Garcia <cgarcia at eso.org>
+ Upstream-Contact: ESO User Support Department <usd-help at eso.org>
 -Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
 +Source: ftp://ftp.eso.org/pub/dfs/pipelines/fors/
  
  Files: *
 -Copyright: Copyright (C) 2001-2012 European Southern Observatory
 +Copyright: Copyright (C) 2001-2012 European Southern Observatory,
 + 1995-2009 Emmanuel Bertin <bertin at iap.fr>
  License: GPL-v2+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

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