[SCM] kdesrc-build packaging branch, master, updated. debian/1.14-1-3-gd8a2955

Thu Sep 22 08:56:35 UTC 2011

The following commit has been merged in the master branch:
commit 599e907c5b6354fe12a7de86a328e015b01b260b
Author: Pino Toscano <pino at debian.org>
Date:   Thu Sep 22 09:42:25 2011 +0200

    copyright: switch to DEP5, make it a bit more precise
---
 debian/changelog |    2 +
 debian/copyright |  100 +++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 79 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8cd4163..a610073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kdesrc-build (1.14.1-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Switch copyright to DEP5, and make it a bit more precise on licenses
+    (thanks also to the work done by upstream!)
 
  -- Pino Toscano <pino at debian.org>  Thu, 22 Sep 2011 09:38:11 +0200
 
diff --git a/debian/copyright b/debian/copyright
index dfb4c46..58490ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,86 @@
-It was downloaded from http://kdesrc-build.kde.org/
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: kdesrc-build
+Upstream-Contact: Michael Pyne <mpyne at kde.org>
+Source: http://kdesrc-build.kde.org
 
-Upstream authors are:
+Files: *
+Copyright: 2003-2011, Michael Pyne <mpyne at kde.org>
+           2005, 2006, 2008 - 2011, David Faure <faure at kde.org>
+           2005, Thiago Macieira <thiago at kde.org>
+           2006, Stephan Kulow <coolo at kde.org>
+           2006, 2008, Dirk Mueller <mueller at kde.org>
+License: GPL-2+
 
-    Michael Pyne <mpyne at kde.org>
+Files: kdesrc-buildrc.xml
+Copyright: 2005, 2009-2010, Michael Pyne <mpyne at kde.org>
+License: LGPL-3+
 
-Contributors include:
-    David Faure <dfaure at kde.org>
-    Thiago Macieira <thiago at kde.org>
-    Dirk Mueller <dirk at kde.org>
-    Stephen Kulow <coolo at kde.org>
-    Raphael Kubo da Costa <rakuco at FreeBSD.org>
-    Laurent Montel <montel at kde.org>
-    Pino Toscano <pino at kde.org>
-    Carlos Leonhard Woelz <carlos.woelz at kdemail.net>
+Files: doc/build-docs
+Copyright: 2011, Michael Pyne <mpyne at kde.org>
+License: BSD-2-clause
 
-Copyright:
+Files: doc/*.docbook
+Copyright: 2005-2008, 2010-2011, Michael Pyne <mpyne at kde.org>
+           2005, Carlos Leonhard Woelz <carloswoelz at imap-mail.com>
+           2009, Burkhard Lück <lueck at hube-lueck.de>
+           2007, 2011, Federico Zenith <federico.zenith at members.fsf.org>
+           2009-2011, Yuri Chornoivan <yurchor at ukr.net>
+License: GFDL-NIV-1.2+
 
-    Copyright © 2003-2011 Michael Pyne <mpyne at kde.org>
+Files: debian/*
+Copyright: 2011, Pino Toscano <pino at debian.org>
+License: GPL-2+
 
-License:
+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:
+ .
+ 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.
+ .
+ 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
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    | You may use, alter, and redistribute this software under the terms
-    | of the GNU General Public License, v2 (or any later version).
+License: GFDL-NIV-1.2+
+ Permission is granted to copy, distribute and/or modify this document under
+ the terms of the GNU Free Documentation License, Version 1.2 or any later
+ version published by the Free Software Foundation; with no Invariant
+ Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the complete text of the GNU Free Documentation License
+ version 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'.
 
-    You can find the complete text of the license GPL at
-    `/usr/share/common-licenses/GPL-2' and `/usr/share/common-licenses/GPL-3'
+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 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 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'.
 
-
-The Debian packaging is:
-    Copyright 2011, Pino Toscano <pino at debian.org>
-And it is licensed under the GPL v2+ license, see above.
+License: LGPL-3+
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 3 can be found in `/usr/share/common-licenses/LGPL-3'.

-- 
kdesrc-build packaging

