[SCM] bristol packaging branch, master, updated. debian/0.60.4-1-4-g35d7ab5

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 35d7ab5ccc6ba27d1a1c2c68930328e0b10231d4
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 18 09:39:11 2010 +0200

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 7a1c37b..fe73d42 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,51 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
 Name: Bristol
-Maintainer: Nick Copeland <nick.copeland at ntlworld.com>
+Maintainer: Nick Copeland <nickycopeland at hotmail.com>
 Source: http://sourceforge.net/projects/bristol/files/
 
-Files: *
-Copyright: 1996-2009, Nick Copeland <nick.copeland at ntlworld.com>
-License: GPL-2
+Copyright: 1996-2010 Nick Copeland <nickycopeland at hotmail.com>
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+X-Comment: On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-3'.
 
-Files: debian/*
-Copyright: 2009, Alessio Treglia <quadrispro at ubuntu.com>
-           2003-2006, Guenter Geiger <geiger at debian.org>
-License: GPL-2
+Files: ./bristol/ringbuffer.c
+Copyright:
+ 2003 Rohan Drape
+ 2000 Paul Davis
+License: LGPL-2.1+
+ This library 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 2.1 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+X-Comment: On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-License: GPL-2
+Files: ./debian/*
+Copyright:
+ 2009-2010 Alessio Treglia <alessio at debian.org>
+ 2003-2006 Guenter Geiger <geiger at debian.org>
+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
@@ -26,6 +59,5 @@ License: GPL-2
  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
-
 X-Comment: On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-2'.

-- 
bristol packaging