[SCM] bristol/master: Rewrite debian/copyright as per DEP-5 rev.174.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3f9df0a4393e13c3e00bf22503986c7c347fa561
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 9 00:46:26 2011 +0200

    Rewrite debian/copyright as per DEP-5 rev.174.

diff --git a/debian/copyright b/debian/copyright
index fe73d42..321f6fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,25 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: Bristol
-Maintainer: Nick Copeland <nickycopeland at hotmail.com>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Upstream-Name: Bristol
+Upstream-Contact: Nick Copeland <nickycopeland at hotmail.com>
 Source: http://sourceforge.net/projects/bristol/files/
 
+Files: *
 Copyright: 1996-2010 Nick Copeland <nickycopeland at hotmail.com>
 License: GPL-3+
+
+Files: bristol/ringbuffer.c
+Copyright:
+ 2003 Rohan Drape
+ 2000 Paul Davis
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright:
+ 2009-2010 Alessio Treglia <alessio at debian.org>
+ 2003-2006 Guenter Geiger <geiger at debian.org>
+License: GPL-2+
+
+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
@@ -14,16 +29,12 @@ License: GPL-3+
  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
+Comment: 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
+ .
+ On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-3'.
 
-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
@@ -34,17 +45,13 @@ License: LGPL-2.1+
  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
+Comment: 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
+ .
+ On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-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
@@ -55,9 +62,8 @@ License: GPL-2+
  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.
+Comment: You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- 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
+ On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-2'.

-- 
bristol packaging