[SCM] smokegen packaging branch, master, updated. fd6d357e54bcbf5e7b251c3bdf4f1819d21315d5
Pino Toscano
pino-guest at alioth.debian.org
Wed Jun 29 22:16:49 UTC 2011
The following commit has been merged in the master branch:
commit fd6d357e54bcbf5e7b251c3bdf4f1819d21315d5
Author: Pino Toscano <pino at kde.org>
Date: Thu Jun 30 00:15:28 2011 +0200
update copyright
- put the right form for Format
- move all the License blocks at the end (avoid repeating eg GPL-2+ blocks)
- split the two cases of BSD licenses (3 and 2 clauses)
---
debian/copyright | 119 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 42 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index e606bb6..4bef3d7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
Upstream-Name: smokegen
Source: http://projects.kde.org/projects/kde/kdebindings/smoke/smokegen
@@ -9,6 +9,41 @@ Copyright: 2008-2010 Arno Rehn <arno at arnorehn.de>
2002-2005 Roberto Raggi <roberto at kdevelop.org>
2010 Maciej Mrozowski <reavertm at gmail.com>
License: GPL-2+
+
+Files: parser/*
+Copyright: 2002-2005 Roberto Raggi <roberto at kdevelop.org>
+ 2006-2009 David Nolden <david.nolden.kdevelop at art-master.de>
+ 2006-2008 Hamish Rodda <rodda at kde.org>
+ 2009 Arno Rehn <arno at arnorehn.de>
+ 2009 Ramón Zarazúa <killerfox512+kde at gmail.com>
+ 2005 Harald Fernengel <harry at kdevelop.org>
+ 1992-2008 Trolltech ASA
+License: LGPL-2
+
+Files: cmake/*
+Copyright: 2007 Pau Garcia i Quiles, <pgquiles at elpauer.org>
+ 2008 Matthias Kretz <kretz at kde.org>
+ 2006,2008,2009 Alexander Neundorf, <neundorf at kde.org>
+ 2007 Christian Ehrlicher, <ch.ehrlicher at gmx.de>
+ 2006,2007 Allen Winter, <winter at kde.org>
+ 2009 Sebastian Trueg, <trueg at kde.org>
+ 2010 Arno Rehn <arno at arnorehn.de>
+ 2007 Thomas Moenicke thomas.moenicke at kdemail.net
+ 2006 Montel Laurent, <montel at kde.org>
+License: BSD-3-clause
+
+Files: smoke.h
+Copyright: 2002 Ashley Winters <qaqortog at nwlink.com>
+ 2007 Arno Rehn <arno at arnorehn.de>
+License: BSD-2-clause
+
+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: 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
@@ -26,14 +61,6 @@ License: 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".
-Files: parser/*
-Copyright: 2002-2005 Roberto Raggi <roberto at kdevelop.org>
- 2006-2009 David Nolden <david.nolden.kdevelop at art-master.de>
- 2006-2008 Hamish Rodda <rodda at kde.org>
- 2009 Arno Rehn <arno at arnorehn.de>
- 2009 Ramón Zarazúa <killerfox512+kde at gmail.com>
- 2005 Harald Fernengel <harry at kdevelop.org>
- 1992-2008 Trolltech ASA
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
@@ -52,41 +79,49 @@ License: LGPL-2
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
-Files: cmake/* smoke.h
-Copyright: 2007 Pau Garcia i Quiles, <pgquiles at elpauer.org>
- 2008 Matthias Kretz <kretz at kde.org>
- 2006,2008,2009 Alexander Neundorf, <neundorf at kde.org>
- 2007 Christian Ehrlicher, <ch.ehrlicher at gmx.de>
- 2006,2007 Allen Winter, <winter at kde.org>
- 2009 Sebastian Trueg, <trueg at kde.org>
- 2007,2010 Arno Rehn <arno at arnorehn.de>
- 2007 Thomas Moenicke thomas.moenicke at kdemail.net
- 2006 Montel Laurent, <montel at kde.org>
- 2002 Ashley Winters <qaqortog at nwlink.com>
-License: BSD
- Redistribution and use is allowed according to the terms of the BSD license.
- For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
.
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/BSD".
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ 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.
-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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or withou
+ modification, are permitted provided that the following conditions
+ are met:
.
- 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.
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ 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/GPL-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
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
smokegen packaging
More information about the pkg-kde-commits
mailing list