--- kpackagekit-0.5.4.orig/debian/control +++ kpackagekit-0.5.4/debian/control @@ -0,0 +1,20 @@ +Source: kpackagekit +Section: kde +Priority: extra +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Sebastian Heinlein +Build-Depends: cdbs, debhelper (>= 7.4.10), pkg-kde-tools, libpackagekit-qt-dev (>= 0.4.7), kdelibs5-dev, libdbus-1-dev, quilt +Standards-Version: 3.8.3 +Homepage: http://www.packagekit.org + +Package: kpackagekit +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, polkit-kde-1, software-properties-kde, packagekit (>= 0.4.7), update-manager-kde +Provides: packagekit-kde +Description: KDE package management tool using PackageKit + PackageKit allows to perform simple software management tasks over a DBus + interface e.g. refreshing the cache, updating, installing and removing + software packages or searching for multimedia codecs and file handlers. + . + This package provides a package manager and a update notifier. + --- kpackagekit-0.5.4.orig/debian/rules +++ kpackagekit-0.5.4/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f + +export KUBUNTU_DESKTOP_POT=playground-sysadmin + +%: + dh --with kde --with quilt $@ --- kpackagekit-0.5.4.orig/debian/compat +++ kpackagekit-0.5.4/debian/compat @@ -0,0 +1 @@ +7 --- kpackagekit-0.5.4.orig/debian/changelog +++ kpackagekit-0.5.4/debian/changelog @@ -0,0 +1,216 @@ +kpackagekit (0.5.4-0ubuntu4.3) lucid-proposed; urgency=low + + * Fix patch kubuntu_06_no_automatic_updates.diff to make it apply + Closes LP: #586497 + + -- Jonathan Riddell Wed, 23 Jun 2010 10:58:50 +0100 + +kpackagekit (0.5.4-0ubuntu4.2) lucid-proposed; urgency=low + + * Add kubuntu_06_no_automatic_updates.diff, don't run automatic + install updates from KPackageKit settings. Apt already has its + own settings and ability to do this. Closes LP: #586497 + + -- Jonathan Riddell Fri, 18 Jun 2010 12:11:45 +0100 + +kpackagekit (0.5.4-0ubuntu4.1) lucid-proposed; urgency=low + + * Replace dependency on kdebase-workspace-bin with a dependency on + polkit-kde-1 (LP: #588709) + + -- Jonathan Thomas Wed, 02 Jun 2010 09:43:09 -0400 + +kpackagekit (0.5.4-0ubuntu4) lucid; urgency=low + + * Add kubuntu_05_hide_rollback_button.diff since the Rollback feature is + not implemented in any backend (Or even in KPackageKit) (LP: #527606) + + -- Jonathan Thomas Thu, 25 Mar 2010 20:05:15 -0400 + +kpackagekit (0.5.4-0ubuntu3) lucid; urgency=low + + * Add depends on update-manager-kde, needed for distro upgrade + + -- Jonathan Riddell Mon, 08 Mar 2010 18:47:26 +0000 + +kpackagekit (0.5.4-0ubuntu2) lucid; urgency=low + + * Add quilt build-dep + + -- Jonathan Riddell Fri, 29 Jan 2010 11:17:45 +0000 + +kpackagekit (0.5.4-0ubuntu1) lucid; urgency=low + + * New upstream release + + -- Jonathan Riddell Wed, 27 Jan 2010 19:13:32 +0000 + +kpackagekit (0.4.2-0ubuntu3) karmic; urgency=low + + * Add back kubuntu_04_translations_catalogue.diff to load correct + catalogue for translations. Closes LP: #455342 + + -- Jonathan Riddell Mon, 19 Oct 2009 11:35:02 +0100 + +kpackagekit (0.4.2-0ubuntu2) karmic; urgency=low + + * Replace policykit-kde dep with kdebase-workspace-bin + + -- Jonathan Riddell Thu, 20 Aug 2009 23:33:45 +0100 + +kpackagekit (0.4.2-0ubuntu1) karmic; urgency=low + + [ Jonathan Thomas ] + * New upstream release (LP: #416077): + - Add kubuntu_03_fix_ftbfs.patch to make CMake look for gettext + * Bump Standards-Version to 3.8.3 + * Remove unecessary build-depend on cmake, kdelibs5-dev brings it in + + [ Jonathan Riddell ] + * Add kubuntu_04_tray_icon.patch to simplify notification and show + tray icon + + -- Jonathan Riddell Thu, 20 Aug 2009 13:36:09 +0100 + +kpackagekit (0.4.1.1-0ubuntu2) karmic; urgency=low + + * Turn KPackageKit's update notifier back on + + -- Jonathan Thomas Wed, 17 Jun 2009 12:20:27 -0400 + +kpackagekit (0.4.1.1-0ubuntu1) karmic; urgency=low + + * New upstream release + * Fixed debian/rules: + - use pkg-kde-tools instead of cdbs kde4.mk + * Fixed debian/control: + - Bump Standards-Versio to 3.8.1 + - build-depends on libpackagekit-qt-dev >= 0.4.7 + - provides packagekit-kde for naming convention with packagekit-* + packages + - build-depends on libdbus-1-dev + + -- Anthony Mercatante Tue, 16 Jun 2009 13:21:27 +0200 + +kpackagekit (0.4-0ubuntu9) karmic; urgency=low + + * Upload jaunty-proposed change to karmic + + -- Jonathan Riddell Tue, 28 Apr 2009 12:38:44 +0100 + +kpackagekit (0.4-0ubuntu8.1) jaunty-proposed; urgency=low + + * Add kubuntu_04_translations_catalogue.diff + Closes LP: #368538 "translations not loaded" + + -- Jonathan Riddell Tue, 28 Apr 2009 12:28:43 +0100 + +kpackagekit (0.4-0ubuntu8) jaunty; urgency=low + + * Add kubuntu_03_scroll_per_pixel.diff to stop obnoxious per-item scrolling + (LP: #275196) + + -- Jonathan Thomas Wed, 08 Apr 2009 16:11:53 -0400 + +kpackagekit (0.4-0ubuntu7) jaunty; urgency=low + + * Add KUBUNTU_DESKTOP_POT + + -- Jonathan Riddell Wed, 08 Apr 2009 15:56:29 +0100 + +kpackagekit (0.4-0ubuntu6) jaunty; urgency=low + + * Update translations from KDE SVN + + -- Jonathan Riddell Mon, 06 Apr 2009 14:16:25 +0100 + +kpackagekit (0.4-0ubuntu5) jaunty; urgency=low + + * Fixed debian/rules: + - We don't want to list the kpackagekit kded service as we + don't use it + - Fixes LP: #349442 + * Removed kubuntu_02_no_update_notifier.diff as useless + * Fixed kubuntu_03_deb_preference.deb: + - Renamed to kubuntu_02_deb_preference.deb.patch + - Fixed debian/series so that the patch applies + + -- Anthony Mercatante Fri, 27 Mar 2009 17:05:21 +0100 + +kpackagekit (0.4-0ubuntu4) jaunty; urgency=low + + * Add kubuntu_03_deb_preference.deb make it higher preference than + gdebi or ark + + -- Jonathan Riddell Wed, 18 Mar 2009 21:19:30 +0000 + +kpackagekit (0.4-0ubuntu3) jaunty; urgency=low + + * Add translations from KDE SVN into po/ + + -- Jonathan Riddell Wed, 18 Mar 2009 20:35:04 +0000 + +kpackagekit (0.4-0ubuntu2) jaunty; urgency=low + + * Revert back to update-notifier-kde + - update kubuntu_01_editsources.patch to hide update widgets + - add kubuntu_02_no_update_notifier.diff to not run update notifier daemon + + -- Jonathan Riddell Tue, 17 Mar 2009 13:38:45 +0000 + +kpackagekit (0.4-0ubuntu1) jaunty; urgency=low + + * New upstream release + * Fixed kubuntu_01_editsources.patches to apply correctly. + + -- Anthony Mercatante Tue, 24 Feb 2009 11:16:02 +0100 + +kpackagekit (0.3.1+20081211-0ubuntu3) jaunty; urgency=low + + * Update edit sources patch to hide origin of sources from + the user (it's handled instead by software-properties-kde) + - kubuntu_01_editsources.patch (LP: #328677) + * Also corrected the fact that software-properties-kde never + refreshed the sources after editing. + + -- Roderick B. Greening Thu, 12 Feb 2009 15:40:20 -0330 + +kpackagekit (0.3.1+20081211-0ubuntu2) jaunty; urgency=low + + * Add support to edit software properties + - kubuntu_01_editsources.patch + * Add build dep for quilt for above patch + * Remove duplicate cdbs build dep + + -- Roderick B. Greening Thu, 05 Feb 2009 10:53:26 -0330 + +kpackagekit (0.3.1+20081211-0ubuntu1) jaunty; urgency=low + + * New SVN snapshot + + -- Sebastian Heinlein Thu, 11 Dec 2008 19:39:14 +0100 + +kpackagekit (0.3.1-0ubuntu3) jaunty; urgency=low + + * Fixed deps, depends on packagekit instead of the backend... + * Removed the patch since kpackagekit-smart-icon is started by + kpackagekitd backend when needed. + * doesn't build-dep on quilt since no more pactches... + + -- Anthony Mercatante Tue, 20 Jan 2009 20:00:49 +0100 + +kpackagekit (0.3.1-0ubuntu2) jaunty; urgency=low + + * Fixed dependancies... Should depend on policykit-kde or + policykit-gnome + + -- Anthony Mercatante Tue, 20 Jan 2009 12:56:54 +0100 + +kpackagekit (0.3.1-0ubuntu1) jaunty; urgency=low + + * Initial release + * Added kubuntu_01_autostart_tray_icon.diff: + - Tray icon app to autostart with KDE session + * Tarball rebuilt, adding missing COPYING file + + -- Anthony Mercatante Mon, 19 Jan 2009 12:33:37 +0100 --- kpackagekit-0.5.4.orig/debian/copyright +++ kpackagekit-0.5.4/debian/copyright @@ -0,0 +1,42 @@ +This package was debianized by: + + Sebastian Heinlein on Thu, 11 Dec 2008 19:39:14 +0100 + +It was downloaded from: + + svn://anonsvn.kde.org/home/kde/trunk/playground/sysadmin/kpackagekit + +Upstream Author(s): + + Daniel Nicoletti + +Copyright: + + Copyright (C) 2008 Daniel Nicoletti + Copyright (C) 2007 Ivan Cukic + Copyright (c) 2008, Adrien Bustany, + Copyright (C) 2008 by Trever Fischer + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is: + + Copyright C) 2008, Sebastian Heinlein + +and is licensed under the GPL, see above. --- kpackagekit-0.5.4.orig/debian/patches/series +++ kpackagekit-0.5.4/debian/patches/series @@ -0,0 +1,4 @@ +kubuntu_01_edit_sources.patch +kubuntu_04_tray_icon.patch +kubuntu_05_hide_rollback_button.diff +kubuntu_06_no_automatic_updates.diff --- kpackagekit-0.5.4.orig/debian/patches/kubuntu_06_no_automatic_updates.diff +++ kpackagekit-0.5.4/debian/patches/kubuntu_06_no_automatic_updates.diff @@ -0,0 +1,21 @@ +Index: kpackagekit-0.5.4/SmartIcon/KpkUpdateIcon.cpp +=================================================================== +--- kpackagekit-0.5.4.orig/SmartIcon/KpkUpdateIcon.cpp 2010-06-23 10:57:47.000000000 +0100 ++++ kpackagekit-0.5.4/SmartIcon/KpkUpdateIcon.cpp 2010-06-23 10:58:27.159708413 +0100 +@@ -247,6 +247,7 @@ + KConfig config("KPackageKit"); + KConfigGroup checkUpdateGroup(&config, "CheckUpdate"); + uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault); ++ /* + if (updateType == KpkEnum::None) { + // update none + notifyUpdates(); +@@ -306,6 +307,8 @@ + } + } + } ++ */ ++ notifyUpdates(); + } + decreaseRunning(); + } --- kpackagekit-0.5.4.orig/debian/patches/kubuntu_05_hide_rollback_button.diff +++ kpackagekit-0.5.4/debian/patches/kubuntu_05_hide_rollback_button.diff @@ -0,0 +1,22 @@ +Index: kpackagekit-0.5.4/Updater/KpkHistory.cpp +=================================================================== +--- kpackagekit-0.5.4.orig/Updater/KpkHistory.cpp 2010-03-25 19:59:04.089433287 -0400 ++++ kpackagekit-0.5.4/Updater/KpkHistory.cpp 2010-03-25 19:59:08.729414827 -0400 +@@ -42,12 +42,12 @@ + connect(searchLineKLE, SIGNAL(textChanged(const QString &)), + m_proxyModel, SLOT(setFilterRegExp(const QString &))); + +- setButtons(KDialog::User2 | KDialog::User1 | KDialog::Close); ++ setButtons(/*KDialog::User2 | */KDialog::User1 | KDialog::Close); + +- setButtonText(KDialog::User2, i18n("Rollback")); +- setButtonIcon(KDialog::User2, KpkIcons::getIcon("go-previous")); +- // Dummy backend does not support this so we can't test +- enableButton(KDialog::User2, false); ++// setButtonText(KDialog::User2, i18n("Rollback")); ++// setButtonIcon(KDialog::User2, KpkIcons::getIcon("go-previous")); ++// // Dummy backend does not support this so we can't test ++// enableButton(KDialog::User2, false); + + setButtonText(KDialog::User1, i18n("Refresh transactions list")); + setButtonIcon(KDialog::User1, KpkIcons::getIcon("view-refresh")); --- kpackagekit-0.5.4.orig/debian/patches/kubuntu_01_edit_sources.patch +++ kpackagekit-0.5.4/debian/patches/kubuntu_01_edit_sources.patch @@ -0,0 +1,113 @@ +diff -ur kpackagekit-0.5.4/Settings/KpkSettings.cpp kpackagekit-0.5.4/Settings/KpkSettings.cpp +--- kpackagekit-0.5.4/Settings/KpkSettings.cpp 2009-12-07 18:31:35.000000000 +0000 ++++ kpackagekit-0.5.4/Settings/KpkSettings.cpp 2010-01-27 20:14:55.000000000 +0000 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + using namespace PackageKit; +@@ -58,7 +59,12 @@ + originGB->setEnabled(false); + } + +- intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"), KpkEnum::Hourly); ++ // Temporarily set origin bits to hidden as the implementation is incomplete. we will ++ // use software-properties-kde temporarily for editing sources until such time as ++ // the missing functionalisy is implemented. we still let the code execute, just ++ // hide the list widget so as to not confuse the user. ++ originGB-> setHidden(true); ++ + intervalCB->addItem(i18nc("Daily refresh the package cache", "Daily"), KpkEnum::Daily); + intervalCB->addItem(i18nc("Weekly refresh the package cache", "Weekly"), KpkEnum::Weekly); + intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly); +@@ -68,9 +74,17 @@ + autoCB->addItem(i18n("All updates"), KpkEnum::All); + autoCB->addItem(i18nc("None updates will be automatically installed", "None"), KpkEnum::None); + ++ // Hide settings that we configure with software-properties-kde ++ intervalL->hide(); ++ notifyUpdatesCB->hide(); ++ autoInsL->hide(); ++ intervalCB->hide(); ++ autoCB->hide(); ++ + connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges())); + connect(intervalCB, SIGNAL(currentIndexChanged(int)), this, SLOT(checkChanges())); + connect(autoCB, SIGNAL(currentIndexChanged(int)), this, SLOT(checkChanges())); ++ connect( editSourcesPB, SIGNAL( clicked() ), this, SLOT( runSourcesEditor() ) ); + } + + void KpkSettings::on_showOriginsCB_stateChanged(int state) +@@ -112,6 +126,27 @@ + autoCB->setEnabled(enabled); + } + ++void KpkSettings::runSourcesEditor() ++{ ++ KProcess* proc = new KProcess(this); ++ QStringList arguments; ++ QString cmd; ++ int winID = effectiveWinId(); ++ cmd = "software-properties-kde --attach " + QString::number(winID); ++ arguments << "/usr/lib/kde4/libexec/kdesu" << QString(cmd); ++ proc->setProgram(arguments); ++ find(winID)->setEnabled(false); ++ proc->start(); ++ connect( proc, SIGNAL( finished(int, QProcess::ExitStatus) ), ++ this, SLOT( sourcesEditorFinished() ) ); ++ ++} ++ ++void KpkSettings::sourcesEditorFinished() ++{ ++ find(effectiveWinId())->setEnabled(true); ++} ++ + void KpkSettings::load() + { + KConfig config("KPackageKit"); +diff -ur kpackagekit-0.5.4/Settings/KpkSettings.h kpackagekit-0.5.4/Settings/KpkSettings.h +--- kpackagekit-0.5.4/Settings/KpkSettings.h 2009-11-17 12:32:04.000000000 +0000 ++++ kpackagekit-0.5.4/Settings/KpkSettings.h 2010-01-27 20:05:24.000000000 +0000 +@@ -40,6 +40,8 @@ + void save(); + void defaults(); + void checkChanges(); ++ void runSourcesEditor(); ++ void sourcesEditorFinished(); + + signals: + void changed(bool state); +diff -ur kpackagekit-0.5.4/Settings/KpkSettings.ui kpackagekit-0.5.4/Settings/KpkSettings.ui +--- kpackagekit-0.5.4/Settings/KpkSettings.ui 2009-11-17 12:32:04.000000000 +0000 ++++ kpackagekit-0.5.4/Settings/KpkSettings.ui 2010-01-27 20:05:24.000000000 +0000 +@@ -79,6 +79,26 @@ + + + ++ ++ ++ ++ Qt::Vertical ++ ++ ++ ++ 20 ++ 40 ++ ++ ++ ++ ++ ++ ++ ++ &Edit Software Sources ++ ++ ++ + + + --- kpackagekit-0.5.4.orig/debian/patches/kubuntu_04_tray_icon.patch +++ kpackagekit-0.5.4/debian/patches/kubuntu_04_tray_icon.patch @@ -0,0 +1,18 @@ +--- kpackagekit/SmartIcon/KpkUpdateIcon.cpp 2009-11-17 18:25:12.000000000 +0000 ++++ kpackagekit/SmartIcon/KpkUpdateIcon.cpp 2010-01-27 19:30:07.000000000 +0000 +@@ -199,6 +199,7 @@ + + QString text; + text = i18n("You have %1", KpkStrings::infoUpdate(highState, packageGroups[highState].size())); ++ /* + int i; + for (i = 0; i < 5 && i < packageGroups[highState].size(); i++) { + text.append("
" + packageGroups[highState].at(i)->name() + "" + +@@ -209,6 +210,7 @@ + if (i > 0) { + text.append(i18np("
And another update", "
And %1 more updates", i)); + } ++ */ + + m_updateNotify->setText(text); + QStringList actions;