[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Aug 1 09:05:21 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=895030f
The following commit has been merged in the master branch:
commit 895030f298d1882dd3d321d2b2797a1b948735d7
Author: Scott Kitterman <scott at kitterman.com>
Date: Fri Sep 24 13:54:49 2010 -0400
kdeplasma-addons (4:4.5.1-0ubuntu4) maverick; urgency=low
* Drop obsolete (pre-lucid) conflicts/replaces
* Convert conflicts/replaces to breaks replaces per current policy
* Add plasma-widgets-addons breaks/replaces plasma-widget-system-status
since it is now incorporated in that package
-- Scott Kitterman <scott at kitterman.com> Fri, 24 Sep 2010 13:42:12 -0400
* Add patches from last upload due to forgotten bzr add
---
debian/changelog | 9 ++
debian/control | 17 +-
debian/patches/kubuntu_06_fix_weatherlocation.diff | 16 ++
debian/patches/kubuntu_07_lancelot_fixes.diff | 22 +++
debian/patches/kubuntu_08_fix_comic_widget.diff | 176 +++++++++++++++++++++
debian/patches/kubuntu_09_personservice_ptr.diff | 44 ++++++
6 files changed, 272 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9350cbf..c7c85cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdeplasma-addons (4:4.5.1-0ubuntu4) maverick; urgency=low
+
+ * Drop obsolete (pre-lucid) conflicts/replaces
+ * Convert conflicts/replaces to breaks replaces per current policy
+ * Add plasma-widgets-addons breaks/replaces plasma-widget-system-status
+ since it is now incorporated in that package
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 24 Sep 2010 13:42:12 -0400
+
kdeplasma-addons (4:4.5.1-0ubuntu3) maverick; urgency=low
* Cherry pick additional patches from kdesvn 4.5 branch:
diff --git a/debian/control b/debian/control
index e8f8b73..74351c0 100644
--- a/debian/control
+++ b/debian/control
@@ -38,8 +38,8 @@ Section: kde
Depends: ${shlibs:Depends}, ${misc:Depends}, plasma-dataengines-workspace,
plasma-dataengines-addons (= ${binary:Version})
Suggests: plasma-widget-lancelot
-Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applets-addons, plasma-widget-weather
-Conflicts: kdeplasma-addons-data, plasma-applets-addons, plasma-widget-weather
+Replaces: plasma-widget-system-status
+Breaks: plasma-widget-system-status
Description: addons for KDE 4 Plasma - widgets
This package contains additional Plasma widgets shipped in the KDE 4 plasma
addons module. Install it if you want a variety of widgets on your plasma
@@ -51,9 +51,7 @@ Package: plasma-dataengines-addons
Architecture: any
Section: kde
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons (<< 4:4.4.60), kdeplasma-addons-data, kdeplasma-addons-libs4,
- plasma-widget-addons (<< 4:4.4.60)
-Conflicts: kdeplasma-addons-data, kdeplasma-addons-libs4
+Replaces: kdeplasma-addons (<< 4:4.4.60), plasma-widget-addons (<< 4:4.4.60)
Description: addons for KDE 4 Plasma - data engines
This package contains additional Plasma data engines shipped in KDE 4 plasma
addons module. These engines are needed by some KDE 4 plasma addons
@@ -65,8 +63,7 @@ Package: plasma-runners-addons
Architecture: any
Section: kde
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, kdeplasma-addons-libs4
-Conflicts: kdeplasma-addons-data, kdeplasma-addons-libs4
+Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1)
Description: addons for KDE 4 Plasma - krunner plugins
This package contains additional plasma runners that are used in krunner
(the "run command" dialog of KDE 4) to reveal special search results.
@@ -89,9 +86,7 @@ Package: plasma-widget-lancelot
Architecture: any
Section: kde
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applet-lancelot,
- liblancelot0a, liblancelot0
-Conflicts: kdeplasma-addons-data, plasma-applet-lancelot
+Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), liblancelot0a, liblancelot0
Description: addons for KDE 4 Plasma - lancelot widget
Lancelot is an application launcher menu (or ALI) for KDE 4 designed to
provide a place from which all your jobs begin. It provides quick access
@@ -143,8 +138,6 @@ Package: kdeplasma-addons-dbg
Section: debug
Architecture: any
Priority: extra
-Conflicts: kdeplasmoids-dbg
-Replaces: kdeplasmoids-dbg
Depends: ${misc:Depends}, plasma-widgets-addons (= ${binary:Version}), plasma-dataengines-addons (= ${binary:Version}),
plasma-runners-addons (= ${binary:Version}), plasma-widget-lancelot (= ${binary:Version}),
plasma-wallpapers-addons (= ${binary:Version}), kdebase-workspace-dbg
diff --git a/debian/patches/kubuntu_06_fix_weatherlocation.diff b/debian/patches/kubuntu_06_fix_weatherlocation.diff
new file mode 100644
index 0000000..a1ca665
--- /dev/null
+++ b/debian/patches/kubuntu_06_fix_weatherlocation.diff
@@ -0,0 +1,16 @@
+Index: a/libs/plasmaweather/weatherlocation.cpp
+===================================================================
+--- a/libs/plasmaweather/weatherlocation.cpp (revision 1169142)
++++ b/libs/plasmaweather/weatherlocation.cpp (revision 1170058)
+@@ -82,7 +82,10 @@
+ d->locationEngine->disconnectSource(source, this);
+
+ QString city = data["city"].toString();
+- city.truncate(city.indexOf(',') - 1);
++
++ if (city.contains(","))
++ city.truncate(city.indexOf(',') - 1);
++
+ if (!city.isEmpty()) {
+ d->validator.validate("bbcukmet", city, true);
+ return;
diff --git a/debian/patches/kubuntu_07_lancelot_fixes.diff b/debian/patches/kubuntu_07_lancelot_fixes.diff
new file mode 100644
index 0000000..5dfa708
--- /dev/null
+++ b/debian/patches/kubuntu_07_lancelot_fixes.diff
@@ -0,0 +1,22 @@
+kdesvn revisions 1169142 and 1171090
+Index: kdeplasma-addons-4.5.1/libs/lancelot-datamodels/MessagesKmail_p.h
+===================================================================
+--- kdeplasma-addons-4.5.1.orig/libs/lancelot-datamodels/MessagesKmail_p.h 2010-05-16 16:05:13.000000000 -0400
++++ kdeplasma-addons-4.5.1/libs/lancelot-datamodels/MessagesKmail_p.h 2010-09-23 00:43:22.000000000 -0400
+@@ -21,11 +21,14 @@
+ #include <QHash>
+ #include <KIcon>
+ #include <KJob>
+-#include <Akonadi/Entity>
+-#include <Akonadi/Collection>
+
+ #include "config-lancelot-datamodels.h"
+
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
++#include <Akonadi/Entity>
++#include <Akonadi/Collection>
++#endif
++
+ namespace Lancelot {
+ namespace Models {
+
diff --git a/debian/patches/kubuntu_08_fix_comic_widget.diff b/debian/patches/kubuntu_08_fix_comic_widget.diff
new file mode 100644
index 0000000..0d97a5e
--- /dev/null
+++ b/debian/patches/kubuntu_08_fix_comic_widget.diff
@@ -0,0 +1,176 @@
+kdesvn revisions 1170580 and 1175599
+Index: kdeplasma-addons-4.5.1/dataengines/comic/comic_package.cpp
+===================================================================
+--- kdeplasma-addons-4.5.1.orig/dataengines/comic/comic_package.cpp 2008-10-30 10:15:54.000000000 -0400
++++ kdeplasma-addons-4.5.1/dataengines/comic/comic_package.cpp 2010-09-23 00:48:13.000000000 -0400
+@@ -22,7 +22,7 @@
+ #include "plasma/package.h"
+
+ ComicPackage::ComicPackage( QObject *parent, QVariantList args )
+- : Plasma::PackageStructure( parent, "Comic" )
++ : Plasma::PackageStructure( parent, "Plasma/Comic" )
+ {
+ Q_UNUSED( args )
+ addDirectoryDefinition( "images", "images", i18n( "Images" ) );
+Index: kdeplasma-addons-4.5.1/applets/comic/configwidget.cpp
+===================================================================
+--- kdeplasma-addons-4.5.1.orig/applets/comic/configwidget.cpp 2010-07-23 17:15:20.000000000 -0400
++++ kdeplasma-addons-4.5.1/applets/comic/configwidget.cpp 2010-09-23 00:48:13.000000000 -0400
+@@ -24,10 +24,11 @@
+ #include <QtCore/QTimer>
+ #include <QtGui/QSortFilterProxyModel>
+
++#include <KConfigDialog>
+ #include <KNS3/DownloadDialog>
+
+-ConfigWidget::ConfigWidget( Plasma::DataEngine *engine, ComicModel *model, const QStringList &usedComics, QSortFilterProxyModel *proxy, QWidget *parent )
+- : QWidget( parent ), mEngine( engine ), mModel( model ), mUsedComics( usedComics ), mProxyModel( proxy ), mNewStuffDialog( 0 )
++ConfigWidget::ConfigWidget( Plasma::DataEngine *engine, ComicModel *model, const QStringList &usedComics, QSortFilterProxyModel *proxy, KConfigDialog *parent )
++ : QWidget( parent ), mEngine( engine ), mModel( model ), mProxyModel( proxy ), mNewStuffDialog( 0 )
+ {
+ comicSettings = new QWidget( this );
+ comicUi.setupUi( comicSettings );
+@@ -49,38 +50,23 @@
+ //set the correct initial item of the comboBox if it is defined
+ const int index = comicUi.comboBox_comic->findData( usedComics.first() );
+ comicUi.comboBox_comic->setCurrentIndex( index );
+- mCurrentIndex = mProxyModel->index( index, 0 );
+ }
+
+ comicUi.listView_comic->setModel( mProxyModel );
+ comicUi.listView_comic->resizeColumnToContents( 0 );
+
+- connect( comicUi.comboBox_comic, SIGNAL( currentIndexChanged( int ) ), this, SLOT( slotCurrentIndexChanged( int ) ) );
++ connect( comicUi.checkBox_useTabs, SIGNAL( clicked( bool ) ), this, SLOT( slotListChosen() ) );
+ connect( comicUi.checkBox_useTabs_2, SIGNAL( clicked( bool ) ), this, SLOT( slotComboBoxChosen() ) );
++ connect(parent, SIGNAL(applyClicked()), this, SLOT(slotSave()));
++ connect(parent, SIGNAL(okClicked()), this, SLOT(slotSave()));
+ }
+
+ ConfigWidget::~ConfigWidget()
+ {
+ }
+
+-void ConfigWidget::slotComboBoxChosen()
+-{
+- comicUi.comboBox_comic->setCurrentIndex( 0 );
+-}
+-
+-void ConfigWidget::slotCurrentIndexChanged( int newIndex )
++void ConfigWidget::checkCurrentIndex()
+ {
+- if ( useTabs() || !mProxyModel->rowCount() ) {
+- return;
+- }
+-
+- //decide wether to modify newIndex or not
+- const bool oldIsChecked = mCurrentIndex.isValid() && mCurrentIndex.data( Qt::CheckStateRole ) == Qt::Checked;
+- if ( !oldIsChecked ) {
+- //is not checked, i.e. comics have been added/removed, choose the first entry instead
+- newIndex = 0;
+- }
+-
+ //set all items of mProxyModel to unchecked
+ for ( int i = 0; i < mProxyModel->rowCount(); ++i ) {
+ QModelIndex index = mProxyModel->index( i, 0 );
+@@ -88,14 +74,30 @@
+ }
+
+ //check the selected index
+- mCurrentIndex = mProxyModel->index( newIndex, 0 );
+- mProxyModel->setData( mCurrentIndex, Qt::Checked, Qt::CheckStateRole );
++ QModelIndex index = mProxyModel->index( comicUi.comboBox_comic->currentIndex(), 0 );
++ mProxyModel->setData( index, Qt::Checked, Qt::CheckStateRole );
++}
++
+
+- if ( !oldIsChecked ) {
+- comicUi.comboBox_comic->setCurrentIndex( 0 );
++void ConfigWidget::slotSave()
++{
++ //useTabs() is already handled in the proxy itself
++ if ( !useTabs() ) {
++ checkCurrentIndex();
+ }
+ }
+
++
++void ConfigWidget::slotComboBoxChosen()
++{
++ comicUi.comboBox_comic->setCurrentIndex( 0 );
++}
++
++void ConfigWidget::slotListChosen()
++{
++ checkCurrentIndex();
++}
++
+ void ConfigWidget::getNewStuff()
+ {
+ if (!mNewStuffDialog) {
+@@ -108,7 +110,6 @@
+ void ConfigWidget::newStuffFinished()
+ {
+ if ( mNewStuffDialog->changedEntries().count() ) {
+- mCurrentIndex = QModelIndex();
+ mModel->setComics( mEngine->query( "providers" ), mModel->selected() );
+
+ comicUi.listView_comic->resizeColumnToContents( 0 );
+Index: kdeplasma-addons-4.5.1/applets/comic/configwidget.h
+===================================================================
+--- kdeplasma-addons-4.5.1.orig/applets/comic/configwidget.h 2010-04-07 11:18:37.000000000 -0400
++++ kdeplasma-addons-4.5.1/applets/comic/configwidget.h 2010-09-23 00:48:13.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include <QTime>
+
+ class ComicModel;
++class KConfigDialog;
+ class QCheckBox;
+ class QComboBox;
+ class QSortFilterProxyModel;
+@@ -45,7 +46,7 @@
+ {
+ Q_OBJECT
+ public:
+- ConfigWidget( Plasma::DataEngine *engine, ComicModel *model, const QStringList &usedComics, QSortFilterProxyModel *proxy, QWidget *parent );
++ ConfigWidget( Plasma::DataEngine *engine, ComicModel *model, const QStringList &usedComics, QSortFilterProxyModel *proxy, KConfigDialog *parent );
+ ~ConfigWidget();
+
+ void setShowComicUrl( bool show );
+@@ -83,18 +84,20 @@
+ void newStuffFinished();
+
+ private slots:
+- void slotCurrentIndexChanged( int newIndex );
+ void slotComboBoxChosen();
++ void slotListChosen();
++ void slotSave();
++
++ private:
++ void checkCurrentIndex();
+
+ private:
+ Ui::ComicSettings comicUi;
+ Ui::AppearanceSettings appearanceUi;
+ Plasma::DataEngine *mEngine;
+ ComicModel *mModel;
+- QStringList mUsedComics;
+ QSortFilterProxyModel *mProxyModel;
+ KNS3::DownloadDialog* mNewStuffDialog;
+- QModelIndex mCurrentIndex;
+ };
+
+ #endif
+Index: kdeplasma-addons-4.5.1/applets/comic/comic.cpp
+===================================================================
+--- kdeplasma-addons-4.5.1.orig/applets/comic/comic.cpp 2010-09-23 00:51:16.000000000 -0400
++++ kdeplasma-addons-4.5.1/applets/comic/comic.cpp 2010-09-23 00:52:09.000000000 -0400
+@@ -1069,7 +1069,7 @@
+ void ComicApplet::fullView()
+ {
+ if ( !mFullViewWidget ) {
+- mFullViewWidget = new FullViewWidget();
++ mFullViewWidget = new FullViewWidget;
+ }
+
+ if ( !mFullViewWidget->isVisible() ) {
diff --git a/debian/patches/kubuntu_09_personservice_ptr.diff b/debian/patches/kubuntu_09_personservice_ptr.diff
new file mode 100644
index 0000000..9f1db70
--- /dev/null
+++ b/debian/patches/kubuntu_09_personservice_ptr.diff
@@ -0,0 +1,44 @@
+Index: a/dataengines/ocs/personservice.cpp
+===================================================================
+--- a/dataengines/ocs/personservice.cpp (revision 1175599)
++++ b/dataengines/ocs/personservice.cpp (revision 1176837)
+@@ -39,6 +39,10 @@
+
+ Plasma::ServiceJob* PersonService::createJob(const QString& operation, QMap<QString, QVariant>& parameters)
+ {
++ if (!m_provider) {
++ return 0;
++ }
++
+ kDebug() << "operation: " << operation << "params: " << parameters;
+ if (operation == "sendMessage") {
+ Message message;
+@@ -76,6 +80,6 @@
+ kDebug() << "Set credentials: " << parameters.value("username") << parameters.value("password");
+ return job;
+ } else {
+- return new Plasma::ServiceJob("", operation, parameters);
++ return 0;
+ }
+ }
+Index: a/dataengines/ocs/ocsengine.cpp
+===================================================================
+--- a/dataengines/ocs/ocsengine.cpp (revision 1175599)
++++ b/dataengines/ocs/ocsengine.cpp (revision 1176837)
+@@ -70,7 +70,7 @@
+ if (request == "Person" || request == "Settings") {
+ QString id = arguments.value("id");
+ QString providerString = arguments.value("provider");
+- if (!id.isEmpty() && !providerString.isEmpty()) {
++ if (!id.isEmpty() && !providerString.isEmpty() && m_providers.value(providerString)) {
+ return new PersonService(m_providers.value(providerString), id, m_serviceUpdates, this);
+ }
+ }
+@@ -861,7 +861,6 @@
+
+ void OcsEngine::providerAdded(const Attica::Provider& provider)
+ {
+-
+ qDebug() << "providerAdded" << provider.baseUrl();
+
+ QString baseUrl = provider.baseUrl().toString();
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list