[SCM] TANGO distributed control system. branch, master, updated. debian/6.1.1c-1-72-g0fa12af

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 0fa12af5b28caa702012d390aa555b741c895f30
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Wed Oct 13 23:34:08 2010 +0200

    * improve the copyright file

diff --git a/debian/copyright b/debian/copyright
index 479e285..31db482 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,13 +8,19 @@ Disclaimer: All precompiled java class were removed.
 
 Files: debian/*
 Copyright: © 2006-2008, picca frederic<picca at synchrotron-soleil.fr>
-Licence: GPL-2+
+Licence: GPL-3+
  The Debian packaging information is under the GPL, version 3 or later
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
 Files: lib/cpp/server/readers_writers_lock.h
 Copyright : © 1997-1999 AT&T Laboratories Cambridge
+Licence: GPL-2+
+
+Files: lib/cpp/log4tango/*
+Copyright : © 2010, The Tango team <tango at esrf.fr>
+Licence: GPL-2+
+
 License: GPL-2+
 
  This package is free software; you can redistribute it and/or modify
@@ -35,12 +41,33 @@ License: GPL-2+
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
 Files: *
-Copyright : © 2008, The Tango team <tango at esrf.fr>
-License: GPL-2+
+Copyright : © 2010, The Tango team <tango at esrf.fr>
+Licence LGPL-3+
+
+ Tango is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ 
+ Tango 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+Files: cppserver/*
+Copyright : © 2010, The Tango team <tango at esrf.fr>
+License: GPL-3+
 
  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
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
  (at your option) any later version.
 
  This package is distributed in the hope that it will be useful,

-- 
TANGO distributed control system.