[Python-apps-commits] r4113 - in packages/jokosher/trunk/debian (changelog copyright)

[dktrkranz at users.alioth.debian.org]

    Date: Wednesday, November 11, 2009 @ 23:18:07
  Author: dktrkranz
Revision: 4113

Adjust copyright informations

Modified:
  packages/jokosher/trunk/debian/changelog
  packages/jokosher/trunk/debian/copyright

Modified: packages/jokosher/trunk/debian/changelog
===================================================================
--- packages/jokosher/trunk/debian/changelog	2009-11-11 23:00:49 UTC (rev 4112)
+++ packages/jokosher/trunk/debian/changelog	2009-11-11 23:18:07 UTC (rev 4113)
@@ -2,9 +2,12 @@
 
   * Update my e-mail address.
   * Switch to quilt as patch system.
+  * Jokosher is licensed under GPLv2, so adjust copyright informations as
+    well, also mention copyright informations for singledecodebin.py.
+    Thanks to Pietro Battiston for the analysis (Closes: #555713).
   * Bump Standards-Version to 3.8.3, no changes needed.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Wed, 11 Nov 2009 23:59:48 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 12 Nov 2009 00:15:11 +0100
 
 jokosher (0.11.3-1) unstable; urgency=low
 

Modified: packages/jokosher/trunk/debian/copyright
===================================================================
--- packages/jokosher/trunk/debian/copyright	2009-11-11 23:00:49 UTC (rev 4112)
+++ packages/jokosher/trunk/debian/copyright	2009-11-11 23:18:07 UTC (rev 4113)
@@ -35,6 +35,7 @@
     Dan Nawara <dan at itsawisechild.com>
     Andreas Nilsson <nisses.mail at home.se>
     Gregory Sheeran <greg at grogoreo.co.uk>
+
     
 
 Copyright 2006-2009
@@ -54,23 +55,19 @@
 
 License:
 
-   This package 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 package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as
+    published by the Free Software Foundation.
 
-   This package 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.
+    This package 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 package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
 LICENCE EXCEPTION:
 
 The Jokosher project hereby grants permission for non-GPL compatible
@@ -83,8 +80,33 @@
 
 
 
+Jokosher/elements/singledecodebin.py:
+
+    Copyright 2005, Edward Hervey <bilboed at bilboed.com>
+
+    This package 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 package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+
+
 The Debian packaging is © 2006-2009, Florian Ragwitz <rafl at debian.org>,
 © 2009 Luca Falavigna <dktrkranz at debian.org> and is licensed under the GPL, see above.
 
 This package is based upon the Ubuntu packages from Daniel Holbach
-<daniel.holbach at ubuntu.com>, which is licensed under the GPL as well.
+<daniel.holbach at ubuntu.com>, which is licensed under the GPL-2 as well.