[SCM] flumotion/master: updated copyright to DEP-5

Tue Mar 6 10:03:46 UTC 2012

The following commit has been merged in the master branch:
commit 4c9b2bdb9916f4ebe502bd91cea7634bceae950a
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Mar 6 10:48:46 2012 +0100

    updated copyright to DEP-5

diff --git a/debian/copyright b/debian/copyright
index 09452c5..f621924 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,135 @@
-This package was debianized by Jeff Waugh <jdub at perkypants.org> on
-Sat, 27 Nov 2004 13:44:09 +1100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Flumotion
+Upstream-Contact: IOhannes m zmölnig <zmoelnig at iem.at>
+Source: http://flumotion.net/
+License: LGPL-2.1
 
-It was downloaded from <http://www.flumotion.net/src/>.
+Files: *
+Copyright: 2004-2009, Fluendo, S.L
+ 2010-2011, Flumotion Services, S.A
+License: LGPL-2.1
 
-Upstream Authors:
-        Johan Dahlin <johan at gnome dot org>
-        Thomas Vander Stichele <thomas at fluendo dot com>
-        Zaheer Abbas Merali <zaheermerali at gmail dot com>
+Files: flumotion/component/producers/playlist/singledecodebin.py
+ flumotion/component/producers/playlist/smartscale.py
+Copyright: 2005-2007, Edward Hervey <bilboed at bilboed.com>
+ 2004-2009, Fluendo, S.L
+ 2010-2011, Flumotion Services, S.A
+License: LGPL-2.1
 
-Copyright Holder:
-        Copyright (C) 2004 Fluendo
+Files: flumotion/common/manhole.py
+Copyright: 2001-2007, Paul Swartz, Jp Calderone and others
+ 2004-2009, Fluendo, S.L
+ 2010-2011, Flumotion Services, S.A
+License: LGPL-2.1 and Expat
 
-License:
+Files: flumotion/extern/code.py
+Copyright: 2001, Brian McErlean
+ 2003, John Finlay
+ 2004, Guilherme Salgado
+ 2005, Andy Wingo
+License: PSF-2
 
- (Flumotion is dual-licensed by its copyright holder but only the GPL license
- is relevant for Debian.)
+Files: flumotion/extern/log/termcolor.py
+Copyright: 2006, Edward Loper
+License: PSF-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.
+Files: common/pep8.py
+Copyright: 2006, Johann C. Rocholl <johann at browsershots.org>
+License: Expat
 
-   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.
+Files: debian/*
+Copyright: 2006-2009, Loic Minier <lool at dooz.org>
+ 2009, Marc-André Lureau <mlureau at flumotion.com>
+ 2012, IOhannes m zmölnig <zmoelnig at iem.at>
+License: GPL-2+
 
-   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
+License: LGPL-2.1
+ This file may be distributed and/or modified under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software Foundation.
+ This file is distributed without any warranty; without even the implied warranty
+ of merchantability or fitness for a particular purpose.  See "LICENSE.LGPL" in
+ the source distribution for more information.
+Comment:
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ (LGPL) version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
+ .
+ You should have received a copy of the GNU Lesser General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ the Software, and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+License: PSF-2
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
+ and the Individual or Organization ("Licensee") accessing and otherwise using
+ this software ("Python") in source or binary form and its associated
+ documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF hereby
+ grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+ analyze, test, perform and/or display publicly, prepare derivative works,
+ distribute, and otherwise use Python alone or in any derivative version,
+ provided, however, that PSF's License Agreement and PSF's notice of copyright,
+ i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Python Software Foundation; All Rights Reserved" are retained in Python alone or
+ in any derivative version prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on or
+ incorporates Python or any part thereof, and wants to make the derivative work
+ available to others as provided herein, then Licensee hereby agrees to include
+ in any such work a brief summary of the changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS" basis.  PSF MAKES
+ NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF EXAMPLE, BUT
+ NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON
+ WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
+ INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING,
+ DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF
+ ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material breach
+ of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any relationship
+ of agency, partnership, or joint venture between PSF and Licensee.  This License
+ Agreement does not grant permission to use PSF trademarks or trade name in a
+ trademark sense to endorse or promote products or services of Licensee, or any
+ third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee agrees to be
+ bound by the terms and conditions of this License Agreement.
+
+License: GPL-2+
+ 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, 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.
+Comment:
+ On Debian systems, the complete text of the GNU General Public License (GPL)
+ version 2 can be found in "/usr/share/common-licenses/GPL".
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
flumotion packaging

