[Pkg-gstreamer-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.10.1-2-14-gb0faf14

Sat May 5 21:12:59 UTC 2012

The following commit has been merged in the master branch:
commit 40169cbd8515e2ed90b91d1f1273397b06dd809e
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun May 6 00:10:23 2012 +0300

    Update and convert debian/copyright to machine-readable format.

diff --git a/debian/changelog b/debian/changelog
index 0b0ab72..382df42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ qt-gstreamer (0.10.2-1) unstable; urgency=low
   * Update some package descriptions.
     - Remove articles from the description synopsis to satisfy lintian.
     - Mention the new plugins in qtgstreamer-plugins' package descrption.
+  * Update and convert debian/copyright to machine-readable format.
 
  -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Sat, 05 May 2012 13:34:04 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 3254948..c15db02 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,87 +1,89 @@
-This work was packaged for Debian by:
-
-    George Kiagiadakis <kiagiadakis.george at gmail.com> on Fri, 07 Jan 2011 23:41:31 +0200
-
-It was downloaded from:
-
-    http://gstreamer.freedesktop.org/
-
-Upstream Authors:
-
-    George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
-    Mauricio Piacentini <mauricio.piacentini at collabora.co.uk>
-
-Copyright:
-
-    Copyright (C) 2009-2010 George Kiagiadakis <kiagiadakis.george at gmail.com>
-    Copyright (C) 2010 Collabora Multimedia <info at collabora.co.uk>
-    Copyright (C) 2010-2011 Collabora Ltd. <info at collabora.co.uk>
-
-License:
-
-    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 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 General Public License for more details.
-
-    On Debian systems, the full text of the GNU Lesser General Public License
-    version 2.1 can be found at /usr/share/common-licenses/LGPL-2.1
-
-Files with different copyright and/or license:
-
-  examples/player/*:
-
-    Copyright (C) 2010 Marco Ballesio <gibrovacco at gmail.com>
-    Copyright (C) 2011 Collabora Ltd. <info at collabora.co.uk>
-
-    License: GNU Lesser General Public License, version 2.1 or later (see above)
-
-  cmake/modules/*:
-
-    Copyright (C) 2006 Alexander Neundorf <neundorf at kde.org>
-    Copyright (C) 2006 Allen Winter <winter at kde.org>
-    Copyright (C) 2006 Tim Beaulen <tbscope at gmail.com>
-    Copyright (C) 2008 Helio Chissini de Castro <helio at kde.org>
-    Copyright (C) 2008 Laurent Montel <montel at kde.org>
-    Copyright (C) 2009 Sebastian Trueg <trueg at kde.org>
-    Copyright (C) 2009-2010 Tobias Rautenkranz <tobias at rautenkranz.ch>
-    Copyright (C) 2005-2009 Kitware Inc.
-    Copyright (C) 2010 George Kiagiadakis <kiagiadakis.george at gmail.com>
-    Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
-
-    License:
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The Debian packaging is:
-
-    Copyright (C) 2011 George Kiagiadakis <kiagiadakis.george at gmail.com>
-
-and is licensed under the LGPL version 2.1,
-see "/usr/share/common-licenses/LGPL-2.1".
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: QtGStreamer
+Upstream-Contact: George Kiagiadakis <kiagiadakis.george at gmail.com>
+Source: http://gstreamer.freedesktop.org/
+
+Files: *
+Copyright: 2009-2010 George Kiagiadakis <kiagiadakis.george at gmail.com>
+           2010 Collabora Multimedia <info at collabora.com>
+           2010-2012 Collabora Ltd. <info at collabora.com>
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2011-2012 George Kiagiadakis <kiagiadakis.george at gmail.com>
+License: LGPL-2.1+
+
+Files: elements/gstqtvideosink/*
+Copyright: 2010 George Kiagiadakis <kiagiadakis.george at gmail.com>
+           2010 Nokia Corporation and/or its subsidiary(-ies). <qt-info at nokia.com>
+           2010-2012 Collabora Ltd. <info at collabora.co.uk>
+License: LGPL-2.1
+
+Files: examples/player/* examples/qmlplayer/*
+Copyright: 2010 Marco Ballesio <gibrovacco at gmail.com>
+           2011-2012 Collabora Ltd. <info at collabora.co.uk>
+License: LGPL-2.1+
+
+Files: cmake/modules/*
+Copyright: 2006 Alexander Neundorf <neundorf at kde.org>
+           2006 Allen Winter <winter at kde.org>
+           2006 Tim Beaulen <tbscope at gmail.com>
+           2008 Helio Chissini de Castro <helio at kde.org>
+           2008 Laurent Montel <montel at kde.org>
+           2009 Sebastian Trueg <trueg at kde.org>
+           2009-2010 Tobias Rautenkranz <tobias at rautenkranz.ch>
+           2005-2009 Kitware Inc.
+           2010-2012 George Kiagiadakis <kiagiadakis.george at gmail.com>
+           2010 Collabora Ltd. <info at collabora.co.uk>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+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.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+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 version 2.1 as published by the Free Software Foundation.
+ .
+ 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.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.

-- 
UNNAMED PROJECT

