[SCM] tango branch, master, updated. debian/7.2.6+dfsg-4-3-g1a6e284

Wed Jul 27 19:12:59 UTC 2011

The following commit has been merged in the master branch:
commit 1a6e284df7cba79a04c7ef8cf9faafb13dafbfb4
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Jul 25 21:21:04 2011 +0100

    fix the copyright file

diff --git a/debian/changelog b/debian/changelog
index fcf0aca..ff87fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ tango (7.2.6+dfsg-5) unstable; urgency=low
   * add the symbols files
   * Add debconf translation:
     - Spanish, from Camaleón, (Closes: #632950)
+  * debian/copyright fixed using config-edit
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Tue, 19 Jul 2011 16:55:06 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 2e933fc..a1e398f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: The Tango team
 Upstream-Contact: tango at esrf.fr
 Source: http://ftp.esrf.fr/pub/cs/tango/
@@ -6,26 +6,26 @@ Disclaimer: All precompiled java class were removed.
 
 Files: debian/*
 Copyright: © 2006-2011, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-Licence: LGPL-3+
+License: 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+
+License: GPL-2+
 
 Files: lib/cpp/server/readers_writers_lock.h
-Copyright : © 1997-1999 AT&T Laboratories Cambridge
-	    © 2010, 2011, The Tango team <tango at esrf.fr>
-Licence: LGPL-3+
+Copyright: © 1997-1999 AT&T Laboratories Cambridge
+           © 2010, 2011, The Tango team <tango at esrf.fr>
+License: LGPL-3+
 
 Files: *
-Copyright : © 2010, 2011, The Tango team <tango at esrf.fr>
-Licence LGPL-3+
+Copyright: © 2010, 2011, 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, 2011, The Tango team <tango at esrf.fr>
 License: GPL-3+
 
 License: GPL-2+
@@ -33,52 +33,52 @@ License: GPL-2+
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
-
+ .
  This package 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 General Public License for more details.
-
+ .
  You should have received a copy of the GNU 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 General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
 
+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 3 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU 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 General
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
-Licence LGPL-3+
+License: 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'.
 
-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 3 of the License, or
- (at your option) any later version.
-
- This package 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 General Public License for more details.
-
- You should have received a copy of the GNU 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 General
- Public License can be found in `/usr/share/common-licenses/GPL'.

-- 
TANGO distributed control system.

