[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:24 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=5c12132
The following commit has been merged in the master branch:
commit 5c1213227154cb853ae94955219bc8ff1d2bf5d1
Author: Philip Muskovac <yofel at gmx.net>
Date: Fri May 6 13:40:13 2011 +0200
* New upstream release
- update kde-sc-dev-latest version
- drop kubuntu_05_comic_prefetch.diff, applied upstream
* Update Vcs- links as the branch is now owned by kubuntu-packagers
---
debian/changelog | 9 +++
debian/control | 6 +-
debian/patches/kubuntu_05_comic_prefetch.diff | 95 ---------------------------
debian/patches/series | 1 -
4 files changed, 12 insertions(+), 99 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 66cf60d..b996c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdeplasma-addons (4:4.6.3-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - update kde-sc-dev-latest version
+ - drop kubuntu_05_comic_prefetch.diff, applied upstream
+ * Update Vcs- links as the branch is now owned by kubuntu-packagers
+
+ -- Philip Muškovac <yofel at kubuntu.org> Fri, 06 May 2011 12:56:10 +0200
+
kdeplasma-addons (4:4.6.2-0ubuntu3) natty; urgency=low
* Add kubuntu_05_comic_prefetch.diff, recommended on kde-packagers.
diff --git a/debian/control b/debian/control
index 7a48e63..21aa2b0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>
-Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
+Build-Depends: kde-sc-dev-latest (>= 4:4.6.3),
cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.9),
kdelibs5-dev (>= 4:4.5.2-0ubuntu1), kdepimlibs5-dev (>= 4:4.5), kdebase-workspace-dev (>= 4:4.5),
libqt4-opengl-dev, libboost1.42-dev, libkexiv2-dev (>= 4:4.5), python, libmarble-dev (>= 4:4.5),
@@ -14,8 +14,8 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
libxml2-dev
Standards-Version: 3.8.4
Homepage: http://plasma.kde.org/
-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu
-Vcs-Bzr: https://code.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kdeplasma-addons/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kdeplasma-addons/ubuntu
Package: kdeplasma-addons
Architecture: all
diff --git a/debian/patches/kubuntu_05_comic_prefetch.diff b/debian/patches/kubuntu_05_comic_prefetch.diff
deleted file mode 100644
index 3db80fa..0000000
--- a/debian/patches/kubuntu_05_comic_prefetch.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Matthias Fuchs <mat69 at gmx.net>
-Date: Thu, 07 Apr 2011 13:32:26 +0000
-Subject: Fixes prefetching. Now constant useage of the comic applet does not lead to high memory usage.
-X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&a=commitdiff&h=4ab9e40e1e3484a4adf059164c91e06d1f5b6b76
----
-Fixes prefetching. Now constant useage of the comic applet does not lead to high memory usage.
-REVIEW:101046
----
-
-
-Index: kdeplasma-addons-4.6.2/applets/comic/comic.cpp
-===================================================================
---- kdeplasma-addons-4.6.2.orig/applets/comic/comic.cpp 2011-04-10 10:40:19.520167015 +0200
-+++ kdeplasma-addons-4.6.2/applets/comic/comic.cpp 2011-04-10 10:40:24.340167016 +0200
-@@ -325,16 +325,26 @@
- }
- }
-
--void ComicApplet::dataUpdated( const QString&, const Plasma::DataEngine::Data &data )
-+void ComicApplet::dataUpdated( const QString &source, const Plasma::DataEngine::Data &data )
- {
-+ //disconnect prefetched comic strips
-+ if ( source != mOldSource ) {
-+ mEngine->disconnectSource( source, this );
-+ return;
-+ }
-+
- setBusy( false );
- setConfigurationRequired( false );
- slotStartTimer();
-
- //there was an error, display information as image
-- if ( data[ "Error" ].toBool() ) {
-- if ( !mShowErrorPicture && !data[ "Previous identifier suffix" ].toString().isEmpty() ) {
-- updateComic( data[ "Previous identifier suffix" ].toString() );
-+ const bool hasError = data[ "Error" ].toBool();
-+ const bool errorAutoFixable = data[ "Error automatically fixable" ].toBool();
-+ if ( hasError ) {
-+ const QString previousIdentifierSuffix = data[ "Previous identifier suffix" ].toString();
-+ if ( !mShowErrorPicture && !previousIdentifierSuffix.isEmpty() ) {
-+ mEngine->disconnectSource( source, this );
-+ updateComic( previousIdentifierSuffix );
- return;
- }
- QPixmap errorPic( 500, 400 );
-@@ -420,6 +430,11 @@
- mLabelUrl->setText( mWebsiteUrl.host() );
- mImageWidget->setScaled( !mScaleComic );
-
-+ //disconnect if there is either no error, or an error that can not be fixed automatically
-+ if ( !errorAutoFixable ) {
-+ mEngine->disconnectSource( source, this );
-+ }
-+
- setTabBarVisible( mShowTabBar && mUseTabs );
- mLabelTop->setVisible( ( mShowComicAuthor || mShowComicTitle ) && !mLabelTop->text().isEmpty() );
- mLabelId->setVisible( mShowComicIdentifier && !mLabelId->text().isEmpty() );
-@@ -449,11 +464,14 @@
-
- //prefetch the previous and following comic for faster navigation
- if ( !mNextIdentifierSuffix.isEmpty() ) {
-- mEngine->query( mComicIdentifier + ':' + mNextIdentifierSuffix );
-+ const QString prefetch = mComicIdentifier + ':' + mNextIdentifierSuffix;
-+ mEngine->connectSource( prefetch, this );
-+ mEngine->query( prefetch );
- }
--
- if ( !mPreviousIdentifierSuffix.isEmpty() ) {
-- mEngine->query( mComicIdentifier + ':' + mPreviousIdentifierSuffix );
-+ const QString prefetch = mComicIdentifier + ':' + mPreviousIdentifierSuffix;
-+ mEngine->connectSource( prefetch, this );
-+ mEngine->query( prefetch );
- }
- }
-
-@@ -833,6 +851,7 @@
-
- setConfigurationRequired( mComicIdentifier.isEmpty() );
- if ( !mComicIdentifier.isEmpty() && mEngine && mEngine->isValid() ) {
-+
- setBusy( true );
- const QString identifier = mComicIdentifier + ':' + identifierSuffix;
-
-Index: kdeplasma-addons-4.6.2/dataengines/comic/comic.cpp
-===================================================================
---- kdeplasma-addons-4.6.2.orig/dataengines/comic/comic.cpp 2011-04-10 10:40:19.530167015 +0200
-+++ kdeplasma-addons-4.6.2/dataengines/comic/comic.cpp 2011-04-10 10:40:24.340167016 +0200
-@@ -121,6 +121,7 @@
- if ( status != Solid::Networking::Connected && status != Solid::Networking::Unknown ) {
- mIdentifierError = identifier;
- setData( identifier, QLatin1String( "Error" ), true );
-+ setData( identifier, QLatin1String( "Error automatically fixable" ), true );
- setData( identifier, QLatin1String( "Identifier" ), identifier );
- setData( identifier, QLatin1String( "Previous identifier suffix" ), lastCachedIdentifier( identifier ) );
- kWarning() << "No connection.";
diff --git a/debian/patches/series b/debian/patches/series
index 5b53f1a..fc93edc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
kubuntu_04_kimpanel_disable_scim.diff
#kubuntu_02_microblog_default_configuration.diff
#kubuntu_03_opendestop_setup.diff
-kubuntu_05_comic_prefetch.diff
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list