[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:19 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=5cbb2cb
The following commit has been merged in the master branch:
commit 5cbb2cb797b0eb8523d765a30f0589f609fe3a37
Author: Andreas Wenning <andreas at asterix>
Date: Sat Jun 26 01:21:28 2010 +0200
* New upstream release
- Bump kde-sc-dev-latest to 4.4.90
- Adapt kubuntu_02_microblog_default_configuration.diff
* Add build-depends on libqca2-dev
---
debian/changelog | 9 +++++
debian/control | 4 +--
...kubuntu_02_microblog_default_configuration.diff | 40 +++++++++++-----------
3 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c6cf58..f730922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdeplasma-addons (4:4.4.90-0ubuntu1) maverick; urgency=low
+
+ * New upstream release
+ - Bump kde-sc-dev-latest to 4.4.90
+ - Adapt kubuntu_02_microblog_default_configuration.diff
+ * Add build-depends on libqca2-dev
+
+ -- Andreas Wenning <awen at awen.dk> Sat, 26 Jun 2010 00:38:27 +0200
+
kdeplasma-addons (4:4.4.85-0ubuntu3) maverick; urgency=low
* Update kubuntu_02_microblog_default_configuration.diff from Michał
diff --git a/debian/control b/debian/control
index ee126fb..ddf1b29 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ 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 <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
-Build-Depends: kde-sc-dev-latest (>= 4:4.4.85),
+Build-Depends: kde-sc-dev-latest (>= 4:4.4.90),
cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), quilt, pkg-kde-tools (>= 0.6.4),
kdelibs5-dev (>= 4:4.4), kdepimlibs5-dev (>= 4:4.4), kdebase-workspace-dev (>= 4:4.4),
libqt4-opengl-dev, libboost1.42-dev, libkexiv2-dev (>= 4:4.4), python, libmarble-dev (>= 4:4.4),
libqimageblitz-dev, libeigen2-dev, libxrender-dev, shared-desktop-ontologies, libattica-dev,
- libxtst-dev, libqalculate-dev, libxml2-dev, libqwt5-qt4-dev, shared-mime-info, libglib2.0-dev
+ libxtst-dev, libqalculate-dev, libxml2-dev, libqwt5-qt4-dev, shared-mime-info, libglib2.0-dev, libqca2-dev
#libscim-dev
Standards-Version: 3.8.4
Homepage: http://plasma.kde.org/
diff --git a/debian/patches/kubuntu_02_microblog_default_configuration.diff b/debian/patches/kubuntu_02_microblog_default_configuration.diff
index 934c57b..ff3763c 100644
--- a/debian/patches/kubuntu_02_microblog_default_configuration.diff
+++ b/debian/patches/kubuntu_02_microblog_default_configuration.diff
@@ -1,7 +1,7 @@
-Index: kdeplasma-addons-4.4.85/applets/microblog/microblog.cpp
+Index: kdeplasma-addons-4.4.90/applets/microblog/microblog.cpp
===================================================================
---- kdeplasma-addons-4.4.85.orig/applets/microblog/microblog.cpp 2010-05-27 18:24:02.000000000 +0100
-+++ kdeplasma-addons-4.4.85/applets/microblog/microblog.cpp 2010-06-18 12:37:25.603694858 +0100
+--- kdeplasma-addons-4.4.90.orig/applets/microblog/microblog.cpp 2010-05-27 19:24:02.000000000 +0200
++++ kdeplasma-addons-4.4.90/applets/microblog/microblog.cpp 2010-06-26 00:08:46.530645529 +0200
@@ -27,6 +27,8 @@
#include <QGraphicsAnchorLayout>
#include <QAction>
@@ -96,11 +96,11 @@ Index: kdeplasma-addons-4.4.85/applets/microblog/microblog.cpp
} else {
query = QString("Timeline:%1@%2");
}
-Index: kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.cpp
+Index: kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.cpp
===================================================================
---- kdeplasma-addons-4.4.85.orig/dataengines/microblog/timelinesource.cpp 2010-05-27 18:23:58.000000000 +0100
-+++ kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.cpp 2010-06-18 12:35:49.156693793 +0100
-@@ -97,6 +97,9 @@
+--- kdeplasma-addons-4.4.90.orig/dataengines/microblog/timelinesource.cpp 2010-06-24 18:32:17.000000000 +0200
++++ kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.cpp 2010-06-26 00:10:42.942095727 +0200
+@@ -118,6 +118,9 @@
case TimelineWithFriends:
m_url = KUrl(m_serviceBaseUrl, "statuses/friends_timeline.xml");
break;
@@ -110,20 +110,20 @@ Index: kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.cpp
case Timeline:
default:
m_url = KUrl(m_serviceBaseUrl, "statuses/user_timeline.xml");
-@@ -141,7 +144,7 @@
+@@ -201,7 +204,7 @@
void TimelineSource::update(bool forcedUpdate)
{
-- if (m_job || (!account().isEmpty() && password().isEmpty())) {
-+ if ( account() != "kubuntu" && (m_job || (!account().isEmpty() && password().isEmpty())) ) {
+- if (m_job || (!account().isEmpty() && password().isEmpty() && !m_oauthToken.size())) {
++ if ( account() != "kubuntu" && (m_job || (!account().isEmpty() && password().isEmpty() && !m_oauthToken.size())) ) {
// We are already performing a fetch, let's not bother starting over
//kDebug() << "already updating....." << m_job << account().isEmpty() << password().isEmpty();
return;
-Index: kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.h
+Index: kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.h
===================================================================
---- kdeplasma-addons-4.4.85.orig/dataengines/microblog/timelinesource.h 2009-08-12 11:00:01.000000000 +0100
-+++ kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.h 2010-06-18 12:35:49.156693793 +0100
-@@ -80,7 +80,8 @@
+--- kdeplasma-addons-4.4.90.orig/dataengines/microblog/timelinesource.h 2010-06-24 18:32:17.000000000 +0200
++++ kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.h 2010-06-26 00:08:46.530645529 +0200
+@@ -82,7 +82,8 @@
TimelineWithFriends,
Replies,
DirectMessages,
@@ -133,10 +133,10 @@ Index: kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.h
};
TimelineSource(const QString &who, RequestType requestType, QObject* parent);
-Index: kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.cpp
+Index: kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.cpp
===================================================================
---- kdeplasma-addons-4.4.85.orig/dataengines/microblog/twitterengine.cpp 2009-08-12 11:00:01.000000000 +0100
-+++ kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.cpp 2010-06-18 12:35:49.156693793 +0100
+--- kdeplasma-addons-4.4.90.orig/dataengines/microblog/twitterengine.cpp 2009-08-12 12:00:01.000000000 +0200
++++ kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.cpp 2010-06-26 00:08:46.530645529 +0200
@@ -30,6 +30,7 @@
const QString TwitterEngine::timelinePrefix("Timeline:");
const QString TwitterEngine::timelineWithFriendsPrefix("TimelineWithFriends:");
@@ -177,10 +177,10 @@ Index: kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.cpp
} else if (name.startsWith(repliesPrefix)) {
requestType = TimelineSource::Replies;
who.remove(repliesPrefix);
-Index: kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.h
+Index: kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.h
===================================================================
---- kdeplasma-addons-4.4.85.orig/dataengines/microblog/twitterengine.h 2009-08-12 11:00:01.000000000 +0100
-+++ kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.h 2010-06-18 12:35:49.160692396 +0100
+--- kdeplasma-addons-4.4.90.orig/dataengines/microblog/twitterengine.h 2009-08-12 12:00:01.000000000 +0200
++++ kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.h 2010-06-26 00:08:46.530645529 +0200
@@ -67,6 +67,7 @@
static const QString timelinePrefix;
static const QString timelineWithFriendsPrefix;
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list