[SCM] bristol/master: Refresh debian/copyright.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue May 1 09:05:33 UTC 2012


The following commit has been merged in the master branch:
commit 9ae86e52636890ddf3ffe83652849c044c29474f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 1 11:05:08 2012 +0200

    Refresh debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 321f6fe..04a2ffc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 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>
+Copyright: 1996-2012 Nick Copeland <nickycopeland at hotmail.com>
 License: GPL-3+
 
 Files: bristol/ringbuffer.c
@@ -15,7 +15,7 @@ License: LGPL-2.1+
 
 Files: debian/*
 Copyright:
- 2009-2010 Alessio Treglia <alessio at debian.org>
+ 2009-2012 Alessio Treglia <alessio at debian.org>
  2003-2006 Guenter Geiger <geiger at debian.org>
 License: GPL-2+
 
@@ -29,11 +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.
-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/>.
- .
+Comment:
  On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-3'.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
@@ -45,12 +46,12 @@ 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.
-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
- .
+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'.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
@@ -62,8 +63,9 @@ 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/>.
- .
+Comment:
  On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
bristol packaging



More information about the pkg-multimedia-commits mailing list