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

mfv at users.alioth.debian.org mfv at users.alioth.debian.org
Thu Jan 8 07:38:23 UTC 2015


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

    debian/copyright: DEP-5 compliance added

diff --git a/debian/copyright b/debian/copyright
index 23754af..26bbf89 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,44 @@
-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: libmatroska
+Upstream-Author: Steve Lhomme <steve.lhomme at free.fr>
+Source: http://dl.matroska.org/downloads/libmatroska/
 
-It was downloaded from http://dl.matroska.org/downloads/libmatroska/
-
-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
+ 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
+ .
+ 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.
+ .
+ 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.
 
-Files: test/ebml/*.cpp test/tags/test9.cpp test/utf8/test5.cpp
-Copyright:
-  (C) 2002-2004 Steve Lhomme.  All rights reserved.
-License: QPL | GPL-2
+Files: test/ebml/*.cpp
+ test/tags/test9.cpp
+ test/utf8/test5.cpp
+Copyright: 2002-2004 Steve Lhomme <steve.lhomme at free.fr>
+License: QPL or GPL-2
  This file may be distributed under the terms of the Q Public License
  as defined by Trolltech AS of Norway and appearing in the file
  LICENSE.QPL included in the packaging of this file.
@@ -36,24 +60,24 @@ License: QPL | GPL-2
  Contact license at matroska.org if any conditions of this licensing are
  not clear to you.
 
-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
- 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
-
-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.
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
libmatroska packaging



More information about the pkg-multimedia-commits mailing list