debian/0000775000000000000000000000000012421474251007172 5ustar debian/muon-installer.postinst0000664000000000000000000000031412332647336013755 0ustar #!/bin/sh set -e #DEBHELPER# # make sure we update the index so that on first install # we have something to show (LP: #617397) if [ "$1" = "configure" ];then update-apt-xapian-index -u || true fi debian/source/0000775000000000000000000000000012321471341010466 5ustar debian/source/format0000664000000000000000000000001412332647336011707 0ustar 3.0 (quilt) debian/changelog0000664000000000000000000004346212421535515011056 0ustar muon (2.2.0-0ubuntu3.2) trusty; urgency=medium * Add kubuntu_fix-releasechecker.diff to fix checking for release updates, LP: #1383767 -- Jonathan Riddell Tue, 21 Oct 2014 17:15:24 +0200 muon (2.2.0-0ubuntu3.1) trusty; urgency=medium * Add upstream_Fix-threading-problem-involving-KSharedConfig.patch + This should prevent unsafe cross thread KSharedConfig accesses leading to crashes in all muon applications that use the ApplicationBackend. LP: #1317431 -- Harald Sitter Thu, 08 May 2014 11:25:39 +0200 muon (2.2.0-0ubuntu3) trusty; urgency=medium * Add upstream_Check-for-the-number-of-updates-rather-than-checking.patch to stop bogus upgrade notifications -- Rohan Garg Sun, 13 Apr 2014 20:26:22 +0200 muon (2.2.0-0ubuntu2) trusty; urgency=medium * Add upstream_Don-t-post-another-notification-if-the-data-didn-t-c.patch from upstream git master as it did not get backported to the 2.2 branch LP: #1295423 -- Harald Sitter Thu, 10 Apr 2014 16:59:11 +0200 muon (2.2.0-0ubuntu1) trusty; urgency=medium * Upstream final release + Dropping all patches/upstream_git of previously imported fixes. * Remove muon-notifier.mo from debian/*install as the bugger was merged into libmuon's translations. -- Harald Sitter Thu, 10 Apr 2014 12:31:06 +0200 muon (2.1.70-0ubuntu4) trusty; urgency=medium * Import more upstream commits (no. 14-23) improving l10n and notifications LP: #1295423 * Update muon-notifier.install for revised notifier (missed in previous uploads). -- Harald Sitter Wed, 09 Apr 2014 11:38:49 +0200 muon (2.1.70-0ubuntu3) trusty; urgency=medium * Import upstream commits since release, improving l10n and resolving a couple of bugs. + All in sub directory upstream_git/ (git format-patch export) LP: #1283004 -- Harald Sitter Mon, 10 Mar 2014 14:40:28 +0100 muon (2.1.70-0ubuntu2) trusty; urgency=medium * Remove build dep on libbogdega-dev again, not considered viable yet by upstream. -- Harald Sitter Mon, 24 Feb 2014 12:27:08 +0100 muon (2.1.70-0ubuntu1) trusty; urgency=medium * New upstream alpha release * Build-dep on libbodega-dev -- Jonathan Riddell Thu, 20 Feb 2014 22:43:20 +0000 muon (2.1.3-0ubuntu3) trusty; urgency=low * Add upstream_Small-logic-bug.patch to fix application listing caused by missing bool negation. LP: #1276129 -- Harald Sitter Tue, 04 Feb 2014 13:19:25 +0100 muon (2.1.3-0ubuntu2) trusty; urgency=low * Drop kubuntu_featured_sources.diff in favor of kubuntu-settings shipping a config to provide featured software for discover. -- Harald Sitter Fri, 31 Jan 2014 12:33:06 +0100 muon (2.1.3-0ubuntu1) trusty; urgency=low * New upstream release. * Refresh kubuntu_featured_sources.diff -- Harald Sitter Thu, 30 Jan 2014 18:38:53 +0100 muon (2.1.2-0ubuntu1) trusty; urgency=medium * New upstream release (LP: #1261812) -- Rohan Garg Wed, 18 Dec 2013 15:38:28 +0100 muon (2.1.1-0ubuntu2) trusty; urgency=low * Breaks/Replaces libmuonprivate1 (LP: #1250103) -- Rohan Garg Mon, 11 Nov 2013 15:58:30 +0100 muon (2.1.1-0ubuntu1) trusty; urgency=low * New upstream release * Rename libmuonprivate1 to libmuonprivate2 to match the soname -- Rohan Garg Fri, 08 Nov 2013 20:14:55 +0100 muon (2.1.0-0ubuntu1) trusty; urgency=low * New upstream release - Drop upstream_dont_crash_if_fetching_origins.patch -- Rohan Garg Wed, 23 Oct 2013 18:22:31 +0200 muon (2.0.65+git20131008-0ubuntu4) saucy; urgency=low * Add upstream_dont_crash_if_fetching_origins.patch Fixes muon software center always crashing after a couple of seconds. -- Harald Sitter Tue, 15 Oct 2013 12:58:24 +0200 muon (2.0.65+git20131008-0ubuntu3) saucy; urgency=low * New upstream bugfix snapshot from 2.1 branch - fixes LP: #1236803 "muon-discover gets stuck on changing tabs" -- Jonathan Riddell Tue, 08 Oct 2013 14:37:42 +0100 muon (2.0.65-0ubuntu2) saucy; urgency=low * Add kubuntu_featured_sources.diff to change location of featured apps -- Jonathan Riddell Wed, 28 Aug 2013 14:36:35 +0100 muon (2.0.65-0ubuntu1) saucy; urgency=low * New upstream alpha release -- Jonathan Thomas Tue, 25 Jun 2013 11:54:04 -0400 muon (2.0.1-0ubuntu0.1) raring-proposed; urgency=low * New upstream bugfix release: (LP: #1185864) - Remove kubuntu_fix_ffinstaller_startup_crash.diff, applied upstream - Remove kubuntu_01_fix_dist_upgrader_path.diff, applied upstream - Remove kubuntu_02_fix_disabled_apply_button.diff, applied upstream -- Jonathan Thomas Tue, 28 May 2013 11:44:25 -0400 muon (2.0.0-0ubuntu3.1) raring-proposed; urgency=low * Add kubuntu_02_fix_disabled_apply_button.diff to properly re-enable the "Install Updates" button after checking for updates yields new updates (LP: #1172803) -- Jonathan Thomas Thu, 25 Apr 2013 13:54:56 -0400 muon (2.0.0-0ubuntu3) raring; urgency=low * Add kubuntu_01_fix_dist_upgrader_path.diff to properly launch the dist upgrading utility. (LP: #1172056) -- Jonathan Riddell Wed, 24 Apr 2013 18:30:57 +0100 muon (2.0.0-0ubuntu2) raring; urgency=low * Add kubuntu_fix_ffinstaller_startup_crash.diff to stop a crash on startup when muon-installer starts up too quickly and tries to access the ResourcesModel too early. This fix aborts the too-early call, deferring it until the signal that everything else is ready. Cherry-picked from upstream 2.0 branch. -- Jonathan Thomas Thu, 18 Apr 2013 11:17:29 -0400 muon (2.0.0-0ubuntu1) raring; urgency=low * New upstream release -- Jonathan Thomas Mon, 01 Apr 2013 16:40:06 -0400 muon (1.9.97-0ubuntu1) raring; urgency=low * New upstream release candidate -- Jonathan Thomas Tue, 12 Mar 2013 21:44:05 -0400 muon (1.9.95-0ubuntu1) raring; urgency=low * New upstream release candidate -- Jonathan Thomas Sun, 10 Mar 2013 12:50:02 -0400 muon (1.9.80-0ubuntu1) raring; urgency=low * New upstream beta release -- Jonathan Thomas Thu, 24 Jan 2013 14:08:46 -0500 muon (1.9.65-0ubuntu1) raring; urgency=low * New upstream alpha release -- Jonathan Thomas Thu, 06 Dec 2012 15:15:04 -0500 muon (1.9.60-0ubuntu2) raring-proposed; urgency=low * Replace Depends on libqapt-runtime with libqapt2-runtime -- Jonathan Thomas Wed, 31 Oct 2012 18:10:17 -0400 muon (1.9.60-0ubuntu1) raring-proposed; urgency=low * New upstream alpha release: - Add build-depend on libattica-dev for KNewStuff backend support. -- Jonathan Thomas Mon, 29 Oct 2012 15:21:15 -0400 muon (1.4.1-0ubuntu1) quantal; urgency=low * New upstream bugfix release (LP: #1053910) -- Jonathan Thomas Sat, 29 Sep 2012 15:08:07 -0400 muon (1.4.0-0ubuntu2) quantal; urgency=low * Change muon frontends' dependency on libmuonprivate1 to (= ${binary:Version}) to ensure that the versions stay in sync. -- Jonathan Thomas Tue, 04 Sep 2012 12:06:41 -0400 muon (1.4.0-0ubuntu1) quantal; urgency=low * New upstream release * Remove zeitgeist support, as it's currently broken and has been removed for 1.5 upstream. (Drop build-dependency) -- Jonathan Thomas Wed, 15 Aug 2012 21:43:44 -0400 muon (1.3.95-0ubuntu1) quantal; urgency=low * New upstream release candidate (LP: #924364) - Update muon-discover.install for new files * Change dependency on update-manager-kde to ubuntu-release-upgrader-qt (LP: #1020631) -- Jonathan Thomas Sun, 15 Jul 2012 13:23:27 -0400 muon (1.3.80-0ubuntu2) quantal; urgency=low * Add build-depend on libqzeitgeist-dev to enable Zeitgeist integration now that Muon is in universe. -- Jonathan Thomas Mon, 18 Jun 2012 12:50:31 -0400 muon (1.3.80-0ubuntu1) quantal; urgency=low * New upstream beta release: - Remove build-depend on kdelibs5-experimental-dev, it was merged in to kdelibs5-dev -- Jonathan Thomas Sun, 10 Jun 2012 16:19:24 -0400 muon (1.3.65-0ubuntu2) quantal; urgency=low * Only install the proper icons to the muon package. * Only install categories.xml to libmuonprivate1. * Install .mo files for muon-discover -- Jonathan Thomas Mon, 14 May 2012 16:26:59 -0400 muon (1.3.65-0ubuntu1) quantal; urgency=low * New upstream release: - Add new build-dependency on libqoauth-dev - Add new build-dependency on kdelibs5-experimental-dev - Drop update_notifier_auto_hide.diff, applied upstream - Add new binary package muon-discover - Bump libqapt-dev build dependency to 1.3.65 * Bump Standards-Version to 3.9.3.1 -- Jonathan Thomas Sun, 13 May 2012 18:17:50 -0400 muon (1.3.1-0ubuntu2) precise; urgency=low * Backport update_notifier_auto_hide.diff from 1.3 branch to fix the update notifier not going away after updating all packages. -- Jonathan Thomas Fri, 13 Apr 2012 21:39:11 -0400 muon (1.3.1-0ubuntu1) precise; urgency=low * New upstream release * Bump debhelper compat to 9 -- Jonathan Thomas Sun, 01 Apr 2012 13:55:35 -0400 muon (1.3.0-0ubuntu1) precise; urgency=low * New upstream release * Bump Standards-Version to 3.9.3 -- Jonathan Thomas Sat, 03 Mar 2012 22:01:53 -0500 muon (1.2.95-0ubuntu1) precise; urgency=low * New upstream release candidate -- Jonathan Thomas Sun, 29 Jan 2012 11:15:24 -0500 muon (1.2.80-0ubuntu1) oneiric; urgency=low * New upstream beta -- Jonathan Thomas Wed, 21 Dec 2011 21:59:41 -0500 muon (1.2.65-0ubuntu1) precise; urgency=low * New upstream alpha release: - Drop fix_qjson_link_target.diff, applied upstream -- Jonathan Thomas Sun, 13 Nov 2011 19:59:35 -0500 muon (1.2.2-0ubuntu2) precise; urgency=low * Add fix_qjson_link_target.diff to adapt to Debian's changes to qjson's CMake stuff. (Macro QJSON_LIBRARIES -> qjson_LIBRARIES) -- Jonathan Thomas Sun, 23 Oct 2011 22:05:14 -0400 muon (1.2.2-0ubuntu1) precise; urgency=low * New upstream bugfix release -- Jonathan Thomas Sun, 23 Oct 2011 17:14:04 -0400 muon (1.2.1-0ubuntu1) oneiric; urgency=low * New upstream bugfix release (LP: #837389, #841323, #836967, #838961) -- Jonathan Thomas Sun, 18 Sep 2011 13:34:06 -0400 muon (1.2.0-0ubuntu3) oneiric; urgency=low * No-change rebuild to stop desktop file stripping (LP: #851953) -- Harald Sitter Fri, 16 Sep 2011 17:40:00 +0200 muon (1.2.0-0ubuntu2) oneiric; urgency=low * Re-add ubuntu packaging revisions I accidentally overwrote with the last upload. -- Jonathan Thomas Fri, 12 Aug 2011 00:29:25 -0400 muon (1.2.0-0ubuntu1) oneiric; urgency=low * New upstream release -- Jonathan Thomas Thu, 11 Aug 2011 19:29:11 -0400 muon (1.1.90-0ubuntu3) oneiric; urgency=low * Default to not allow installation of untrusted packages (LP: #820638) -- Scott Kitterman Thu, 04 Aug 2011 15:10:49 -0400 muon (1.1.90-0ubuntu2) oneiric; urgency=low * Re-apply changes from 1.1.80-0ubuntu3 that have been accidentally dropped. -- Felix Geyer Mon, 01 Aug 2011 17:25:34 +0200 muon (1.1.90-0ubuntu1) oneiric; urgency=low * New upstream release candidate -- Jonathan Thomas Sun, 24 Jul 2011 15:03:56 -0400 muon (1.1.85-0ubuntu1) oneiric; urgency=low * New upstream beta release -- Jonathan Thomas Sun, 26 Jun 2011 12:00:21 -0400 muon (1.1.80-0ubuntu3) oneiric; urgency=low * Drop zeitgeist-core from Recommends since the zeitgeist integration is disabled. * Add apt-xapian-index to muon-installer dependencies. * Make muon-dbg recommend qapt-dbg. * Enable parallel building. * Bump Standards-Version to 3.9.2, no changes needed. -- Felix Geyer Sun, 05 Jun 2011 00:46:45 +0200 muon (1.1.80-0ubuntu2) oneiric; urgency=low * Remove the build-dependency against libqzeitgeist-dev. There is not really any meaningful zeitgeist integration in KDE for Muon to take advantage of at this point. (At least not enough to justify filing an MIR/it taking up 180 KiB of CD space) -- Jonathan Thomas Tue, 24 May 2011 12:12:31 -0400 muon (1.1.80-0ubuntu1) oneiric; urgency=low * New upstream beta: - Add build-depend on libqzeitgeist-dev for new Zeitgeist support - Add build-depend on libqjson-dev for review/rating support -- Jonathan Thomas Wed, 16 Mar 2011 13:52:48 -0400 muon (1.1.1-0ubuntu1) natty; urgency=low * New upstream bugfix release * Update the Homepage field in debian/control to the new projects.kde.org home page. * Update the upstream name field in debian/copyright to "Muon Package Management Suite" to reflect branding changes. * Update the Source field in debian/copyright to the new KDE Git repository -- Jonathan Thomas Thu, 17 Feb 2011 13:14:28 -0500 muon (1.1.0-0ubuntu1) natty; urgency=low * New upstream release -- Jonathan Thomas Sun, 16 Jan 2011 13:54:10 -0500 muon (1.0.95-0ubuntu5) natty; urgency=low * debian/copyright: - Fix syntax - Provide more info about origin of moo.ogg * debian/watch: - Add watch file -- Michael Terry Fri, 14 Jan 2011 16:22:45 -0600 muon (1.0.95-0ubuntu4) natty; urgency=low * Add missing depenencies on kdesudo and software-properties-kde to the libmuonprivate1 package, as these programs are required for running the Software Sources editor. -- Jonathan Thomas Tue, 11 Jan 2011 10:44:31 -0500 muon (1.0.95-0ubuntu3) natty; urgency=low * Remove manual depenencies against libdebconf-kde0 from various binary packages, since libdebconf-kde is now fixed so that dh_shlibs can pick it up as a dependency -- Jonathan Thomas Mon, 10 Jan 2011 13:04:31 -0500 muon (1.0.95-0ubuntu2) natty; urgency=low * Try to fix the breaks/replaces relationship between libmuonprivate1 and older muon packages. * Update debian/copyright for new copyright holders -- Jonathan Thomas Tue, 04 Jan 2011 16:57:21 -0500 muon (1.0.95-0ubuntu1~maverick1) maverick; urgency=low * New upstream release candidate: - Add a new libmuonprivate1 package for the new libmuonprivate library which was formerly a static library - Create debian/not-installed and place the development symlink for libmuonprivate in it, since it is a private library * Port the packaging to the debhelper 8 standard: - Bump debian/compat to 8 - Bump the build-depend version on debhelper to 8.0.0~ - Place the debhelper options after the sequence in debian/rules * Add a homepage field to debian/control with Muon's homepage -- Jonathan Thomas Mon, 03 Jan 2011 14:28:31 -0500 muon (1.0.90-0ubuntu1) natty; urgency=low * New upstream release: - Remove linker fix patch, applied upstream -- Jonathan Thomas Mon, 20 Dec 2010 21:25:02 -0500 muon (1.0.80-0ubuntu2) natty; urgency=low * Backport a patch from trunk to support linking with ld when the --as-needed link flag is passed. -- Jonathan Thomas Sun, 05 Dec 2010 21:53:32 -0500 muon (1.0.80-0ubuntu1) natty; urgency=low * New upstream beta release: - Added a new muon-installer package for the Muon Software Center -- Jonathan Thomas Sun, 05 Dec 2010 13:02:27 -0500 muon (1.0.60-0ubuntu1) natty; urgency=low * New upstream alpha release: (LP: #632457, #633235, #633295) - Bump build-depend version on libqapt-dev to 1.0.60 or greater - Add new packages muon-updater and muon-notifier -- Jonathan Thomas Thu, 04 Nov 2010 00:31:49 -0400 muon (1.0.3-0ubuntu1) maverick; urgency=low * New upstream release -- Jonathan Thomas Mon, 01 Nov 2010 23:25:09 -0400 muon (1.0.2-0ubuntu1) maverick; urgency=low * New upstream bugfix release -- Jonathan Thomas Mon, 13 Sep 2010 18:15:58 -0400 muon (1.0.1-0ubuntu3) maverick; urgency=low * Add a manpage (LP: #617465) -- Jonathan Thomas Tue, 31 Aug 2010 13:56:24 -0400 muon (1.0.1-0ubuntu2) maverick; urgency=low * Add a build-depend on apt-xapian-index since we now call it in the postinst script -- Jonathan Thomas Thu, 26 Aug 2010 20:50:00 -0400 muon (1.0.1-0ubuntu1) maverick; urgency=low * New upstream bugfix release * Add debian/muon.postinst to run update-apt-xapian-index -u to ensure the xapian index is there -- Jonathan Thomas Thu, 26 Aug 2010 12:53:00 -0400 muon (1.0-0ubuntu1) maverick; urgency=low * New upstream release -- Jonathan Thomas Wed, 11 Aug 2010 11:09:20 -0400 muon (0.5.0-0ubuntu1) maverick; urgency=low * Initial release -- Jonathan Thomas Thu, 05 Aug 2010 15:24:13 -0400 debian/libmuonprivate2.install0000664000000000000000000000071412332647336013715 0ustar usr/lib/libmuonprivate.so.2* usr/lib/libmuonapt.so usr/lib/kde4/muon-appsbackend.so usr/lib/kde4/muon-knsbackend.so usr/share/kde4/apps/libmuon/moo.ogg usr/share/kde4/apps/libmuon/categories/* usr/share/kde4/services/muon-applications-backend.desktop usr/share/kde4/services/muon-knsplasmoids-backend.desktop usr/share/kde4/services/muon-knscomics-backend.desktop usr/share/kde4/servicetypes/muonbackendplugin.desktop usr/share/locale/*/LC_MESSAGES/libmuon.mo debian/control0000664000000000000000000001067412332647336010614 0ustar Source: muon Section: kde Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Jonathan Thomas Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.5.0), cmake, pkg-config, kdelibs5-dev, libqapt-dev (>= 2.1.70), libdebconf-kde-dev, libqjson-dev, libqoauth-dev, libattica-dev Standards-Version: 3.9.4 Homepage: https://projects.kde.org/projects/extragear/sysadmin/muon/ Package: muon Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime, apt-xapian-index, libmuonprivate2 (= ${binary:Version}) Recommends: muon-updater Description: package manager for KDE Muon is a graphical package manager for KDE. . Features of note include: * A powerful, yet intuitive interface * Fast, accurate package search using the apt-xapian index and the Synaptic search algorithm * Support for filtering packages by status and category * Media change support * Support for configuring packages through the debconf system * Warn about/disallow the installation of untrusted packages, depending on APT settings * Uses Polkit for running privileged actions for enhanced security, convenience, and desktop integration * Power management suspension during package downloads, installations and removals * Support for download the latest changelog of a package * Package screenshots Package: muon-installer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime, app-install-data, apt-xapian-index, libmuonprivate2 (= ${binary:Version}) Recommends: app-install-data-partner Description: Utility for browsing, installing, and removing applications The Muon Software Center lets you browse and install thousands of applications available for Ubuntu. You can view available applications by category, or search quickly by name or description. You can also examine the applications already installed, and remove those you no longer need. . To install or remove software using the Center, you need administrator access on the computer. Package: muon-discover Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime, app-install-data, apt-xapian-index, libmuonprivate2 (= ${binary:Version}) 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: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime, libmuonprivate2 (= ${binary:Version}) 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: ${shlibs:Depends}, ${misc:Depends}, muon-updater, ubuntu-release-upgrader-qt, update-notifier-common 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: libmuonprivate2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, kdesudo, software-properties-kde Breaks: muon-installer (<< 1.3.65-0ubuntu2), libmuonprivate1 Replaces: muon-installer (<< 1.3.65-0ubuntu2), libmuonprivate1 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 Architecture: any Priority: extra Depends: ${misc:Depends}, libmuonprivate2 (= ${binary:Version}), muon (= ${binary:Version}) | muon-updater (= ${binary:Version}) | muon-notifier (= ${binary:Version}) Recommends: qapt-dbg, kdelibs5-dbg Description: Muon debugging symbols This package contains debugging symbols for Muon. When Muon crashes, in most cases this package is needed to get a backtrace that is useful for developers. If you have experienced a Muon crash without this package installed, please install it, try to reproduce the problem and fill a bug report with a new backtrace attached. debian/rules0000775000000000000000000000016112332647336010257 0ustar #!/usr/bin/make -f %: dh $@ --dbg-package=muon-dbg --with kde --parallel override_dh_auto_test: # Do nothing debian/patches/0000775000000000000000000000000012421473750010624 5ustar debian/patches/series0000664000000000000000000000034512421473750012043 0ustar upstream_Don-t-post-another-notification-if-the-data-didn-t-c.patch upstream_Check-for-the-number-of-updates-rather-than-checking.patch upstream_Fix-threading-problem-involving-KSharedConfig.patch kubuntu_fix-releasechecker.diff debian/patches/upstream_Don-t-post-another-notification-if-the-data-didn-t-c.patch0000664000000000000000000001312512332647336025337 0ustar From a882eeb2574af5fe7931166787911cb09975d12c Mon Sep 17 00:00:00 2001 From: Lukas Appelhans Date: Thu, 3 Apr 2014 01:21:28 +0200 Subject: [PATCH] Don't post another notification if the data didn't change! BUG:331434 Conflicts: libmuon/resources/AbstractKDEDModule.cpp --- libmuon/resources/AbstractKDEDModule.cpp | 27 ++++++++++++++++++++++----- libmuon/resources/AbstractKDEDModule.h | 9 +++++---- libmuon/resources/AbstractResource.h | 1 + 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/libmuon/resources/AbstractKDEDModule.cpp b/libmuon/resources/AbstractKDEDModule.cpp index df9b6fb..75fa3df 100644 --- a/libmuon/resources/AbstractKDEDModule.cpp +++ b/libmuon/resources/AbstractKDEDModule.cpp @@ -37,7 +37,14 @@ class AbstractKDEDModule::Private { public: Private(AbstractKDEDModule * par, const QString &n, const QString &i) - : q(par), name(n), iconName(i), systemUpToDate(true), updateType(AbstractKDEDModule::NormalUpdate), statusNotifier(0) {} + : q(par), + name(n), + iconName(i), + systemUpToDate(true), + updateType(AbstractKDEDModule::NormalUpdate), + statusNotifier(0), + updateCount(0), + securityUpdateCount(0) {} ~Private() {} void __k__showMuon(); @@ -50,6 +57,8 @@ public: AbstractKDEDModule::UpdateType updateType; KStatusNotifierItem * statusNotifier; bool verbose; + int updateCount; + int securityUpdateCount; }; AbstractKDEDModule::AbstractKDEDModule(const QString &name, const QString &iconName, QObject * parent) @@ -119,14 +128,13 @@ void AbstractKDEDModule::setSystemUpToDate(bool systemUpToDate, int updateCount, void AbstractKDEDModule::setSystemUpToDate(bool systemUpToDate, int updateCount, int securityUpdateCount, UpdateType updateType, Notification notification) { - d->systemUpToDate = systemUpToDate; - d->updateType = updateType; if (!systemUpToDate) { emit systemUpdateNeeded(); //TODO: Better message strings QString message; QString icon; - if (d->updateType == SecurityUpdate) { + + if (updateType == SecurityUpdate) { message = i18n("A security update is available for your system."); icon = "security-low"; } else { @@ -145,7 +153,12 @@ void AbstractKDEDModule::setSystemUpToDate(bool systemUpToDate, int updateCount, d->statusNotifier->setOverlayIconByName(icon); d->statusNotifier->setToolTip(icon, message, i18n("A system update is recommended")); d->statusNotifier->setStatus(KStatusNotifierItem::Active); - if (notification == ShowNotification) { + + if (notification == ShowNotification || + (notification == ShowNotificationIfInformationChanged + && (d->updateCount != updateCount + || d->securityUpdateCount != securityUpdateCount + || d->updateType != updateType))) { KNotification::event("Update", i18n("System update available"), message, KIcon("svn-update").pixmap(KIconLoader::SizeMedium), nullptr, KNotification::CloseOnTimeout, KComponentData("muonabstractnotifier")); } } else { @@ -153,6 +166,10 @@ void AbstractKDEDModule::setSystemUpToDate(bool systemUpToDate, int updateCount, d->statusNotifier->setStatus(KStatusNotifierItem::Passive); d->statusNotifier->setToolTip("security-high", i18n("Your system is up-to-date."), i18n("No system update available")); } + d->updateCount = updateCount; + d->securityUpdateCount = securityUpdateCount; + d->systemUpToDate = systemUpToDate; + d->updateType = updateType; } #include "AbstractKDEDModule.moc" diff --git a/libmuon/resources/AbstractKDEDModule.h b/libmuon/resources/AbstractKDEDModule.h index a88b9f8..4eb1196 100644 --- a/libmuon/resources/AbstractKDEDModule.h +++ b/libmuon/resources/AbstractKDEDModule.h @@ -36,7 +36,8 @@ public: }; enum Notification { ShowNotification = 0, - DontShowNotification = 1 + DontShowNotification = 1, + ShowNotificationIfInformationChanged = 2 }; Q_ENUMS(UpdateType); virtual ~AbstractKDEDModule(); @@ -54,9 +55,9 @@ signals: protected: AbstractKDEDModule(const QString &name, const QString &iconName, QObject * parent); - void setSystemUpToDate(bool systemUpToDate, UpdateType updateType = NormalUpdate, Notification notification = ShowNotification); - void setSystemUpToDate(bool systemUpToDate, int updateCount, UpdateType updateType = NormalUpdate, Notification notification = ShowNotification); - void setSystemUpToDate(bool systemUpToDate, int updateCount, int securityUpdateCount, UpdateType updateType = NormalUpdate, Notification notification = ShowNotification); + void setSystemUpToDate(bool systemUpToDate, UpdateType updateType = NormalUpdate, Notification notification = ShowNotificationIfInformationChanged); + void setSystemUpToDate(bool systemUpToDate, int updateCount, UpdateType updateType = NormalUpdate, Notification notification = ShowNotificationIfInformationChanged); + void setSystemUpToDate(bool systemUpToDate, int updateCount, int securityUpdateCount, UpdateType updateType = NormalUpdate, Notification notification = ShowNotificationIfInformationChanged); private: class Private; diff --git a/libmuon/resources/AbstractResource.h b/libmuon/resources/AbstractResource.h index dc4102d..0fb3d74 100644 --- a/libmuon/resources/AbstractResource.h +++ b/libmuon/resources/AbstractResource.h @@ -23,6 +23,7 @@ #include #include +#include #include "libmuonprivate_export.h" #include "PackageState.h" -- 1.9.1 debian/patches/kubuntu_fix-releasechecker.diff0000664000000000000000000000177512421475023016771 0ustar Description: Fix finding release checker It looks in the wrong place for release checker and does not find it Author: Jonathan Riddell Bug-Ubuntu: https://bugs.launchpad.net/bugs/1383767 Origin: me Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/muon/+bug/1383767 Forwarded: to do Last-Update: 2014-21-10 Reviewed-By: Aleix Pol --- muon-2.2.0.orig/libmuonapt/QAptActions.cpp +++ muon-2.2.0/libmuonapt/QAptActions.cpp @@ -541,7 +541,7 @@ void QAptActions::checkDistUpgrade() if(!QFile::exists("/usr/lib/python3/dist-packages/DistUpgrade/DistUpgradeFetcherKDE.py")) { qWarning() << "Couldn't find the /usr/lib/python3/dist-packages/DistUpgrade/DistUpgradeFetcherKDE.py file"; } - QString checkerFile = KStandardDirs::locate("data", "muon-notifier/releasechecker"); + QString checkerFile = KStandardDirs::locate("data", "muonapplicationnotifier/releasechecker"); if(checkerFile.isEmpty()) { qWarning() << "Couldn't find the releasechecker script"; } debian/patches/upstream_Fix-threading-problem-involving-KSharedConfig.patch0000664000000000000000000000515112332647336024400 0ustar From 70cc5d6532829d8bf1a95cd46ca5403eb195e6ec Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Wed, 7 May 2014 18:16:37 +0200 Subject: [PATCH] Fix threading problem involving KSharedConfig Stop using it in favor of QSharedPointer, so that we don't access the shared database, which is not thread-safe. BUG: 333599 --- libmuon/backends/ApplicationBackend/Application.cpp | 7 +------ libmuon/backends/ApplicationBackend/Application.h | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libmuon/backends/ApplicationBackend/Application.cpp b/libmuon/backends/ApplicationBackend/Application.cpp index dda91e6..9ffae21 100644 --- a/libmuon/backends/ApplicationBackend/Application.cpp +++ b/libmuon/backends/ApplicationBackend/Application.cpp @@ -51,6 +51,7 @@ Application::Application(const QString& fileName, QApt::Backend* backend) : AbstractResource(0) + , m_data(new KConfig(fileName, KConfig::SimpleConfig)) , m_backend(backend) , m_package(0) , m_isValid(true) @@ -60,7 +61,6 @@ Application::Application(const QString& fileName, QApt::Backend* backend) { static QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP"); - m_data = desktopContents(fileName); m_isTechnical = getField("NoDisplay").toLower() == "true" || !hasField("Exec") || getField("NotShowIn", QByteArray()).contains(currentDesktop) @@ -435,11 +435,6 @@ int Application::downloadSize() return m_package->downloadSize(); } -KSharedConfigPtr Application::desktopContents(const QString& filename) -{ - return KSharedConfig::openConfig(filename, KConfig::SimpleConfig); -} - void Application::clearPackage() { m_package = 0; diff --git a/libmuon/backends/ApplicationBackend/Application.h b/libmuon/backends/ApplicationBackend/Application.h index 00f29b1..af31cfc 100644 --- a/libmuon/backends/ApplicationBackend/Application.h +++ b/libmuon/backends/ApplicationBackend/Application.h @@ -100,7 +100,7 @@ private slots: private: QString buildDescription(const QByteArray& data, const QString& source); - KSharedConfigPtr m_data; + QSharedPointer m_data; QApt::Backend *m_backend; QApt::Package *m_package; QByteArray m_packageName; @@ -110,7 +110,6 @@ private: bool m_isExtrasApp; bool m_sourceHasScreenshot; - KSharedConfigPtr desktopContents(const QString& filename); QApt::PackageList addons(); QVector > locateApplication(const QString &_relPath, const QString &menuId) const; bool hasField(const char* field) const; -- 1.9.1 debian/patches/upstream_Check-for-the-number-of-updates-rather-than-checking.patch0000664000000000000000000000225412332647336025472 0ustar From 4a5e63d925c7e6538b2fc025c1c86cfc40e2bd48 Mon Sep 17 00:00:00 2001 From: Rohan Garg Date: Sun, 13 Apr 2014 20:17:01 +0200 Subject: [PATCH] Check for the number of updates rather than checking for the updates-available file since the file can exist even when there are no updates REVIEWED-BY: Aleix Pol --- libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp b/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp index c91605f..fe50193 100644 --- a/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp +++ b/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp @@ -139,7 +139,7 @@ void ApplicationNotifier::parseUpdateInfo() // ';' not found, apt-check broke :(" - if (QFile::exists("/var/lib/update-notifier/updates-available")) { + if (securityUpdates > 0 || updates > 0) { setSystemUpToDate(false, updates, securityUpdates, securityUpdates > 0 ? AbstractKDEDModule::SecurityUpdate : NormalUpdate); } else { setSystemUpToDate(true); -- 1.9.1 debian/compat0000664000000000000000000000000212332647336010377 0ustar 9 debian/watch0000664000000000000000000000010512332647336010226 0ustar version=3 http://launchpad.net/muon/+download .*/muon-(.+)\.tar\.bz2 debian/muon.manpages0000664000000000000000000000001612332647336011671 0ustar debian/muon.1 debian/muon-updater.install0000664000000000000000000000025112332647336013207 0ustar /usr/bin/muon-updater usr/share/applications/kde4/muon-updater.desktop /usr/share/kde4/apps/muon-updater/muon-updaterui.rc usr/share/locale/*/LC_MESSAGES/muon-updater.modebian/muon-installer.install0000664000000000000000000000051412332647336013542 0ustar usr/bin/muon-installer usr/share/applications/kde4/muon-installer.desktop usr/share/kde4/apps/muon-installer/ClickableImage.qml usr/share/kde4/apps/muon-installer/ThumbnailView.qml usr/share/kde4/apps/muon-installer/muon-installerui.rc usr/share/kde4/config.kcfg/muon-installer.kcfg usr/share/locale/*/LC_MESSAGES/muon-installer.mo debian/not-installed0000664000000000000000000000003212332647336011674 0ustar usr/lib/libmuonprivate.so debian/muon.install0000664000000000000000000000073512332647336011554 0ustar usr/bin/muon usr/share/applications/kde4/muon.desktop usr/share/icons/hicolor/22x22/apps/muon.png usr/share/icons/hicolor/128x128/apps/muon.png usr/share/icons/hicolor/32x32/apps/muon.png usr/share/icons/hicolor/16x16/apps/muon.png usr/share/icons/hicolor/64x64/apps/muon.png usr/share/icons/hicolor/48x48/apps/muon.png usr/share/icons/hicolor/256x256/apps/muon.png usr/share/kde4/apps/muon/muonui.rc usr/share/kde4/config.kcfg/muon.kcfg usr/share/locale/*/LC_MESSAGES/muon.mo debian/muon.postinst0000664000000000000000000000031412332647336011762 0ustar #!/bin/sh set -e #DEBHELPER# # make sure we update the index so that on first install # we have something to show (LP: #617397) if [ "$1" = "configure" ];then update-apt-xapian-index -u || true fi debian/muon-notifier.install0000664000000000000000000000047612332647336013373 0ustar /usr/lib/kde4/kded_muonapplicationnotifier.so /usr/share/kde4/apps/muonabstractnotifier/muonabstractnotifier.notifyrc /usr/share/kde4/apps/muonapplicationnotifier/muonapplicationnotifier.notifyrc /usr/share/kde4/apps/muonapplicationnotifier/releasechecker /usr/share/kde4/services/kded/muonapplicationnotifier.desktop debian/copyright0000664000000000000000000001121412332647336011133 0ustar Format: http://dep.debian.net/deps/dep5/ Upstream-Name: Muon Package Management Suite Upstream-Contact: Jonathan Thomas Source: https://projects.kde.org/projects/extragear/sysadmin/muon/repository Files: * Copyright: 2009-2010, Jonathan Thomas 2009, Harald Sitter 2010, Guillaume Martres License: GPL-2 or 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 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 . . 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 3 can be found in the file /usr/share/common-licenses/GPL-3. Files: muon/config/ManagerSettingsDialog.cpp updater/config/UpdaterSettingsDialog.cpp installer/ApplicationLauncher.* installer/effects/* installer/ClickableLabel.* installer/CategoryView/CategoryDrawer.h installer/BreadcrumbWidget/BreadcrumbItemButton.* installer/ApplicationModel/ApplicationDelegate.* libmuon/settings/* Copyright: 2006, Peter Penz 2010, Jonathan Thomas 2008, Daniel Nicoletti 2009, Rafael Fernández López 2009, Seb Ruiz 2006, Aaron Seigo 2007, Ivan Cukic 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. If not, see . . 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 . . 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. Files: debian/* Copyright: 2010, Jonathan Thomas 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 (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. If not, see . . 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. debian/muon-discover.install0000664000000000000000000000115312332647336013363 0ustar usr/bin/muon-discover usr/lib/kde4/imports/* usr/share/applications/kde4/muon-discover.desktop usr/share/applications/kde4/muon-discover-category.desktop usr/share/icons/hicolor/16x16/apps/muondiscover.png usr/share/icons/hicolor/22x22/apps/muondiscover.png usr/share/icons/hicolor/32x32/apps/muondiscover.png usr/share/icons/hicolor/48x48/apps/muondiscover.png usr/share/icons/hicolor/128x128/apps/muondiscover.png usr/share/kde4/apps/desktoptheme/muon-contenttheme/ usr/share/kde4/apps/muon-discover/featured.json usr/share/kde4/apps/muon-discover/muon-discoverui.rc usr/share/locale/*/LC_MESSAGES/muon-discover.mo debian/muon.10000664000000000000000000000167312332647336010250 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH QT: "1" "August 2010" "Qt: 4.7.0" "User Commands" .SH NAME Qt: \- manual page for Qt: 4.7.0 .SH SYNOPSIS .B muon [\fIQt-options\fR] [\fIKDE-options\fR] .SH DESCRIPTION A package manager .SS "Generic options:" .TP \fB\-\-help\fR Show help about options .TP \fB\-\-help\-qt\fR Show Qt specific options .TP \fB\-\-help\-kde\fR Show KDE specific options .TP \fB\-\-help\-all\fR Show all options .TP \fB\-\-author\fR Show author information .TP \fB\-v\fR, \fB\-\-version\fR Show version information .TP \fB\-\-license\fR Show license information .TP \fB\-\-\fR End of options .PP KDE Development Platform: 4.5.00 (KDE 4.5.0) Muon Package Manager: 1.0.1 .SH "SEE ALSO" The full documentation for .B Qt: is maintained as a Texinfo manual. If the .B info and .B Qt: programs are properly installed at your site, the command .IP .B info Qt: .PP should give you access to the complete manual.