[SCM] muon packaging branch, master, updated. 1d88b0e729663abf43db485d65680eaf5a2877e5
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 2 05:52:17 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=1d88b0e
The following commit has been merged in the master branch:
commit 1d88b0e729663abf43db485d65680eaf5a2877e5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jul 1 18:36:19 2015 +0200
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 310 +++++++++++++++++++++++++++++++++----------------------
2 files changed, 185 insertions(+), 126 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e15e3dc..a1440d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
muon (4:5.3.2-1) unstable; urgency=medium
* New upstream release (5.3.2).
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Tue, 30 Jun 2015 23:04:58 +0200
diff --git a/debian/copyright b/debian/copyright
index 7d94df1..5006970 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,32 +4,16 @@ Upstream-Contact: Jonathan Thomas <echidnaman at kubuntu.org>
Source: git://anongit.kde.org/muon
Files: *
-Copyright: 2012-2014, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+Copyright: 2012-2015, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
2010, Guillaume Martres <smarter at ubuntu.com>
2010-2013, Jonathan Thomas <echidnaman at kubuntu.org>
2013, Lukas Appelhans <boom1992 at chakra-project.org>
2013, Lukas Appelhans <l.appelhans at gmx.de>
+ 2010, KDE
+ 2011, Rosetta Contributors and Canonical Ltd 2011
+ 2012, Rosetta Contributors and Canonical Ltd 2012
+ 2010-2015, This_file_is_part_of_KDE
License: GPL-2+3+KDEeV
- 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) 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 14 of version 3 of the license.
- .
- 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, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2', likewise, the full
- text of the GNU General Public License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
Files: MuonVersion.h.in
discover/DiscoverAction.cpp
@@ -72,30 +56,44 @@ Files: MuonVersion.h.in
libmuon/resources/StandardBackendUpdater.h
notifier/MuonNotifierDeclarativePlugin.cpp
notifier/MuonNotifierDeclarativePlugin.h
+ discover/main.cpp
+ exporter/main.cpp
Copyright: 2012-2014, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
2008, Daniel Nicoletti <dantti85-pk at yahoo.com.br>
2007, Ivan Cukic <ivan.cukic+kde at gmail.com>
2010-2012, Jonathan Thomas <echidnaman at kubuntu.org>
2009, Tobias Koenig <tokoe at kde.org>
2008, Volker Krause <vkrause at kde.org>
+ 2012, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
License: LGPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Library/Lesser General Public License
- version 2, or (at your option) any later version, as published by the
- Free Software Foundation
- .
- 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 Library/Lesser 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 full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+Files: installer/qml/qml/ClickableImage.qml
+ installer/qml/qml/ThumbnailView.qml
+ installer/qml/src/mousecursor.cpp
+ installer/qml/src/mousecursor.h
+ po/ca/libmuon.po
+ po/ca/muon-exporter.po
+ po/ca/muon-installer.po
+ po/ca/muon-notifier.po
+ po/ca/muon-updater.po
+ po/ca/muon.po
+ po/ca/plasma_applet_org.kde.muonnotifier.po
+ po/ca at valencia/libmuon.po
+ po/ca at valencia/muon-installer.po
+ po/ca at valencia/muon-updater.po
+ po/ca at valencia/muon.po
+ po/uk/libmuon.po
+ po/uk/muon-discover.po
+ po/uk/muon-exporter.po
+ po/uk/muon-installer.po
+ po/uk/muon-notifier.po
+ po/uk/muon-updater.po
+ po/uk/muon.po
+ po/uk/plasma_applet_org.kde.muonnotifier.po
+Copyright: 2011, Harald Sitter <sitter at kde.org>
+ 2011, Jonathan Thomas <echidnaman at kubuntu.org>
+ 2010-2015, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
Files: installer/ApplicationLauncher.cpp
installer/ApplicationLauncher.h
@@ -123,23 +121,6 @@ Copyright: 2006, Aaron Seigo <aseigo at kde.org>
2009, Rafael Fernández López <ereslibre at kde.org>
2009, Seb Ruiz <ruiz at kde.org>
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; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
Files: libmuon/backends/ApplicationBackend/qoauth/src/interface.cpp
libmuon/backends/ApplicationBackend/qoauth/src/interface.h
@@ -148,23 +129,6 @@ Files: libmuon/backends/ApplicationBackend/qoauth/src/interface.cpp
libmuon/backends/ApplicationBackend/qoauth/src/qoauth_namespace.h
Copyright: 2009, Dominik Kapusta <d at ayoy.net>
License: LGPL-2.1+
- 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) 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
- 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, write to
- the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the full text of the GNU Lesser General Public License
- version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
Files: cmake/FindAkabeiClient.cmake
cmake/FindAkabeiCore.cmake
@@ -176,62 +140,11 @@ Copyright: 2007, Charles Connell <charles at connells.org> (This was based upon Fin
2010-2013, Lukas Appelhans <l.appelhans at gmx.de>
2010, Mehrdad Momeny <mehrdad.momeny at gmail.com>
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.
-
-Files: installer/qml/qml/ClickableImage.qml
- installer/qml/qml/ThumbnailView.qml
- installer/qml/src/mousecursor.cpp
- installer/qml/src/mousecursor.h
-Copyright: 2011, Harald Sitter <sitter at kde.org>
- 2011, Jonathan Thomas <echidnaman at kubuntu.org>
-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.), Nokia Corporation
- (or its successors, if any) and the KDE Free Qt Foundation, 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 full text of the GNU Lesser General Public License
- version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1',
- likewise, the full text of the GNU Lesser General Public License version 3
- can be found in the file `/usr/share/common-licenses/LGPL-3'.
Files: libmuon/backends/ApplicationBackend/tests/modeltest.cpp
libmuon/backends/ApplicationBackend/tests/modeltest.h
Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies)
-License: GPL-3 or LGPL-2.1-QTexception-1.1
+License: GPL-3_or_LGPL-2.1-QTexception-1.1
* $QT_BEGIN_LICENSE:LGPL$
* GNU Lesser General Public License Usage
* This file may be used under the terms of the GNU Lesser General Public
@@ -262,15 +175,77 @@ License: GPL-3 or LGPL-2.1-QTexception-1.1
*
*
* $QT_END_LICENSE$
- .
+ --
On Debian systems, the full text of the GNU Lesser General Public License
version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1',
likewise, the full text of the GNU General Public License version 3
can be found in the file `/usr/share/common-licenses/GPL-3'.
+Files: libmuon/moo.ogg
+Copyright: 2007, Secretlondon (Wikipedia username)
+License: GFDL-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.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ --
+ On Debian systems, the full text of the GNU Free Documentation License
+ version 1.2 can be found in the file `/usr/share/common-licenses/GFDL-1.2',
+Comment: From the README file:
+ Moo.ogg was taken from wikipedia, and is licensed under the GFDL 1.2 license.
+ It is copyright 2007 by Wikipedia user "Secretlondon" (Hint: it is part of an
+ epic easter egg)
+
Files: debian/*
Copyright: 2010, Jonathan Thomas <echidnaman at kubuntu.org>
License: GPL-3+
+
+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: 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; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ --
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3+
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 3 of the License, or
@@ -283,6 +258,89 @@ License: GPL-3+
.
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 full text of the GNU General Public License
version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
+
+License: GPL-2+3+KDEeV
+ 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) 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 14 of version 3 of the license.
+ .
+ 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, see <http://www.gnu.org/licenses/>.
+ --
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2', likewise, the
+ full text of the GNU General Public License version 3 can be found in the
+ file `/usr/share/common-licenses/GPL-3'.
+
+License: LGPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library/Lesser General Public License
+ version 2, or (at your option) any later version, as published by the
+ Free Software Foundation
+ .
+ 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 Library/Lesser 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 full text of the GNU Library General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'.
+
+License: LGPL-2.1+
+ 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) 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
+ 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, write to
+ the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ --
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+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.), Nokia Corporation
+ (or its successors, if any) and the KDE Free Qt Foundation, 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 full text of the GNU Lesser General Public License
+ version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1',
+ likewise, the full text of the GNU Lesser General Public License version 3
+ can be found in the file `/usr/share/common-licenses/LGPL-3'.
--
muon packaging
More information about the pkg-kde-commits
mailing list