[SCM] bangarang/master: Updated copyright file

[ryanakca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8cb1ecd96beccb9f46d2e65d104dbdd5174c6558
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Tue Feb 1 14:11:54 2011 -0500

    Updated copyright file

diff --git a/debian/copyright b/debian/copyright
index 1e14b12..f0450e8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,17 +9,34 @@ It was downloaded from:
 Upstream Authors:
 
     Andrew Lake <jamboarder at yahoo.com>
-    Ryan Kavanagh <ryanakca at kubuntu.org>
     Andreas Marschke <xxtjaxx at gmail.com>
-    Kristof Bal <kristof.bal at gmail.com>
-
+    Stefan Burnicki <stefan.burnicki at gmx.de>
+    Ni Hui <schuizhuyanluo at 126.com>
+    Florian Weik <f.weik at web.de>
+    Philipp Schuler
 
 Copyright:
 
-    Copyright (C) 2009–2010 Andrew Lake <jamboarder at yahoo.com>
-    Copyright (C) 2009–2010 Ryan Kavanagh <ryanakca at kubuntu.org>
-    Copyright (C) 2009 bangarang-project
-    Copyright (C) 2009–2010 Kristof Bal <kristof.bal at gmail.com>
+    Copyright (C) 2009–2011 Andrew Lake <jamboarder at yahoo.com>
+    Copyright (C) 2009–2011 Ryan Kavanagh <ryanakca at kubuntu.org>
+    Copyright (C) 2009–2011 bangarang-project
+    Copyright (C) 2009–2011 Kristof Bal <kristof.bal at gmail.com>
+    Copyright (C) 2010–2011 Stefan Burnicki <stefan.burnicki at gmx.de>
+    Copyright (C) 2010–2011 Yuri Chornoivan <yurchor at ukr.net>
+    Copyright (C) 2011      Ernesto Manríquez Mendoza <alejandronova at gmail.com>
+    Copyright (C) 2011      Vytautas Mickus vmickus at gmail.com>
+    Copyright (C) 2010      Florian Weik <f.weik at web.de>
+    Copyright (C) 2010      Jean Pierre Mazuelos Saavedra  <apuyaya at gmail.com>
+    Copyright (C) 2010      Jérôme Artu <solojay6 at gmail.com>
+    Copyright (C) 2010      Martin Schlander <mschlander at opensuse.org>
+    Copyright (C) 2010      Moritz N. <ferahgo.de at gmail.com>
+    Copyright (C) 2010      Márcio Moraes <marciopanto at gmail.com>
+    Copyright (C) 2010      Ni Hui <shuizhuyuanluo at 126.com>
+    Copyright (C) 2010      Oskar Hollmann <oskarhollmann at gmail.com>
+    Copyright (C) 2010      Panagiotis Papadopoulos <pano_90 at gmx.net>
+    Copyright (C) 2010      Łukasz Jernaś <deejay1 at srem.org>
+    Copyright (C) 2009      Andreas Marschke <xxtjaxx at gmail.com>
+    Copyright (C) 2009      Philipp Schuler
 
 License:
 
@@ -36,12 +53,30 @@ License:
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+The following files have different licenses:
+
+ * reference/imdbqueryengine.cpp, reference/imdbqueryengine.h
+
+    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 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.
+
+    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 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 The Debian packaging is:
 
-    Copyright (C) 2009 Ryan Kavanagh <ryanakca at kubuntu.org>
+    Copyright (C) 2009, 2011 Ryan Kavanagh <ryanakca at kubuntu.org>
 
 and is licensed under the GPL version 3, or (at your option) any later version,
 see above.

-- 
bangarang packaging