[cpl-plugin-fors] 02/02: 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 dbb24d30be5dfd5112e397e30146feeeba6c123b
Merge: 53683b1 cf148fe
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Oct 15 13:14:32 2013 +0200

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

 debian/copyright |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --cc debian/copyright
index 4328ff4,755dceb..691b547
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,11 -1,11 +1,12 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 -Upstream-Name: template
 +Upstream-Name: fors
  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>
+  2013 Ole Streicher (Debian packaging)
  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
@@@ -20,28 -20,3 +21,23 @@@
   On Debian systems, the full text of the GNU General Public
   License version 2 can be found in the file
   `/usr/share/common-licenses/GPL-2'.
 +Note: The files copyrighted by Emmanuel Bertin are not used to build the
 + package.
 +
 +Files: sextractor/src/wcs/*
 +Copyright: Copyright 1995-1999 Mark Calabretta <mcalabre at atnf.csiro.au>
 +License: LGPL-2+
 + This library is free software; you can redistribute it and/or modify it
 + under the terms of the GNU Library General Public License as published
 + by the Free Software Foundation; either version 2 of the License, or (at
 + your option) any later version.
 + .
 + This library is distributed in the hope that it will be useful, but
 + WITHOUT ANY WARRANTY; without even the implied warranty of
 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
 + General Public License for more details.
 + .
 + On Debian systems, the full text of the GNU Library General Public
 + License version 2 can be found in the file
 + `/usr/share/common-licenses/LGPL-2'.
 +Note: These files are not used to build the package.
- 
- Files: debian/*
- Copyright: not applicable
- License: public-domain
-  Debian packaging by Ole Streicher <debian at liska.ath.cx>

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