[SCM] muon packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-1-ga80cb70

Clive Johnston clivejo-guest at moszumanska.debian.org
Sat Apr 9 22:12:20 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=a80cb70

The following commit has been merged in the kubuntu_unstable branch:
commit a80cb709df5d8cddd17d0826317be75454d5744d
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Apr 9 23:12:03 2016 +0100

    Fixing Muon packaging
    
    - Removing packages and files belonging to software now migrated elsewhere
      such as updater and discover.
    - Removing Debian patch which ommits Ubuntu info in the Package Manager
    - Sync the packaging changelog with the Ubuntu archive
---
 debian/changelog                       |  71 +++++++-
 debian/control                         |  78 +--------
 debian/copyright                       | 310 +++++++++++++++++++--------------
 debian/libmuon.install                 |  12 --
 debian/libmuon.lintian-overrides       |   6 -
 debian/muon-common.install             |   1 -
 debian/muon-discover.install           |   6 -
 debian/muon-discover.lintian-overrides |   1 -
 debian/muon-notifier.install           |   6 -
 debian/muon-updater.install            |   4 -
 debian/muon-updater.lintian-overrides  |   1 -
 debian/muon.install                    |   1 -
 12 files changed, 257 insertions(+), 240 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a36120d..91337d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+muon (4:5.5.0) UNRELEASED; urgency=medium
