--- kpackagekit-0.4.2.orig/debian/changelog +++ kpackagekit-0.4.2/debian/changelog @@ -0,0 +1,151 @@ +kpackagekit (0.4.2-0ubuntu1) karmic; urgency=low + + * 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 Thomas Wed, 19 Aug 2009 15:53:08 -0400 + +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.4.2.orig/debian/control +++ kpackagekit-0.4.2/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), pkg-kde-tools, libpackagekit-qt-dev (>= 0.4.7), kdelibs5-dev, libdbus-1-dev +Standards-Version: 3.8.3 +Homepage: http://www.packagekit.org + +Package: kpackagekit +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-kde | policykit-gnome, software-properties-kde, packagekit (>= 0.4.7) +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.4.2.orig/debian/rules +++ kpackagekit-0.4.2/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +export KUBUNTU_DESKTOP_POT=playground-sysadmin --- kpackagekit-0.4.2.orig/debian/compat +++ kpackagekit-0.4.2/debian/compat @@ -0,0 +1 @@ +7 --- kpackagekit-0.4.2.orig/debian/copyright +++ kpackagekit-0.4.2/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.4.2.orig/debian/dirs +++ kpackagekit-0.4.2/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- kpackagekit-0.4.2.orig/debian/patches.old/kubuntu_02_deb_preference.deb.patch +++ kpackagekit-0.4.2/debian/patches.old/kubuntu_02_deb_preference.deb.patch @@ -0,0 +1,7 @@ +--- kpackagekit-0.4/Desktop/kpackagekit.desktop 2009-02-16 18:41:59.000000000 +0000 ++++ kpackagekit-0.4/Desktop/kpackagekit.desktop 2009-03-18 21:17:44.000000000 +0000 +@@ -48,3 +48,4 @@ + MimeType=application/x-rpm;application/x-deb; + Terminal=false + Categories=Qt;KDE;System;SoftwareManagement; ++InitialPreference=10 --- kpackagekit-0.4.2.orig/debian/patches.old/kubuntu_03_scroll_per_pixel.diff +++ kpackagekit-0.4.2/debian/patches.old/kubuntu_03_scroll_per_pixel.diff @@ -0,0 +1,531 @@ +Index: kpackagekit-0.4/AddRm/KpkAddRm.ui +=================================================================== +--- kpackagekit-0.4.orig/AddRm/KpkAddRm.ui 2009-03-20 19:56:28.000000000 -0400 ++++ kpackagekit-0.4/AddRm/KpkAddRm.ui 2009-03-20 19:56:33.000000000 -0400 +@@ -1,7 +1,8 @@ +- ++ ++ + KpkAddRm +- +- ++ ++ + + 0 + 0 +@@ -9,73 +10,73 @@ + 222 + + +- +- ++ ++ + 0 + 0 + + +- ++ + Add and Remove Software + +- +- ++ ++ + +- +- ++ ++ + 0 + +- +- ++ ++ + +- +- ++ ++ + Search packages + +- ++ + true + + + + +- +- +- ++ ++ ++ + 0 + 0 + + +- +- ++ ++ + 0 + + + + + +- +- +- ++ ++ ++ + 0 + +- +- +- +- ++ ++ ++ ++ + +- ++ + Filters + +- ++ + QToolButton::InstantPopup + +- ++ + Qt::ToolButtonTextBesideIcon + +- ++ + true + +- ++ + Qt::NoArrow + + +@@ -84,9 +85,9 @@ + + + +- ++ + +- ++ + All Packages + + +@@ -94,65 +95,68 @@ + + + +- +- +- +- ++ ++ ++ ++ + 2 + 0 + + +- ++ + + 300 + 0 + + +- ++ + + 0 + 2 + + +- +- ++ ++ + +- ++ ++ QAbstractItemView::ScrollPerPixel ++ ++ + false + +- ++ + true + +- ++ + true + +- ++ + false + +- ++ + false + +- ++ + false + + + +- +- ++ ++ + + +- +- ++ ++ + Find by name + + +- +- ++ ++ + Find by description + + +- +- ++ ++ + Find by file name + + +@@ -166,7 +170,7 @@ + + KpkTransactionBar + QWidget +-
KpkTransactionBar.h
++
KpkTransactionBar.h
+ 1 + + +Index: kpackagekit-0.4/AddRm/KpkRequirements.ui +=================================================================== +--- kpackagekit-0.4.orig/AddRm/KpkRequirements.ui 2009-03-20 19:55:26.000000000 -0400 ++++ kpackagekit-0.4/AddRm/KpkRequirements.ui 2009-03-20 19:55:44.000000000 -0400 +@@ -47,6 +47,9 @@ + + QAbstractItemView::SingleSelection + ++ ++ QAbstractItemView::ScrollPerPixel ++ + + + +Index: kpackagekit-0.4/AddRm/KpkReviewChanges.ui +=================================================================== +--- kpackagekit-0.4.orig/AddRm/KpkReviewChanges.ui 2009-03-20 19:54:12.000000000 -0400 ++++ kpackagekit-0.4/AddRm/KpkReviewChanges.ui 2009-03-20 19:54:24.000000000 -0400 +@@ -1,7 +1,8 @@ +- ++ ++ + KpkReviewChanges +- +- ++ ++ + + 0 + 0 +@@ -9,63 +10,66 @@ + 445 + + +- ++ + Review Changes - KPackageKit + +- +- +- +- ++ ++ ++ ++ + + 12 + 75 + true + + +- ++ + You selected the following packages to be INSTALLED/REMOVED, press ok to proceed: + +- ++ + Qt::AlignCenter + +- ++ + true + + + +- +- +- +- ++ ++ ++ ++ + 2 + 0 + + +- ++ + + 300 + 0 + + +- ++ + + 0 + 2 + + +- +- ++ ++ + +- ++ ++ QAbstractItemView::ScrollPerPixel ++ ++ + false + +- ++ + false + +- ++ + true + +- ++ + false + + +Index: kpackagekit-0.4/Updater/KpkUpdate.ui +=================================================================== +--- kpackagekit-0.4.orig/Updater/KpkUpdate.ui 2009-03-20 19:59:52.000000000 -0400 ++++ kpackagekit-0.4/Updater/KpkUpdate.ui 2009-03-20 19:59:55.000000000 -0400 +@@ -1,7 +1,8 @@ +- ++ ++ + KpkUpdate +- +- ++ ++ + + 0 + 0 +@@ -9,100 +10,103 @@ + 423 + + +- +- ++ ++ + +- +- ++ ++ + 0 + +- +- +- +- ++ ++ ++ ++ + 0 + 0 + + +- ++ + Qt::ScrollBarAlwaysOff + +- ++ + false + +- ++ + false + +- ++ + true + +- ++ ++ QAbstractItemView::ScrollPerPixel ++ ++ + true + +- ++ + true + +- ++ + true + +- ++ + false + +- ++ + false + +- ++ + false + +- ++ + true + + + +- +- ++ ++ + +- +- ++ ++ + +- +- ++ ++ + Apply all available updates + + + + +- +- ++ ++ + Refresh + + + + +- +- ++ ++ + History + + + + + +- +- +- ++ ++ ++ + + 16777215 + 100 + + +- ++ + QFrame::Sunken + +- ++ + true + +- +- ++ ++ + + 0 + 0 +@@ -110,13 +114,13 @@ + 94 + + +- ++ + + + +- +- +- ++ ++ ++ + Qt::Horizontal + + +@@ -132,7 +136,7 @@ + + KpkTransactionBar + QWidget +-
KpkTransactionBar.h
++
KpkTransactionBar.h
+ 1 + + --- kpackagekit-0.4.2.orig/debian/patches.old/kubuntu_01_editsources.patch +++ kpackagekit-0.4.2/debian/patches.old/kubuntu_01_editsources.patch @@ -0,0 +1,114 @@ +diff -Nur kpackagekit-0.4/Settings/KpkSettings.cpp kpackagekit-0.4.new/Settings/KpkSettings.cpp +--- kpackagekit-0.4/Settings/KpkSettings.cpp 2009-02-16 19:41:58.000000000 +0100 ++++ kpackagekit-0.4.new/Settings/KpkSettings.cpp 2009-02-24 11:06:00.000000000 +0100 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + using namespace PackageKit; +@@ -57,7 +58,12 @@ + originGB->setEnabled(false); + } + +- intervalCB->addItem(i18n("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(i18n("Daily"), KpkEnum::Daily); + intervalCB->addItem(i18n("Weekly"), KpkEnum::Weekly); + intervalCB->addItem(i18n("Monthly"), KpkEnum::Monthly); +@@ -67,10 +73,18 @@ + autoCB->addItem(i18n("All Updates"), KpkEnum::All); + autoCB->addItem(i18n("None"), KpkEnum::None); + ++ //using update-notifier-kde for now so hide package kit update widgets ++ intervalL->hide(); ++ label_3->hide(); ++ intervalCB->hide(); ++ autoCB->hide(); ++ groupBox_2->hide(); ++ + connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges())); + connect(notifyLongTasksCB, 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) +@@ -108,6 +122,27 @@ + emit(changed(false)); + } + ++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 -Nur kpackagekit-0.4/Settings/KpkSettings.h kpackagekit-0.4.new/Settings/KpkSettings.h +--- kpackagekit-0.4/Settings/KpkSettings.h 2009-02-16 19:41:58.000000000 +0100 ++++ kpackagekit-0.4.new/Settings/KpkSettings.h 2009-02-24 11:06:26.000000000 +0100 +@@ -40,6 +40,8 @@ + void save(); + void defaults(); + void checkChanges(); ++ void runSourcesEditor(); ++ void sourcesEditorFinished(); + + signals: + void changed(bool state); +diff -Nur kpackagekit-0.4/Settings/KpkSettings.ui kpackagekit-0.4.new/Settings/KpkSettings.ui +--- kpackagekit-0.4/Settings/KpkSettings.ui 2009-02-16 19:41:58.000000000 +0100 ++++ kpackagekit-0.4.new/Settings/KpkSettings.ui 2009-02-24 11:09:28.000000000 +0100 +@@ -59,6 +59,26 @@ + + + ++ ++ ++ ++ Qt::Vertical ++ ++ ++ ++ 20 ++ 40 ++ ++ ++ ++ ++ ++ ++ ++ &Edit Software Sources ++ ++ ++ + + + --- kpackagekit-0.4.2.orig/debian/patches.old/kubuntu_04_translations_catalogue.diff +++ kpackagekit-0.4.2/debian/patches.old/kubuntu_04_translations_catalogue.diff @@ -0,0 +1,48 @@ +--- kpackagekit-0.4/AddRm/KcmKpkAddRm.cpp 2009-02-16 18:41:59.000000000 +0000 ++++ kpackagekit-0.4/AddRm/KcmKpkAddRm.cpp 2009-04-28 12:18:10.000000000 +0100 +@@ -31,6 +31,7 @@ + : KCModule(KPackageKitFactory::componentData(), parent, args) + { + KAboutData *about = new KAboutData("kcm_kpk_addrm", 0, ki18n("Add and Remove Software"), KPK_VERSION); ++ KGlobal::locale()->insertCatalog("kpackagekit"); + setAboutData(about); + setButtons(Apply); + m_grid = new QGridLayout(this); +--- kpackagekit-0.4/Settings/KcmKpkSettings.cpp 2009-02-16 18:41:58.000000000 +0000 ++++ kpackagekit-0.4/Settings/KcmKpkSettings.cpp 2009-04-28 12:12:19.000000000 +0100 +@@ -30,7 +30,7 @@ + KcmKpkSettings::KcmKpkSettings(QWidget *parent, const QVariantList &args) + : KCModule(KPackageKitFactory::componentData(), parent, args) + { +- KAboutData *about = new KAboutData("kcm_kpk_settings", 0, ki18n("KPackageKit Settings"), KPK_VERSION); ++ KAboutData *about = new KAboutData("kcm_kpk_settings", "kpackagekit", ki18n("KPackageKit Settings"), KPK_VERSION); + setAboutData(about); + m_grid = new QGridLayout(this); + view = new KpkSettings(this); +@@ -39,4 +39,5 @@ + connect(this, SIGNAL(s_defaults()), view, SLOT(defaults()) ); + connect(view, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)) ); + m_grid->addWidget(view); ++ KGlobal::locale()->insertCatalog("kpackagekit"); + } +--- kpackagekit-0.4/Updater/KcmKpkUpdate.cpp 2009-02-16 18:41:58.000000000 +0000 ++++ kpackagekit-0.4/Updater/KcmKpkUpdate.cpp 2009-04-28 12:12:10.000000000 +0100 +@@ -37,6 +37,7 @@ + view = new KpkUpdate(this); + m_grid->addWidget(view); + connect(view, SIGNAL(changed(bool)), this, SIGNAL(changed(bool))); ++ KGlobal::locale()->insertCatalog("kpackagekit"); + } + + void KcmKpkUpdate::load() +--- kpackagekit-0.4/KPackageKit/main.cpp 2009-02-16 18:42:02.000000000 +0000 ++++ kpackagekit-0.4/KPackageKit/main.cpp 2009-04-28 11:53:27.000000000 +0100 +@@ -30,7 +30,7 @@ + int main(int argc, char **argv) + { + KAboutData about("KPackageKit", +- 0, ++ "kpackagekit", + ki18n("KPackageKit"), + KPK_VERSION, + ki18n("KPackageKit user interface"), --- kpackagekit-0.4.2.orig/debian/patches/kubuntu_02_initial_preference.patch +++ kpackagekit-0.4.2/debian/patches/kubuntu_02_initial_preference.patch @@ -0,0 +1,8 @@ +diff -Nur -x '*.orig' -x '*~' kpackagekit-0.4.1.1/Desktop/kpackagekit.desktop kpackagekit-0.4.1.1.new/Desktop/kpackagekit.desktop +--- kpackagekit-0.4.1.1/Desktop/kpackagekit.desktop 2009-06-11 11:44:48.000000000 +0200 ++++ kpackagekit-0.4.1.1.new/Desktop/kpackagekit.desktop 2009-06-11 11:53:00.000000000 +0200 +@@ -51,3 +51,4 @@ + MimeType=application/x-rpm;application/x-deb; + Terminal=false + Categories=Qt;KDE;System;PackageManager; ++InitialPreference=10 --- kpackagekit-0.4.2.orig/debian/patches/kubuntu_03_fix_ftbfs.patch +++ kpackagekit-0.4.2/debian/patches/kubuntu_03_fix_ftbfs.patch @@ -0,0 +1,11 @@ +diff -Nur -x '*.orig' -x '*~' kpackagekit-0.4.2/CMakeLists.txt kpackagekit-0.4.2.new/CMakeLists.txt +--- kpackagekit-0.4.2/CMakeLists.txt 2009-08-12 14:32:04.000000000 -0400 ++++ kpackagekit-0.4.2.new/CMakeLists.txt 2009-08-19 17:24:17.482725481 -0400 +@@ -3,6 +3,7 @@ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/) + + find_package(KDE4 REQUIRED) ++find_package(Gettext REQUIRED) + + include(FindPkgConfig) + pkg_check_modules (QPACKAGEKIT REQUIRED packagekit-qt>=0.4.7) --- kpackagekit-0.4.2.orig/debian/patches/kubuntu_01_edit_sources.patch +++ kpackagekit-0.4.2/debian/patches/kubuntu_01_edit_sources.patch @@ -0,0 +1,113 @@ +diff -Nur -x '*.orig' -x '*~' kpackagekit-0.4.1.1/Settings/KpkSettings.cpp kpackagekit-0.4.1.1.new/Settings/KpkSettings.cpp +--- kpackagekit-0.4.1.1/Settings/KpkSettings.cpp 2009-06-04 22:29:39.000000000 -0400 ++++ kpackagekit-0.4.1.1.new/Settings/KpkSettings.cpp 2009-06-17 13:10:15.000000000 -0400 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + using namespace PackageKit; +@@ -57,7 +58,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); +@@ -67,10 +73,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(); ++ label_3->hide(); ++ intervalCB->hide(); ++ autoCB->hide(); ++ + connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges())); + connect(notifyLongTasksCB, 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) +@@ -108,6 +121,27 @@ + emit(changed(false)); + } + ++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 -Nur -x '*.orig' -x '*~' kpackagekit-0.4.1.1/Settings/KpkSettings.h kpackagekit-0.4.1.1.new/Settings/KpkSettings.h +--- kpackagekit-0.4.1.1/Settings/KpkSettings.h 2009-06-04 22:29:39.000000000 -0400 ++++ kpackagekit-0.4.1.1.new/Settings/KpkSettings.h 2009-06-17 13:07:09.000000000 -0400 +@@ -40,6 +40,8 @@ + void save(); + void defaults(); + void checkChanges(); ++ void runSourcesEditor(); ++ void sourcesEditorFinished(); + + signals: + void changed(bool state); +diff -Nur -x '*.orig' -x '*~' kpackagekit-0.4.1.1/Settings/KpkSettings.ui kpackagekit-0.4.1.1.new/Settings/KpkSettings.ui +--- kpackagekit-0.4.1.1/Settings/KpkSettings.ui 2009-06-04 22:29:39.000000000 -0400 ++++ kpackagekit-0.4.1.1.new/Settings/KpkSettings.ui 2009-06-17 13:07:09.000000000 -0400 +@@ -59,6 +59,26 @@ + + + ++ ++ ++ ++ Qt::Vertical ++ ++ ++ ++ 20 ++ 40 ++ ++ ++ ++ ++ ++ ++ ++ &Edit Software Sources ++ ++ ++ + + +