[SCM] kconfigwidgets packaging branch, master, updated. ae45d405fea52220e620bd6b92d88fed703c1bf6
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Feb 24 17:10:22 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kconfigwidgets.git;a=commitdiff;h=db1dcf1
The following commit has been merged in the master branch:
commit db1dcf16cf7662c2bb00a0b728e0c225d0e35cea
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Mon Jan 26 17:05:00 2015 +0100
Update copyright information.
---
debian/changelog | 2 +
debian/copyright | 213 +++++++++++++++++++++++++------------------------------
debian/watch | 4 +-
3 files changed, 102 insertions(+), 117 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 52c8ecc..d56ac2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kconfigwidgets (5.6.0-1~) UNRELEASED; urgency=medium
follow cmake.
* Bump Standards-Version to 3.9.6, no changes needed.
* Update install files.
+ * Update watch file.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Mon, 26 Jan 2015 16:22:11 +0100
diff --git a/debian/copyright b/debian/copyright
index 1119b77..5807d82 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,60 +3,26 @@ Upstream-Name: kconfigwidgets
Source: https://projects.kde.org/projects/frameworks/kconfigwidgets
Files: *
- docs/*
- docs/preparetips/*
- tests/* excluding:
- tests/kcolorschemedemo.cpp
- tests/klanguagebuttontest.cpp
-Copyright: 1999-2000 Kurt Granroth <granroth at kde.org>
- 1999, 2007 Simon Hausmann <hausmann at kde.org>
- 2001-2002 Ellis Whitehead <ellis at kde.org>
- 2007, 2009 Matthew Woehlke <mw_triad at users.sourceforge.net>
- 2003 Andras Mantia <amantia at kde.org>
- 2000 Michael Koch <koch at kde.org>
- 1999 Reginald Stadlbauer <reggie at kde.org>
- 2005-2006 Hamish Rodda <rodda at kde.org>
- 2000 Nicolas Hadacek <haadcek at kde.org>
- 2001 Holger Freyther <freyther at kde.org>
- 2003 Waldo Bastian <bastian at kde.org>
- 1999-2003 Matthias Hoelzer-Kluepfel <hoelzer at kde.org> <mhk at kde.org>
- 2013 Martin Gräßlin <mgraesslin at kde.org>
- 2000-2003 Daniel Molkentin <molkentin at kde.org>
- 2000-2003 Tobias Koenig <tokoe at kde.org>
- 2002 Joseph Wenninger <jowenn at kde.org>
- 2007, 2013 David Faure <faure at kde.org> <faure+bluesystem at kde.org>
- 2003 Jason Keirstead <jason at keirstead.org>
- 2007 David Jarvie <software at astrojar.org.uk>
- 2007 Nick Shaforostoff <shafff at ukr.net>
- 2003-2006 Michel Hermier <michel.hermier at gmail.com>
- 1999-2003 Hans Petter Bieker <bieker at kde.org>
- 2008 Urs Wolfer
- 2004 Frans Englich <frans.englich at telia.com>
- 2012 Albert Astals Cid <aacid at kde.org>
- 2004 Michael Brade <brade at kde.org>
- 2009 Dario Freddi <drf at kde.org>
- 2010 KDAB Group <info at kdab.net,>
- 2001 Michael Goffioul <kdeprint at swing.be>
- 2010 Stephen Kelly <stephen at kdab.com>
- 2001 Martijn Klingens <klingens at kde.org>
- 2010 Klarälvdalens Datakonsult AB
-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 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".
-
+Copyright: 2012, Albert Astals Cid <aacid at kde.org>
+ 2003, Benjamin C Meyer <ben+kdelibs at meyerhome.net>
+ 2009, Dario Freddi <drf at kde.org>
+ 2007, David Faure <faure at kde.org>
+ 2007, David Jarvie <software at astrojar.org.uk>
+ 2004, Frans Englich <frans.englich at telia.com>
+ 1999-2003, Hans Petter Bieker <bieker at kde.org>
+ 2003, Jason Keirstead <jason at keirstead.org>
+ 2010, Klarälvdalens Datakonsult AB
+ 2001, Martijn Klingens <klingens at kde.org>
+ 2013, Martin Gräßlin <mgraesslin at kde.org>
+ 2007, Matthew Woehlke <mw_triad at users.sourceforge.net>
+ 1999, Matthias Hoelzer-Kluepfel <hoelzer at kde.org>
+ 2004, Michael Brade <brade at kde.org>
+ 2001, Michael Goffioul <kdeprint at swing.be>
+ 2003-2006, Michel Hermier <michel.hermier at gmail.com>
+ 2007, Nick Shaforostoff <shafff at ukr.net>
+ 2007, Simon Hausmann <hausmann at kde.org>
+ 2003, Waldo Bastian <bastian at kde.org>
+License: LGPL-2+
Files: src/kpastetextaction.cpp
src/kpastetextaction.h
@@ -66,17 +32,16 @@ Files: src/kpastetextaction.cpp
src/kstandardaction.cpp
src/kstandardaction.h
src/kstandardaction_p.h
-Copyright: 1999 Reginald Stadlbauer <reggie at kde.org>
- 1999 Simon Hausmann <hausmann at kde.org>
- 2000 Nicolas Hadacek <haadcek at kde.org>
- 2000 Kurt Granroth <granroth at kde.org>
- 2000 Michael Koch <koch at kde.org>
- 2001 Holger Freyther <freyther at kde.org>
- 2002 Ellis Whitehead <ellis at kde.org>
- 2002 Joseph Wenninger <jowenn at kde.org>
- 2003 Andras Mantia <amantia at kde.org>
- 2005-2006 Hamish Rodda <rodda at kde.org>
- 1999,2000 Kurt Granroth <granroth at kde.org>
+Copyright: 2003, Andras Mantia <amantia at kde.org>
+ 2001-2002, Ellis Whitehead <ellis at kde.org>
+ 2005-2006, Hamish Rodda <rodda at kde.org>
+ 2001, Holger Freyther <freyther at kde.org>
+ 2002, Joseph Wenninger <jowenn at kde.org>
+ 1999-2000, Kurt Granroth <granroth at kde.org>
+ 2000, Michael Koch <koch at kde.org>
+ 2000, Nicolas Hadacek <haadcek at kde.org>
+ 1999, Reginald Stadlbauer <reggie at kde.org>
+ 1999, Simon Hausmann <hausmann at kde.org>
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
@@ -95,71 +60,66 @@ License: LGPL-2
On Debian systems, the complete text of the GNU Library General
Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
-
-Files: autotests/*
- tests/kcolorschemedemo.cpp
+Files: src/khelpclient.cpp
+ src/khelpclient.h
tests/klanguagebuttontest.cpp
- debian/*
-Copyright:1999-2000 Kurt Granroth <granroth at kde.org>
- 1999, 2007 Simon Hausmann <hausmann at kde.org>
- 2001-2002 Ellis Whitehead <ellis at kde.org>
- 2007, 2009 Matthew Woehlke <mw_triad at users.sourceforge.net>
- 2003 Andras Mantia <amantia at kde.org>
- 2000 Michael Koch <koch at kde.org>
- 1999 Reginald Stadlbauer <reggie at kde.org>
- 2005-2006 Hamish Rodda <rodda at kde.org>
- 2000 Nicolas Hadacek <haadcek at kde.org>
- 2001 Holger Freyther <freyther at kde.org>
- 2003 Waldo Bastian <bastian at kde.org>
- 1999-2003 Matthias Hoelzer-Kluepfel <hoelzer at kde.org> <mhk at kde.org>
- 2013 Martin Gräßlin <mgraesslin at kde.org>
- 2000-2003 Daniel Molkentin <molkentin at kde.org>
- 2000-2003 Tobias Koenig <tokoe at kde.org>
- 2002 Joseph Wenninger <jowenn at kde.org>
- 2007, 2013 David Faure <faure at kde.org> <faure+bluesystem at kde.org>
- 2003 Jason Keirstead <jason at keirstead.org>
- 2007 David Jarvie <software at astrojar.org.uk>
- 2007 Nick Shaforostoff <shafff at ukr.net>
- 2003-2006 Michel Hermier <michel.hermier at gmail.com>
- 1999-2003 Hans Petter Bieker <bieker at kde.org>
- 2008 Urs Wolfer
- 2004 Frans Englich <frans.englich at telia.com>
- 2012 Albert Astals Cid <aacid at kde.org>
- 2004 Michael Brade <brade at kde.org>
- 2009 Dario Freddi <drf at kde.org>
- 2010 KDAB Group <info at kdab.net,>
- 2001 Michael Goffioul <kdeprint at swing.be>
- 2010 Stephen Kelly <stephen at kdab.com>
- 2001 Martijn Klingens <klingens at kde.org>
- 2010 Klarälvdalens Datakonsult AB
- 2014 Scarlett Clark <scarlett at scarlettgatelyclark.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 as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ tests/krecentfilesactiontest.cpp
+ tests/krecentfilesactiontest.h
+Copyright: 2013, David Faure <faure+bluesystem at kde.org>
+ 2012, David Faure <faure at kde.org>
+ 2014, Gregor Mi <codeminister at publicstatic.de>
+License: LGPL-2+3+KDEeV
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2 of the License or ( at
+ your option ) version 3 or, at the discretion of KDE e.V. ( which shall
+ act as a proxy as in section 14 of the GPLv3 ), any later version.
.
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.
.
- You should have received a copy of the GNU Library General Public License
+ You should have received a copy of the GNU Lesser 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.
.
- On Debian systems, the complete text of the GNU Library General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in "/usr/share/common-licenses/LGPL-2",
+ likewise, the complete text of the GNU Library General Public License version
+ 3 can be found in "/usr/share/common-licenses/LGPL-3".
+
+Files: tests/kcolorutilsdemo.cpp
+ tests/kcolorutilsdemo.h
+ tests/kimageframe.cpp
+ tests/kimageframe.h
+Copyright: 2009, Matthew Woehlke <mw_triad at users.sourceforge.net>
+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 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".
Files: src/ktip.h
src/ktipdialog.cpp
src/ktipdialog.h
-Copyright: 2000-2003 Matthias Hoelzer-Kluepfel <mhk at kde.org>
- Tobias Koenig <tokoe at kde.org>
- Daniel Molkentin <molkentin at kde.org>
- 2008 Urs Wolfer <uwolfer @ kde.org>
-License: MIT
+Copyright: 2000-2003, Matthias Hoelzer-Kluepfel <mhk at kde.org>
+ 2000-2003, Tobias Koenig <tokoe at kde.org>
+ 2000-2003, Daniel Molkentin <molkentin at kde.org>
+ 2008, Urs Wolfer <uwolfer at kde.org>
+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
@@ -180,3 +140,26 @@ License: MIT
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.
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-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
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ 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.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
diff --git a/debian/watch b/debian/watch
index 8ec1b48..58aef89 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-http://download.kde.org/unstable/frameworks/([\d\.]*)/kconfigwidgets-(.*)\.tar\.xz
-http://download.kde.org/stable/frameworks/([\d\.]*)/kconfigwidgets-(.*)\.tar\.xz
+http://download.kde.org/unstable/frameworks/([\d.]+)/kconfigwidgets-([\d.]+)\.tar\.xz
+http://download.kde.org/stable/frameworks/([\d.]+)/kconfigwidgets-([\d.]+)\.tar\.xz
--
kconfigwidgets packaging
More information about the pkg-kde-commits
mailing list