[SCM] kconfig packaging branch, master, updated. debian/5.9.0-1-14-g86bf048

Maximiliano Curia maxy at moszumanska.debian.org
Fri Jun 26 19:52:50 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kconfig.git;a=commitdiff;h=a0769ff

The following commit has been merged in the master branch:
commit a0769ff67399ebd34270f5a32ebe42b49f01723e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jun 26 17:24:31 2015 +0200

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 313 +++++++++++++++++++++++++++++++------------------------
 2 files changed, 178 insertions(+), 136 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94e24ec..6c952a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kconfig (5.11.0-1~) UNRELEASED; urgency=medium
   * New upstream release (5.11.0).
   * Revert the -dev package to MA same.
   * Update symbols files.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 25 Jun 2015 15:35:55 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 67c9867..7fb9fc4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,10 @@ Upstream-Name: kconfig
 Source: https://projects.kde.org/projects/frameworks/kconfig
 
 Files: *
-       debian/*
 Copyright: 2007-2008, Aaron Seigo <aseigo at kde.org>
            2008, Allen Winter <winter at kde.org>
            2010, Canonical Ltd
-           2001-2003, Cornelius Schumacher <schumacher at kde.org>
+           2000-2003, Cornelius Schumacher <schumacher at kde.org>
            2005-2012, David Faure <faure at kde.org>
            2005, Duncan Mac-Vicar <duncan at kde.org>
            2008, Jakub Stachowski <qbast at go2.pl>
@@ -15,7 +14,7 @@ Copyright: 2007-2008, Aaron Seigo <aseigo at kde.org>
            2010, Martin Blumenstingl <darklight.xdarklight at googlemail.com>
            1996-2000, Matthias Kalle Dalheimer <kalle at kde.org>
            2006, Michaël Larouche <michael.larouche at kdemail.net>
-           2006, Olivier Goffart  <ogoffart at kde.org>
+           2006, Olivier Goffart <ogoffart at kde.org>
            1999, Pietro Iglio <iglio at kde.org>
            2009, Pino Toscano <pino at kde.org>
            1999-2000, Preston Brown <pbrown at kde.org>
@@ -24,28 +23,46 @@ Copyright: 2007-2008, Aaron Seigo <aseigo at kde.org>
            2006-2007, Thomas Braxton <kde.braxton at gmail.com>
            1998-2003, Waldo Bastian <bastian at kde.org>
            2003, Zack Rusin <zack at kde.org>
-           2014, Jonathan Riddell <jriddell at ubuntu.com>
-           2014, Scarlett Clark <sgclark at kubuntu.org>
+           2004-2009, Free Software Foundation, Inc
+           K Desktop Environment
+           2009, Rosetta Contributors and Canonical Ltd 2009
+           2007, This_file_is_part_of_KDE
+           2001, translate.org.za
 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".
+
+Files: autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp
+       autotests/kconfig_compiler/test10main.cpp
+       autotests/kconfig_compiler/test11_types.h
+       autotests/kconfig_compiler/test11main.cpp
+       autotests/kconfig_compiler/test12main.cpp
+       autotests/kconfig_compiler/test13main.cpp
+       autotests/kconfig_compiler/test1main.cpp
+       autotests/kconfig_compiler/test2main.cpp
+       autotests/kconfig_compiler/test3amain.cpp
+       autotests/kconfig_compiler/test3main.cpp
+       autotests/kconfig_compiler/test4main.cpp
+       autotests/kconfig_compiler/test5main.cpp
+       autotests/kconfig_compiler/test6main.cpp
+       autotests/kconfig_compiler/test7main.cpp
+       autotests/kconfig_compiler/test8main.cpp
+       autotests/kconfig_compiler/test9main.cpp
+       autotests/kconfig_compiler/test_dpointer_main.cpp
+       autotests/kconfig_compiler/test_qdebugcategorymain.cpp
+       autotests/kconfig_compiler/test_signal_main.cpp
+Copyright: 2014, Alexander Richardson <alex.richardson at gmx.de>
+           2007, Andreas Pakulat <apaku at gmx.de>
+           2003, Cornelius Schumacher <schumacher at kde.org>
+           2005, Duncan Mac-Vicar P <duncan at kde.org>
+           2005, Helge Deller <deller at kde.org>
+           2005, Michael Brade <brade at kde.org>
+           2006, Michael Larouche <michael.larouche at kdemail.net>
+           2009, Pino Toscano <pino at kde.org>
+           2003-2004, Waldo Bastian <bastian at kde.org>
+License: Expat
 
 Files: autotests/helper.h
+       po/ca/kconfig5_qt.po
+       po/uk/kconfig5_qt.po
        src/gui/kconfiggui.cpp
        src/gui/kconfiggui.h
        src/gui/kwindowconfig.cpp
@@ -53,57 +70,71 @@ Files: autotests/helper.h
 Copyright: 2012, Benjamin Port <benjamin.port at ben2367.fr>
            2014, Martin Gräßlin <mgraesslin at kde.org>
            1999, Matthias Ettrich <ettrich at kde.org>
+           2014-2015, This_file_is_part_of_KDE
 License: LGPL-2.1+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.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
- .
- 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-Files: src/gui/kwindowconfig.cpp
-     src/gui/kwindowconfig.h
-     src/gui/kconfiggui.h
-     src/gui/kconfiggui.cpp
-     autotests/kdesktopfiletest.h
-     autotests/kdesktopfiletest.cpp
-     src/kconf_update/kconf_update.cpp
-Copyright: 2001 Waldo Bastian <bastian at kde.org>
-           1997 Stefan Taferner (taferner at alpin.or.at)
-           2000 Nicolas Hadacek (haadcek at kde.org)
-           2001,2002 Ellis Whitehead (ellis at kde.org)
-           2006 David Faure   <faure at kde.org>
+Files: autotests/kdesktopfiletest.cpp
+       autotests/kdesktopfiletest.h
+       autotests/ksharedconfig_in_global_object.cpp
+       src/gui/kstandardshortcut.cpp
+       src/gui/kstandardshortcut.h
+       src/kconf_update/kconf_update.cpp
+Copyright: 2006, David Faure <faure at kde.org>
+           2001-2002, Ellis Whitehead <ellis at kde.org>
+           2007, Matthias Kretz <kretz at kde.org>
+           2000, Nicolas Hadacek <haadcek at kde.org>
+           2000, Nicolas Hadacek <hadacek at kde.org>
+           1997, Stefan Taferner <taferner at alpin.or.at>
+           1997, Stefan Taferner <taferner at kde.org>
+           2001, Waldo Bastian <bastian 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
- 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.
- .
- 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 Lesser General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
+Files: src/kreadconfig/kreadconfig.cpp
+       src/kreadconfig/kwriteconfig.cpp
+Copyright: 2001, Luís Pedro Coelho <luis_pedro at netcabo.pt>
+           2001, Red Hat, Inc
+License: GPL-2+
 
 Files: src/core/kemailsettings.cpp
        src/core/kemailsettings.h
 Copyright: 2000 Alex Zepeda <zipzippy at sonic.net>
 License: BSD-2-clause
+
+Files: src/kconfig_compiler/kcfg.xsd
+Copyright: 2003, Cornelius Schumacher <schumacher at kde.org>
+           2004, Frans Englich <frans.englich at telia.com>
+           2006, Michaël Larouche <michael.larouche at kdemail.net>
+           2003, Waldo Bastian <bastian at kde.org>
+           2003, Zack Rusin <zack at kde.org>
+License: MIT_OLIF
+ 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: KF5ConfigMacros.cmake
+Copyright: 2006-2009, Alexander Neundorf <neundorf at kde.org>
+           2006-2007, Laurent Montel <montel at kde.org>
+           2007, Matthias Kretz <kretz at kde.org>
+License: BSD-3-clause
+
+Files: po/bg/kconfig5_qt.po
+Copyright: 2007-2008, Zlatko Popov <zlatkopopov at fsa-bg.org>
+License: GPL
+ This file is licensed under the GPL.
+ -
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in `/usr/share/common-licenses/GPL'.
+
+Files: debian/*
+Copyright: 2014, Jonathan Riddell <jriddell at ubuntu.com>
+           2014, Scarlett Clark <sgclark at kubuntu.org>
+License: LGPL-2+
+
+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:
@@ -125,32 +156,30 @@ License: BSD-2-clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: autotests/kconfig_compiler/kconfigcompiler_test_signals.cpp
-       autotests/kconfig_compiler/test10main.cpp
-       autotests/kconfig_compiler/test11_types.h
-       autotests/kconfig_compiler/test11main.cpp
-       autotests/kconfig_compiler/test12main.cpp
-       autotests/kconfig_compiler/test1main.cpp
-       autotests/kconfig_compiler/test2main.cpp
-       autotests/kconfig_compiler/test3amain.cpp
-       autotests/kconfig_compiler/test3main.cpp
-       autotests/kconfig_compiler/test4main.cpp
-       autotests/kconfig_compiler/test5main.cpp
-       autotests/kconfig_compiler/test6main.cpp
-       autotests/kconfig_compiler/test7main.cpp
-       autotests/kconfig_compiler/test8main.cpp
-       autotests/kconfig_compiler/test9main.cpp
-       autotests/kconfig_compiler/test_dpointer_main.cpp
-       autotests/kconfig_compiler/test_signal_main.cpp
-Copyright: 2014, Alexander Richardson <alex.richardson at gmx.de>
-           2007, Andreas Pakulat <apaku at gmx.de>
-           2003, Cornelius Schumacher <schumacher at kde.org>
-           2005, Duncan Mac-Vicar P <duncan at kde.org>
-           2005, Helge Deller <deller at kde.org>
-           2005, Michael Brade <brade at kde.org>
-           2006, Michael Larouche <michael.larouche at kdemail.net>
-           2009, Pino Toscano <pino at kde.org>
-           2003-2004, Waldo Bastian <bastian at kde.org>
+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:
+ .
+ 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.
+
 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
@@ -169,10 +198,6 @@ License: Expat
  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: src/kreadconfig/kreadconfig.cpp
-       src/kreadconfig/kwriteconfig.cpp
-Copyright: 2001, Luís Pedro Coelho <luis_pedro at netcabo.pt>
-           2001, Red Hat, Inc
 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
@@ -186,49 +211,65 @@ 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".
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files: KF5ConfigMacros.cmake
-Copyright: 2006-2009, Alexander Neundorf <neundorf at kde.org>
-           2006-2007, Laurent Montel <montel at kde.org>
-           2007, Matthias Kretz <kretz at kde.org>
-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:
+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.
  .
- 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 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.
  .
- 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 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'.
 
-Files: src/kconfig_compiler/kcfg.xsd
-Copyright: 2003, Cornelius Schumacher <schumacher at kde.org>
-           2004, Frans Englich <frans.englich at telia.com>
-           2006, Michaël Larouche <michael.larouche at kdemail.net>
-           2003, Waldo Bastian <bastian at kde.org>
-           2003, Zack Rusin <zack at kde.org>
-License: Permissive
- 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.
+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'.
+
+License: LGPL-2.1+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.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+ .
+ 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ -
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
+ the complete text of the GNU Lesser General Public Licens version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3'.

-- 
kconfig packaging



More information about the pkg-kde-commits mailing list