[SCM] korundum packaging branch, master, updated. 1f7777c480070ad6dc4f61cb905372ccd22e6bbb

Pino Toscano pino at alioth.debian.org
Mon Sep 26 15:51:58 UTC 2011 

The following commit has been merged in the master branch:
commit a9f6ecd3640cdcf31b69568340d7d36c55a94f5c
Author: Pino Toscano <pino at debian.org>
Date:   Mon Sep 26 17:49:03 2011 +0200

    massively update copyright
    
    - make it more precise as possible
    - reformat the copyright fields
    - put the GPL-2+ and LGPL-2+ in own blocks, as they are used in more than one stanza
---
 debian/changelog |    1 +
 debian/copyright |  170 ++++++++++++++++++++++++++++++++----------------------
 2 files changed, 103 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8401ac..546663c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ korundum (4:4.7.1-0r1) UNRELEASED; urgency=low
   * Update rules:
     - do not compress .rb, .ui, and .rc files (found in the examples)
   * Install the examples for ruby-akonadi, ruby-plasma, and ruby-soprano.
+  * Update copyright.
 
   [ Modestas Vainius ]
   * Remove myself from Uploaders.
diff --git a/debian/copyright b/debian/copyright
index 3dbd949..f961741 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,54 +3,87 @@ Upstream-Name: korundum
 Source: http://projects.kde.org/projects/kde/kdebindings/ruby/korundum
 
 Files: *
-Copyright: 2003-2011 Richard Dale <richard.j.dale at gmail.com>
-           2004 Alexander Kellett
-           2005-2007 by Siraj Razick <siraj at kdemail.net>
-           2007 Riccardo Iaconelli <ruphy at fsfe.org>
-           2007 Matthias Kretz <kretz at kde.org>
-           
+Copyright: 2003-2011, Richard Dale <richard.j.dale at gmail.com>
+           2004, Alexander Kellett <lypanov at kde.org>
+           2005-2007, Siraj Razick <siraj at kdemail.net>
+           2006, Tobias Koenig <tokoe at kde.org>
+           2007-2008, Riccardo Iaconelli <ruphy at fsfe.org>
+           2007, Matthias Kretz <kretz at kde.org>
+           2007, Bruno Virlet <bruno.virlet at gmail.com>
+           2007-2008, Sebastian Kuegler <sebas at kde.org>
+           2008, 2010, Jonathan Schmidt-Dominé <devel at the-user.org>
+           2008, Arno Rehn <arno at arnorehn.de>
 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.
+
+Files: examples/*.rb
+Copyright: 2002-2003, Jim Bublitz <jbublitz at nwinternet.com>
+License:
+ 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:
  .
- 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.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
  .
- 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 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
+ COPYRIGHT HOLDER 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.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
+ Except as contained in this notice, the name of the copyright holder shall
+ not be used in advertising or otherwise to promote the sale, use or other
+ dealings in this Software without prior written authorization from the
+ copyright holder.
 
-Files: modules/soprano/activerdf-soprano/*
-Copyright: Richard Dale <richard.j.dale at gmail.com>
+Files: modules/akonadi/examples/akonamail/mainwidget.rb
+Copyright: 2007, Bruno Virlet <bruno.virlet at gmail.com>
 License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License version 2 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
- Library General Public License for more details.
+
+Files: modules/plasma/tools/plasmoidviewer/fullview.rb
+Copyright: 2007, Frerich Raabe <raabe at kde.org>
+           2007, Aaron Seigo <aseigo at kde.org
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
  .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. 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.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ 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
 
+Files: modules/soprano/activerdf-soprano/*
+Copyright: Richard Dale <richard.j.dale at gmail.com>
+           2005-2006, Eyal Oren
+License: LGPL-2.1+
+ On Debian systems, the complete text of the GNU Library General Public License
+ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: modules/soprano/examples/soprano_util/soprano_util.rb
+Copyright: 2009, Olivier Berger + Institut Télécom
+           2009, Richard Dale
+License: BSD
 
 Files: templates/*
-Copyright: 2003 Jim Bublitz
-License: 
+Copyright: 2003, Jim Bublitz
+License:
  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
@@ -74,13 +107,34 @@ License:
  dealings in this Software without prior written authorization from the
  copyright holder.
 
-
 Files: tools/rbkconfig_compiler/*
-Copyright: 2003 Cornelius Schumacher <schumacher at kde.org>
-           2003 Zack Rusin <zack at kde.org>
-           2003 Waldo Bastian <bastian at kde.org>
-           2006 Michaël Larouche <michael.larouche at kdemail.net>
-           2008 Richard Dale <richard.j.dale at gmail.com>
+Copyright: 2003, Cornelius Schumacher <schumacher at kde.org>
+           2003, Zack Rusin <zack at kde.org>
+           2003, Waldo Bastian <bastian at kde.org>
+           2006, Michaël Larouche <michael.larouche at kdemail.net>
+           2008, Richard Dale <richard.j.dale at gmail.com>
+License: LGPL-2+
+
+Files: tools/rbkconfig_compiler/kcfg.xsd
+Copyright: 2003, Cornelius Schumacher <schumacher at kde.org>
+           2003, Waldo Bastian <bastian at kde.org>
+           2003, Zack Rusin <zack at kde.org>
+           2004, Frans Englich <frans.englich at telia.com>
+           2006, Michaël Larouche <michael.larouche at kdemail.net>
+License:
+ Permission to use, copy, modify and distribute this DTD
+ and its accompanying documentation for any purpose and without fee
+ is hereby granted in perpetuity, provided that the above copyright
+ notice and this paragraph appear in all copies.  The copyright
+ holders make no representation about the suitability of the DTD for
+ any purpose. It is provided "as is" without expressed or implied
+ warranty.
+
+Files: debian/*
+Copyright: 2008-2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+           2011, David Palacio <dpalacio at orbitalibre.org>
+License: GPL-2+
+
 License: LGPL-2+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -96,29 +150,10 @@ License: LGPL-2+
  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 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ On Debian systems, the complete texts of the GNU General Public Licenses
+ version 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
+ `/usr/share/common-licenses/GPL-3'.
 
-
-Files: tools/rbkconfig_compiler/kcfg.xsd
-Copyright: 2003 Cornelius Schumacher <schumacher at kde.org>
-           2003 Waldo Bastian <bastian at kde.org>
-           2003 Zack Rusin <zack at kde.org>
-           2004 Frans Englich <frans.englich at telia.com>
-           2006 Michaël Larouche <michael.larouche at kdemail.net>
-License:
- Permission to use, copy, modify and distribute this DTD
- and its accompanying documentation for any purpose and without fee
- is hereby granted in perpetuity, provided that the above copyright
- notice and this paragraph appear in all copies.  The copyright
- holders make no representation about the suitability of the DTD for
- any purpose. It is provided "as is" without expressed or implied
- warranty.
-
-
-Files: debian/*
-Copyright: 2008-2011 Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-           2011 David Palacio <dpalacio at orbitalibre.org>
 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
@@ -133,6 +168,5 @@ License: GPL-2+
  You should have received a copy of the GNU 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 version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.

-- 
korundum packaging

More information about the pkg-kde-commits mailing list