[SCM] libebml/master: debian/copyright: DEP-5 compliance added

Wed Jan 7 09:19:14 UTC 2015

The following commit has been merged in the master branch:
commit cef57d542e993ec6134df05b7a760dc1000a0ba4
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Wed Jan 7 09:04:16 2015 +0100

    debian/copyright: DEP-5 compliance added

diff --git a/debian/copyright b/debian/copyright
index 6d5e40d..544ac19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,67 +1,42 @@
-This package was debianized by Moritz Bunkus <moritz at bunkus.org> on
-Mon, 21 Apr 2003 12:49:33 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libebml
+Upstream-Author: Steve Lhomme <steve.lhomme at free.fr>
+Source: http://dl.matroska.org/downloads/libebml/
 
-It was downloaded from http://dl.matroska.org/downloads/libebml/
-
-Upstream Author: Steve Lhomme <steve.lhomme at free.fr>
-
-Files: debian/*
-Copyright:
- © 2003 Moritz Bunkus <moritz at bunkus.org>
- © 2010 Fabian Greffrath <fabian+debian at greffrath.com>
-License: GPL-2+
- The Debian packaging licensed under the GPL version 2, or
- (at your option) any later version, see below.
+Files: *
+Copyright: 2002-2005 Steve Lhomme <steve.lhomme at free.fr>
+License: LGPL-2.1
 
 Files: src/IOCallback.cpp src/StdIOCallback.cpp
-Copyright:
- (C) 2002-2004 Ingo Ralf Blum.  All rights reserved.
+Copyright: 2002-2004 Ingo Ralf Blum
 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 Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
- .
- Contact license at matroska.org if any conditions of this licensing are
- not clear to you.
 
 Files: src/MemIOCallback.cpp
-Copyright:
- (C) 2003 Jory Stone.  All rights reserved.
+Copyright: 2003 Jory Stone
 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.
+
+Files: debian/*
+Copyright: 2003 Moritz Bunkus <moritz at bunkus.org>
+           2010 Fabian Greffrath <fabian+debian at greffrath.com>
+           2011-2014 Matteo F. Vescovi <mfv at debian.org>
+License: GPL-2+
+ 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 2
+ of the License, or (at your option) any later version.
  .
- This library is distributed in the hope that it will be useful,
+ 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
- Lesser General Public License for more details.
+ 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 Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  .
- See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
- .
- Contact license at matroska.org if any conditions of this licensing are
- not clear to you.
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files: *
-Copyright:
- (C) 2002-2005 Steve Lhomme.  All rights reserved.
 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
@@ -75,14 +50,18 @@ License: LGPL-2.1
  .
  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 Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ USA
  .
- See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+ Permission is hereby granted to use or copy this program under the
+ terms of the GNU LGPL, provided that the Copyright, this License,
+ and the Availability of the original version is retained on all copies.
+ User documentation of any code that uses this code or any modified
+ version of this code must cite the Copyright, this License, the
+ Availability note, and "Used by permission." Permission to modify
+ the code and to distribute modified code is granted, provided the
+ Copyright, this License, and the Availability note are retained,
+ and a notice that the code was modified is included.
  .
- Contact license at matroska.org if any conditions of this licensing are
- not clear to you.
-
-
-On Debian systems, the full text of the LGPL v2.1 can be found in
-/usr/share/common-licenses/LGPL-2.1, and of the GPL v2 in
-/usr/share/common-licenses/GPL-2.
+ On Debian systems the full text of the GNU Lesser General Public License
+ can be found in the `/usr/share/common-licenses/LGPL-2' file.

-- 
libebml packaging

