Bug#465251: diff for 0.8.1-1.1 NMU

[Pierre Habouzit]

Hi,

Attached is the diff for my libmatroska 0.8.1-1.1 NMU
(uploaded in DELAYED/2).
-------------- next part --------------
diff -u libmatroska-0.8.1/debian/copyright libmatroska-0.8.1/debian/copyright
--- libmatroska-0.8.1/debian/copyright
+++ libmatroska-0.8.1/debian/copyright
@@ -6,21 +6,52 @@
-Upstream Author: Steve Lhomme <steve.lhomme at free.fr>
+Files: debian/*
+Copyright:
+ ? 2003 Moritz Bunkus <moritz at bunkus.org>
+
+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
+ 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.
+ .
+ This file may be distributed and/or modified under the terms of the
+ GNU General Public License version 2 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file.
+ .
+ Licensees holding an other license may use this file in accordance with 
+ the Agreement provided with the Software.
+ .
+ This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ .
+ See http://www.matroska.org/license/qpl/ for QPL licensing information.
+ See http://www.matroska.org/license/gpl/ for GPL licensing information.
+ .
+ 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.
+ .
+ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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.
 
-Copyright (C) 2002-2005 Steve Lhomme.  All rights reserved.
-
-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.
-
-This proram is also licensed under the GPL. See
-/usr/share/common-licenses/GPL for details.
-
-Licensees holding an other license may use this file in accordance with 
-the Agreement provided with the Software.
-
-This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-See http://www.matroska.org/license/qpl/ for QPL licensing information.
-
-Contact license at matroska.org if any conditions of this licensing are
-not clear to you.
diff -u libmatroska-0.8.1/debian/changelog libmatroska-0.8.1/debian/changelog
--- libmatroska-0.8.1/debian/changelog
+++ libmatroska-0.8.1/debian/changelog
@@ -1,3 +1,12 @@
+libmatroska (0.8.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/copyright: update with proper up to date informations
+    (Closes: 465251).
+  * debian/control: bump Standards-Version to 3.7.3.
+
+ -- Pierre Habouzit <madcoder at debian.org>  Sun, 16 Mar 2008 14:07:52 +0100
+
 libmatroska (0.8.1-1) unstable; urgency=low
 
   * New upstream release.
diff -u libmatroska-0.8.1/debian/control libmatroska-0.8.1/debian/control
--- libmatroska-0.8.1/debian/control
+++ libmatroska-0.8.1/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Build-Depends: debhelper (>= 5.0), quilt, libebml-dev (>= 0.7.7-3)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/libmatroska
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmatroska/
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20080316/0cc5c83a/attachment.pgp