[SCM] earcandy/master: Update copyright information. Fix all license-related issues.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Oct 25 17:24:21 UTC 2010


The following commit has been merged in the master branch:
commit 2c3f93bd587bbd42c5beedfbf02ad4d8fd95edc3
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Oct 25 19:24:01 2010 +0200

    Update copyright information. Fix all license-related issues.

diff --git a/debian/copyright b/debian/copyright
index a06238f..e29c784 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,74 +1,105 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
 Name: earcandy
 Maintainer: Jason Taylor <killerkiwi2005 at gmail.com>
-Source: https://edge.launchpad.net/earcandy/+download
+Source: https://code.launchpad.net/~killerkiwi2005/earcandy/0.9
 
-Files: *
-Copyright: 2008, Jason Taylor
-License: GPL-2+
+Copyright: 2008-2010, Jason Taylor <killerkiwi2005 at gmail.com>
+License: GPL-3
+
+Files: ./setup.py
+Copyright: 2010 KillerKiwi <killerkiwi2005 at gmail.com>
+License: GPL-3
 
-Files: setup.py
-Copyright: 2009, David D Lowe
-License: PD
+Files: ./earcandy/pulseaudio/lib_pulseaudio.py,
+ ./earcandy/pulseaudio/PulseAudioConnection.py,
+ ./earcandy/ui/EarCandyPrefs.py,
+ ./earcandy/ui/TrayIcon.py,
+ ./earcandy/ui/glade_window.py,
+ ./earcandy/ui/EarCandyAppSelect.py,
+ ./earcandy/ui/EarCandyClientProperties.py,
+ ./earcandy/ui/VolumeSlider.py,
+ ./earcandy/PulseAudio.py,
+ ./earcandy/Sink.py,
+ ./earcandy/plugins/rhythmbox/plugin.py,
+ ./earcandy/plugins/banshee/plugin.py,
+ ./earcandy/util/DesktopFiles.py,
+ ./earcandy/util/Threads.py,
+ ./earcandy/SinkInput.py,
+ ./earcandy/Client.py,
+ ./earcandy/EarCandyDBus.py
+Copyright: 2008 Jason Taylor
+License: GPL-2+
 
-Files: runner/ear_candy
+Files: ./runner/ear_candy
 Copyright: 2008, Jason Taylor, Michael Budde
 License: GPL-2+
 
-Files: earcandy/pulseaudio/lib.py
+Files: ./earcandy/pulseaudio/lib.py
 Copyright: 2006-2008, Alex Holkner
 License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of pyglet nor the names of its
+     contributors may be used to endorse or promote products
+     derived from this software without specific prior written
+     permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "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
+ COPYRIGHT OWNER OR CONTRIBUTORS 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.
 
-Files: debian/*
-Copyright: 2010, Fladischer Michael
-           2009, Andrea Colangelo
+Files: ./debian/*
+Copyright:
+ 2010, Alessio Treglia <alessio at debian.org>
+ 2010, Fladischer Michael
+ 2009, Andrea Colangelo
 License: GPL-2+
 
-License: PD
-    This file is in the public domain.
+License: GPL-3
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+X-Comment: On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 License: GPL-2+
-    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 version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: BSD
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    .
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright 
-        notice, this list of conditions and the following disclaimer in
-        the documentation and/or other materials provided with the
-        distribution.
-      * Neither the name of pyglet nor the names of its
-        contributors may be used to endorse or promote products
-        derived from this software without specific prior written
-        permission.
-    .
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "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
-    COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 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
+X-Comment: On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in `/usr/share/common-licenses/GPL-2'.

-- 
earcandy packaging



More information about the pkg-multimedia-commits mailing list