[SCM] muon packaging branch, master, updated. 5ec2de42638b3459dbb4d82265c7326074997e77
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Mar 21 17:35:42 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=c8973ca
The following commit has been merged in the master branch:
commit c8973cad5a198df9edd588db5a206e52fb08414f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Feb 13 12:35:41 2015 +0100
Comment instead of phony
---
debian/changelog | 1 +
debian/copyright | 262 +++++++++++++++++++++++++++++++++++++++++++++++--------
debian/rules | 3 +-
3 files changed, 230 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a0ba523..fc7d072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ muon (4:5.2.0-1~) UNRELEASED; urgency=medium
* Add myself as Uploader.
* Update build dependencies to build against experimental and to
follow cmake.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Fri, 13 Feb 2015 12:03:56 +0100
diff --git a/debian/copyright b/debian/copyright
index 91999fa..7d94df1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,10 +4,12 @@ Upstream-Contact: Jonathan Thomas <echidnaman at kubuntu.org>
Source: git://anongit.kde.org/muon
Files: *
-Copyright: 2009-2010, Jonathan Thomas <echidnaman at kubuntu.org>
- 2009, Harald Sitter <apachelogger at ubuntu.com>
+Copyright: 2012-2014, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
2010, Guillaume Martres <smarter at ubuntu.com>
-License: GPL-2 or GPL-3
+ 2010-2013, Jonathan Thomas <echidnaman at kubuntu.org>
+ 2013, Lukas Appelhans <boom1992 at chakra-project.org>
+ 2013, Lukas Appelhans <l.appelhans at gmx.de>
+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
@@ -24,24 +26,102 @@ License: GPL-2 or 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 2 can be found in the file /usr/share/common-licenses/GPL-2.
+ 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
+ discover/DiscoverAction.h
+ discover/MuonDiscoverMainWindow.cpp
+ discover/MuonDiscoverMainWindow.h
+ discover/PaginateModel.cpp
+ discover/PaginateModel.h
+ discover/SystemFonts.cpp
+ discover/SystemFonts.h
+ discover/qml/AddSourceDialog.qml
+ discover/qml/ApplicationDescription.qml
+ discover/qml/ApplicationPage.qml
+ discover/qml/ApplicationsGridDelegate.qml
+ discover/qml/ApplicationsList.qml
+ discover/qml/ApplicationsListPage.qml
+ discover/qml/ApplicationsTop.qml
+ discover/qml/AwesomeGrid.qml
+ discover/qml/Breadcrumbs.qml
+ discover/qml/BrowsingPage.qml
+ discover/qml/CategoryHeader.qml
+ discover/qml/CategoryPage.qml
+ discover/qml/GridItem.qml
+ discover/qml/Rating.qml
+ discover/qml/ReviewDelegate.qml
+ discover/qml/ScrolledAwesomeGrid.qml
+ discover/qml/TopLevelPageData.qml
+ discover/qml/navigation.js
+ exporter/MuonExporter.cpp
+ exporter/MuonExporter.h
+ installer/ResourceView/ResourceDelegate.cpp
+ installer/ResourceView/ResourceDelegate.h
+ installer/ScreenShotOverlay.cpp
+ installer/ScreenShotOverlay.h
+ libmuon/declarative/ApplicationProxyModelHelper.cpp
+ libmuon/declarative/ApplicationProxyModelHelper.h
+ libmuon/declarative/MuonDeclarativePlugin.cpp
+ libmuon/declarative/MuonDeclarativePlugin.h
+ libmuon/resources/StandardBackendUpdater.cpp
+ libmuon/resources/StandardBackendUpdater.h
+ notifier/MuonNotifierDeclarativePlugin.cpp
+ notifier/MuonNotifierDeclarativePlugin.h
+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>
+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
.
- 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.
+ 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: muon/config/ManagerSettingsDialog.cpp updater/config/UpdaterSettingsDialog.cpp
- installer/ApplicationLauncher.* installer/effects/* installer/ClickableLabel.*
+Files: installer/ApplicationLauncher.cpp
+ installer/ApplicationLauncher.h
+ installer/BreadcrumbWidget/BreadcrumbItemButton.cpp
+ installer/BreadcrumbWidget/BreadcrumbItemButton.h
+ installer/CategoryView/CategoryDrawer.cpp
installer/CategoryView/CategoryDrawer.h
- installer/BreadcrumbWidget/BreadcrumbItemButton.*
- installer/ApplicationModel/ApplicationDelegate.* libmuon/settings/*
-Copyright: 2006, Peter Penz <peter.penz at gmx.at>
- 2010, Jonathan Thomas <echidnaman at kubuntu.org>
- 2008, Daniel Nicoletti <dantti85-pk at yahoo.com.br>
+ installer/ClickableLabel.cpp
+ installer/ClickableLabel.h
+ installer/effects/GraphicsOpacityDropShadowEffect.cpp
+ installer/effects/GraphicsOpacityDropShadowEffect.h
+ libmuon/settings/SettingsPageBase.cpp
+ libmuon/settings/SettingsPageBase.h
+ muon/config/ManagerSettingsDialog.cpp
+ notifier/plasmoid/contents/ui/Full.qml
+ notifier/plasmoid/contents/ui/main.qml
+ updater/config/UpdaterSettingsDialog.cpp
+Copyright: 2006, Aaron Seigo <aseigo at kde.org>
+ 2013-2014, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+ 2009-2010, Daniel Nicoletti
+ 2008-2010, Daniel Nicoletti <dantti85-pk at yahoo.com.br>
+ 2010-2012, Jonathan Thomas <echidnaman at kubuntu.org>
+ 2006, Peter Penz
+ 2006, Peter Penz <peter.penz at gmx.at>
2009, Rafael Fernández López <ereslibre at kde.org>
2009, Seb Ruiz <ruiz at kde.org>
- 2006, Aaron Seigo <aseigo at kde.org>
- 2007, Ivan Cukic <ivan.cukic+kde at gmail.com>
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
@@ -54,27 +134,139 @@ License: GPL-2+
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/>.
+ 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.
+ 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: muon/moo.ogg
-Copyright: 2007 Wikimedia user Secretlondon
-Comment: README says this came from Wikipedia.
- Appears to be http://en.wikipedia.org/wiki/File:Mudchute_cow_1.ogg by
- user Secretlondon (http://commons.wikimedia.org/wiki/User:Secretlondon).
-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.
- .
- You should have received a copy of the GNU Free Documentation License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+Files: libmuon/backends/ApplicationBackend/qoauth/src/interface.cpp
+ libmuon/backends/ApplicationBackend/qoauth/src/interface.h
+ libmuon/backends/ApplicationBackend/qoauth/src/interface_p.h
+ libmuon/backends/ApplicationBackend/qoauth/src/qoauth_global.h
+ 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
+ cmake/FindPackageKitQt2.cmake
+ cmake/FindQtOAuth.cmake
+Copyright: 2007, Charles Connell <charles at connells.org> (This was based upon FindKopete.cmake)
+ 2010, Harald Sitter <apachelogger at ubuntu.com>
+ 2007, Joris Guisson <joris.guisson at gmail.com> (This was based upon FindKTorrent.cmake)
+ 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
+ * $QT_BEGIN_LICENSE:LGPL$
+ * GNU Lesser General Public License Usage
+ * This file may be used under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation and
+ * appearing in the file LICENSE.LGPL included in the packaging of this
+ * file. Please review the following information to ensure the GNU Lesser
+ * General Public License version 2.1 requirements will be met:
+ * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ *
+ * In addition, as a special exception, Nokia gives you certain additional
+ * rights. These rights are described in the Nokia Qt LGPL Exception
+ * version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ *
+ * GNU General Public License Usage
+ * Alternatively, this file may be used under the terms of the GNU General
+ * Public License version 3.0 as published by the Free Software Foundation
+ * and appearing in the file LICENSE.GPL included in the packaging of this
+ * file. Please review the following information to ensure the GNU General
+ * Public License version 3.0 requirements will be met:
+ * http://www.gnu.org/copyleft/gpl.html.
+ *
+ * Other Usage
+ * Alternatively, this file may be used in accordance with the terms and
+ * conditions contained in a signed written agreement between you and Nokia.
+ *
+ *
+ *
+ *
+ *
+ * $QT_END_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.
+ 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: debian/*
Copyright: 2010, Jonathan Thomas <echidnaman at kubuntu.org>
@@ -93,4 +285,4 @@ License: GPL-3+
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.
+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/rules b/debian/rules
index 70c635e..5755edf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,4 +17,5 @@ override_dh_makeshlibs:
$(overridden_command) -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/muon* -V
# FIXME: tests are broken at this time
-.PHONY: override_dh_auto_test
+override_dh_auto_test:
+ :
--
muon packaging
More information about the pkg-kde-commits
mailing list