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

[Frédéric-Emmanuel PICCA]

The following commit has been merged in the master branch:
commit 0558703c4226b228e454bbf49f3e12a77996e720
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Thu Mar 24 11:45:00 2011 +0100

    * make the copyright file dep5 compliant.

diff --git a/debian/copyright b/debian/copyright
index 31db482..2e933fc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,34 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Author: The Tango team (tango at esrf.fr)
-Debianized-By: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-Debianized-Date: Sat, 18 Nov 2006 18:52:07 +0100.
-Original-Source-Location: http://tango-controls.org/download
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Upstream-Name: The Tango team
+Upstream-Contact: tango at esrf.fr
+Source: http://ftp.esrf.fr/pub/cs/tango/
 Disclaimer: All precompiled java class were removed. 
 
-
 Files: debian/*
-Copyright: © 2006-2008, picca frederic<picca at synchrotron-soleil.fr>
-Licence: GPL-3+
+Copyright: © 2006-2011, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
+Licence: LGPL-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: config/ltmain.sh cpp/log4tango/config/ltmain.sh
+Copyright: © 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+Licence: GPL-2+
+
 Files: lib/cpp/server/readers_writers_lock.h
 Copyright : © 1997-1999 AT&T Laboratories Cambridge
-Licence: GPL-2+
+	    © 2010, 2011, The Tango team <tango at esrf.fr>
+Licence: LGPL-3+
 
-Files: lib/cpp/log4tango/*
-Copyright : © 2010, The Tango team <tango at esrf.fr>
-Licence: GPL-2+
+Files: *
+Copyright : © 2010, 2011, The Tango team <tango at esrf.fr>
+Licence LGPL-3+
 
-License: GPL-2+
+Files: cppserver/* utils/*
+Copyright : © 2010, 2011, The Tango team <tango at esrf.fr>
+License: GPL-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
  the Free Software Foundation; either version 2 of the License, or
@@ -40,10 +46,7 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
-Files: *
-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
@@ -61,8 +64,6 @@ Licence LGPL-3+
  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

-- 
TANGO distributed control system.