[Debian-astro-commits] [cpl-plugin-template] 21/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 2c15edebaa230ee31619752c4332f252fdf158e6
Merge: 14cdadc 48ad790
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 14 15:38:37 2013 +0200

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

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

diff --cc debian/copyright
index dd08b2d,d3da9a0..91810c7
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,7 -1,7 +1,7 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 -Upstream-Name: template
 +Upstream-Name: giraf
- Upstream-Author: Ralf Palsa  <rpalsa 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/giraf/
  
  Files: *
  Copyright: Copyright (C) 2001-2012 European Southern Observatory

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