[tango] 03/21: update the copyright file

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit 2c3a8db50a115b09ab669e0235636a085c82ef25
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Oct 8 15:08:31 2015 +0200

    update the copyright file
    
    Conflicts:
    	debian/copyright
---
 debian/copyright | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c5b95bb..d4141da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,10 +4,6 @@ Upstream-Contact: tango at esrf.fr
 Source: http://ftp.esrf.fr/pub/cs/tango/
 Files-Excluded: lib/java/*.jar
 
-Files: *
-Copyright: © 2004-2012, The Tango team <tango at esrf.fr>
-License: LGPL-3+
-
 Files: debian/*
 Copyright: © 2006-2015, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
 License: LGPL-3+
@@ -25,10 +21,18 @@ Copyright: © 1997-1999 AT&T Laboratories Cambridge
            © 2010, 2011, The Tango team <tango at esrf.fr>
 License: LGPL-3+
 
+Files: *
+Copyright: © 2004-2015, The Tango team <tango at esrf.fr>
+License: LGPL-3+
+
 Files: cppserver/* utils/*
-Copyright: © 2010, 2011, The Tango team <tango at esrf.fr>
+Copyright: © 2010-2015 The Tango team <tango at esrf.fr>
 License: GPL-3+
 
+Files: lib/cpp/client/helpers/*
+Copyright: © 2004-2015, Synchrotron SOLEIL L'Orme des Merisiers Saint-Aubin - BP 48 - France
+License: LGPL-3+
+
 License: GPL-2+
  This package 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/tango.git