+
+  * Git snapshot from KDE git repo (Closes LP: #1562406)
+  * Removing files and packages in control and install files for
+    software which has been migrated else where.
+  * Removing patches because we are Ubuntu, not Debian!
+
+ -- Clive Johnston <clivejo at aol.com>  Sat, 26 Mar 2016 20:50:44 +0000
+
+muon (4:5.4.3-1) unstable; urgency=medium
+
+  * New upstream release (5.4.3).
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:33 +0100
+
 muon (4:5.4.3-0ubuntu1) xenial; urgency=medium
 
   [ Scarlett Clark ]
@@ -9,18 +24,44 @@ muon (4:5.4.3-0ubuntu1) xenial; urgency=medium
 
  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:38:55 +0100
 
+muon (4:5.4.2-1) unstable; urgency=medium
+
+  [ Scott Kitterman ]
+  * Team upload.
+  * Patch out Canonical support information used for Ubuntu - We're Debian
+    (Closes: #791875)
+    - Added debian/patches/no-canonical-support
+
+  [ Maximiliano Curia ]
+  * New upstream release (5.4.2).
+  * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:43 +0200
+
 muon (4:5.4.2-0ubuntu1) wily; urgency=medium
 
   * New upstream release
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 15:58:40 +0100
 
+muon (4:5.4.1-1) unstable; urgency=medium
+
+  * New upstream release (5.4.1).
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:44:50 +0200
+
 muon (4:5.4.1-0ubuntu1) wily; urgency=medium
 
   * new upstream release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:21:43 +0100
 
+muon (4:5.4.0-1) unstable; urgency=medium
+
+  * New upstream release (5.4.0).
+
+ -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 18:24:40 +0200
+
 muon (4:5.4.0-0ubuntu1) wily; urgency=medium
 
   * new upstream release
@@ -34,6 +75,28 @@ muon (4:5.3.95-0ubuntu1) wily; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:18:23 +0200
 
+muon (4:5.3.2-3) unstable; urgency=medium
+
+  * Team upload.
+  * Drop muon-discover depends on the no longer existing app-install-data
+    (Closes: #792358)
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 20 Jul 2015 02:15:50 -0400
+
+muon (4:5.3.2-2) unstable; urgency=medium
+
+  * Drop update-notifier-common dependency. (Closes: #792011) Thanks to
+    Achim Schaefer
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 10 Jul 2015 10:40:50 +0200
+
+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
+
 muon (4:5.3.2-0ubuntu1) wily; urgency=medium
 
   * New upstream release
@@ -49,7 +112,7 @@ muon (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
   * Vivid backport
-  * wrap-and-sort 
+  * wrap-and-sort
 
   [ Jonathan Riddell ]
   * New upstream release
@@ -94,14 +157,14 @@ muon (4:5.2.2-1-0ubuntu2) vivid; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 09:59:22 +0100
 
-muon (4:5.3.1-1~) UNRELEASED; urgency=medium
+muon (4:5.3.1-1) unstable; urgency=medium
 
   * New upstream release (5.2.1).
   * New upstream release (5.2.2).
   * New upstream release (5.3.0).
   * New upstream release (5.3.1).
 
- -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:52:00 +0200
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:05:56 +0200
 
 muon (4:5.2.2-0ubuntu2) vivid; urgency=medium
 
@@ -129,7 +192,7 @@ muon (4:5.2.1git20150304-0ubuntu1) vivid; urgency=medium
 
 muon (4:5.2.1-0ubuntu1) vivid; urgency=medium
 
-  * New upstream release 
+  * New upstream release
   * Add missing .mo files
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:45:04 -0800
diff --git a/debian/control b/debian/control
index 1a1376d..37ae797 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: cmake (>= 2.8.12),
                kinit-dev,
                kio-dev,
                libdebconf-kde-dev (>= 1.0.0),
+               libkf5archive-dev,
                libkf5attica-dev,
                libkf5config-dev,
                libkf5configwidgets-dev,
@@ -22,6 +23,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5newstuff-dev,
                libkf5notifications-dev,
                libkf5solid-dev,
+               libkf5textwidgets-dev,
                libkf5wallet-dev,
                libkf5widgetsaddons-dev,
                libphonon4qt5-dev,
@@ -42,11 +44,10 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/muon.git
 Package: muon
 Architecture: any
 Depends: apt-xapian-index,
-         libmuon (= ${binary:Version}),
-         libqapt3-runtime,
+         libqapt3 (>= 3.0.1+git20160315),
+         libqapt3-runtime (>= 3.0.1+git20160315),
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: muon-updater
 Description: package manager for KDE
  Muon is a graphical package manager for KDE.
  .
@@ -66,79 +67,12 @@ Description: package manager for KDE
   * Support for download the latest changelog of a package
   * Package screenshots
 
-Package: muon-common
-Architecture: all
-Depends: ${misc:Depends}
-Description: Muon package manager suite (common data files)
- Muon is a graphical package manager for the Plasma workspace.
- .
- This package contains data files shared by various parts of the Muon suite.
-
-Package: muon-discover
-Architecture: any
-Depends: app-install-data,
-         apt-xapian-index,
-         libmuon (= ${binary:Version}),
-         libqapt3-runtime,
-         muon-common (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: app-install-data-partner, ubuntu-sso-client
-Description: Utility for browsing, installing, and removing applications
- Muon Discover will help you browse through the huge applications library you
- have available and help you find the applications you're looking for.
- .
- To install or remove software using the Center, you need administrator
- access on the computer.
-
-Package: muon-updater
-Architecture: any
-Depends: libmuon (= ${binary:Version}),
-         libqapt3-runtime,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: muon-notifier
-Description: update manager for KDE
- Muon Updater is a graphical update manager for KDE. It is part of the Muon
- family of software and provides an interface similar to that of Muon.
-
-Package: muon-notifier
-Architecture: any
-Depends: muon-common (= ${source:Version}),
-         muon-updater,
-         update-notifier-common,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: ubuntu-release-upgrader-qt
-Description: update notifier for KDE
- The Muon Notifier is an update notification daemon for KDE. It uses the KDE
- Daemon frame (KDED) framework to present the user with update notifications,
- providing an opportunity to launch the Muon Updater to deal with these
- updates.
-
-Package: libmuon
-Architecture: any
-Depends: policykit-1,
-         python3,
-         software-properties-kde,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libmuonprivate1, libmuonprivate2, muon-installer (<< 1.3.65-0ubuntu2)
-Replaces: libmuonprivate1, libmuonprivate2, muon-installer (<< 1.3.65-0ubuntu2)
-Description: Runtime files for the Muon package management suite
- The Muon package management suite is a collection of package management
- applications built on the KDE platform.
- .
- This package contains runtime libraries
-
 Package: muon-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libmuon (= ${binary:Version}),
-         muon (= ${binary:Version}) | muon-updater (= ${binary:Version}) | muon-notifier (= ${binary:Version}),
-         ${misc:Depends}
-Recommends: kdelibs5-dbg, qapt-dbg
+Depends: muon (= ${binary:Version}), ${misc:Depends}
+Recommends: qapt-dbg
 Description: Muon debugging symbols
  This package contains debugging symbols for Muon.
  When Muon crashes, in most cases this package is
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'.
diff --git a/debian/libmuon.install b/debian/libmuon.install
deleted file mode 100644
index 81bd72f..0000000
--- a/debian/libmuon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-etc/dbus-1/system.d/org.kde.muon.repo.conf
-usr/lib/*/libMuonApt.so
-usr/lib/*/libMuonCommon.so
-usr/lib/*/libMuonNotifiers.so
-usr/lib/*/libexec/muon_repo_helper
-usr/lib/*/qt5/plugins/muon-notifier/
-usr/lib/*/qt5/plugins/muon/
-usr/lib/*/qt5/qml/org/kde/muon/
-usr/share/dbus-1/system-services/org.kde.muon.repo.service
-usr/share/libmuon/
-usr/share/locale/*/LC_MESSAGES/libmuon.mo
-usr/share/polkit-1/actions/org.kde.muon.repo.policy
diff --git a/debian/libmuon.lintian-overrides b/debian/libmuon.lintian-overrides
deleted file mode 100644
index ed46720..0000000
--- a/debian/libmuon.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# Private libs
-libmuon: package-name-doesnt-match-sonames libMuonApt libMuonCommon libMuonNotifiers
-libmuon: shlib-without-versioned-soname usr/lib/*/libMuonApt.so libMuonApt.so
-libmuon: shlib-without-versioned-soname usr/lib/*/libMuonNotifiers.so libMuonNotifiers.so
-libmuon: shlib-without-versioned-soname usr/lib/*/libMuonCommon.so libMuonCommon.so
-libmuon: postinst-must-call-ldconfig usr/lib/*/libMuonNotifiers.so
diff --git a/debian/muon-common.install b/debian/muon-common.install
deleted file mode 100644
index a32f7d5..0000000
--- a/debian/muon-common.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/icons/hicolor/*/apps/muondiscover.*
diff --git a/debian/muon-discover.install b/debian/muon-discover.install
deleted file mode 100644
index 432e42f..0000000
--- a/debian/muon-discover.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/muon-discover
-usr/share/applications/org.kde.discover.desktop
-usr/share/desktoptheme/muon-contenttheme/
-usr/share/kxmlgui5/muondiscover/
-usr/share/locale/*/LC_MESSAGES/muon-discover.mo
-usr/share/muondiscover/
diff --git a/debian/muon-discover.lintian-overrides b/debian/muon-discover.lintian-overrides
deleted file mode 100644
index afa5759..0000000
--- a/debian/muon-discover.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-muon-discover: binary-without-manpage usr/bin/muon-discover
diff --git a/debian/muon-notifier.install b/debian/muon-notifier.install
deleted file mode 100644
index 532e92b..0000000
--- a/debian/muon-notifier.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/*/qt5/qml/org/kde/muonnotifier/
-usr/share/knotifications5/
-usr/share/kservices5/plasma-applet-org.kde.muonnotifier.desktop
-usr/share/locale/*/LC_MESSAGES/muon-notifier.mo
-usr/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.muonnotifier.mo
-usr/share/plasma/plasmoids/org.kde.muonnotifier/
diff --git a/debian/muon-updater.install b/debian/muon-updater.install
deleted file mode 100644
index 83f2bd2..0000000
--- a/debian/muon-updater.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/muon-updater
-usr/share/applications/muon-updater.desktop
-usr/share/kxmlgui5/muonupdater/
-usr/share/locale/*/LC_MESSAGES/muon-updater.mo
diff --git a/debian/muon-updater.lintian-overrides b/debian/muon-updater.lintian-overrides
deleted file mode 100644
index 0c1b54e..0000000
--- a/debian/muon-updater.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-muon-updater: binary-without-manpage usr/bin/muon-updater
diff --git a/debian/muon.install b/debian/muon.install
index 1c6dbaf..9344e3d 100644
--- a/debian/muon.install
+++ b/debian/muon.install
@@ -3,4 +3,3 @@ usr/share/applications/muon.desktop
 usr/share/config.kcfg/muon.kcfg
 usr/share/icons/hicolor/*/apps/muon.*
 usr/share/kxmlgui5/muon/
-usr/share/locale/*/LC_MESSAGES/muon.mo

-- 
muon packaging



More information about the pkg-kde-commits mailing list