[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:04 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=06511e4
The following commit has been merged in the master branch:
commit 06511e45584883f6eee63171a278f0cbbe30a195
Author: Anthony Mercatante <tonio at tonio-laptop>
Date: Thu Mar 5 18:05:58 2009 +0100
Sync with the package...
---
debian/changelog | 14 ++++++++++
debian/control | 6 ++--
debian/patches/kubuntu_01_lancelot_qt45.diff | 42 ++++++++++++++--------------
3 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 56350be..7a7320d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+kdeplasma-addons (4:4.2.1-0ubuntu2) jaunty; urgency=low
+
+ * Reupload since all built failed due to missing deps appart
+ from i386.
+
+ -- Anthony Mercatante <tonio at ubuntu.com> Thu, 05 Mar 2009 17:50:09 +0100
+
+kdeplasma-addons (4:4.2.1-0ubuntu1) jaunty; urgency=low
+
+ * New upstream release:
+ - Bump various build-depend versions for update
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Fri, 27 Feb 2009 17:25:34 -0500
+
kdeplasma-addons (4:4.2.0-0ubuntu3) jaunty; urgency=low
[ Michal Zajac ]
diff --git a/debian/control b/debian/control
index ea77b95..cd3fb2b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), cmake (>= 2.6.2),
- kdebase-workspace-dev (>= 4:4.2.0), libglu1-mesa-dev, libqt4-opengl-dev,
- libboost1.35-dev, python, libkexiv2-7-dev, kdebase-workspace-data (>= 4:4.2.0),
- libxcomposite-dev, kdepimlibs5-dev (>= 4:4.2.0), quilt
+ kdebase-workspace-dev (>= 4:4.2.1), libglu1-mesa-dev, libqt4-opengl-dev,
+ libboost1.35-dev, python, libkexiv2-7-dev, kdebase-workspace-data (>= 4:4.2.1),
+ libxcomposite-dev, kdepimlibs5-dev (>= 4:4.2.1), quilt
Standards-Version: 3.8.0
Homepage: http://plasma.kde.org/
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu
diff --git a/debian/patches/kubuntu_01_lancelot_qt45.diff b/debian/patches/kubuntu_01_lancelot_qt45.diff
index 0b59445..b4d0ee2 100644
--- a/debian/patches/kubuntu_01_lancelot_qt45.diff
+++ b/debian/patches/kubuntu_01_lancelot_qt45.diff
@@ -1,7 +1,7 @@
-Index: kdeplasma-addons-4.2.0/applets/lancelot/app/src/models/ContactsKopete.cpp
+Index: kdeplasma-addons-4.2.1/applets/lancelot/app/src/models/ContactsKopete.cpp
===================================================================
---- kdeplasma-addons-4.2.0.orig/applets/lancelot/app/src/models/ContactsKopete.cpp 2009-02-20 20:25:37.518200148 +0100
-+++ kdeplasma-addons-4.2.0/applets/lancelot/app/src/models/ContactsKopete.cpp 2009-02-20 20:27:20.106197578 +0100
+--- kdeplasma-addons-4.2.1.orig/applets/lancelot/app/src/models/ContactsKopete.cpp 2008-11-28 10:33:58.000000000 -0500
++++ kdeplasma-addons-4.2.1/applets/lancelot/app/src/models/ContactsKopete.cpp 2009-02-27 17:25:30.000000000 -0500
@@ -22,7 +22,7 @@
#include <KStandardDirs>
#include <KDebug>
@@ -11,10 +11,10 @@ Index: kdeplasma-addons-4.2.0/applets/lancelot/app/src/models/ContactsKopete.cpp
#define CHECK_RUNNING_INTERVAL 5000
namespace Models {
-Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/Global.cpp
+Index: kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/Global.cpp
===================================================================
---- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/Global.cpp 2009-02-20 20:25:37.434195296 +0100
-+++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/Global.cpp 2009-02-20 20:27:20.106197578 +0100
+--- kdeplasma-addons-4.2.1.orig/applets/lancelot/libs/lancelot/Global.cpp 2008-12-21 15:20:19.000000000 -0500
++++ kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/Global.cpp 2009-02-27 17:25:30.000000000 -0500
@@ -326,8 +326,11 @@
d->confMain = new KConfig("lancelot" + app + "rc");
@@ -36,10 +36,10 @@ Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/Global.cpp
d->confTheme = new KConfig(path);
Instance::Private::activeInstance = this;
-Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp
+Index: kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp
===================================================================
---- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp 2009-02-20 20:25:37.550200367 +0100
-+++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp 2009-02-20 20:27:20.106197578 +0100
+--- kdeplasma-addons-4.2.1.orig/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp 2008-08-20 15:53:48.000000000 -0400
++++ kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp 2009-02-27 17:25:30.000000000 -0500
@@ -31,6 +31,35 @@
{
}
@@ -119,10 +119,10 @@ Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/CardLayout.
d->shown = NULL;
}
-Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp
+Index: kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp
===================================================================
---- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp 2009-02-20 20:25:37.582200751 +0100
-+++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp 2009-02-20 20:27:20.106197578 +0100
+--- kdeplasma-addons-4.2.1.orig/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp 2008-11-28 10:33:58.000000000 -0500
++++ kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp 2009-02-27 17:25:30.000000000 -0500
@@ -41,10 +41,10 @@
{
}
@@ -163,10 +163,10 @@ Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/FullBorderL
d->itemPositions[Center]->setGeometry(itemRect);
}
}
-Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp
+Index: kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp
===================================================================
---- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp 2009-02-20 20:25:37.614199910 +0100
-+++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp 2009-02-20 20:27:20.106197578 +0100
+--- kdeplasma-addons-4.2.1.orig/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp 2008-11-28 10:33:59.000000000 -0500
++++ kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp 2009-02-27 17:25:30.000000000 -0500
@@ -164,9 +164,9 @@
QGraphicsWidget * item = itemForIndex(i);
QRectF itemGeometry = item->geometry();
@@ -179,10 +179,10 @@ Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/CustomListV
transform.reset();
if (!viewport.contains(itemGeometry)) {
QRectF clip = viewport.intersect(itemGeometry);
-Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp
+Index: kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp
===================================================================
---- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp 2009-02-20 20:25:37.486199844 +0100
-+++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp 2009-02-20 20:27:20.106197578 +0100
+--- kdeplasma-addons-4.2.1.orig/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp 2009-01-06 12:23:55.000000000 -0500
++++ kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp 2009-02-27 17:25:30.000000000 -0500
@@ -20,6 +20,10 @@
#include "PassagewayView.h"
@@ -260,10 +260,10 @@ Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/PassagewayV
QObject::connect(
list, SIGNAL(activated(int)),
parent, SLOT(listItemActivated(int))
-Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp
+Index: kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp
===================================================================
---- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp 2009-02-20 20:25:37.646199596 +0100
-+++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp 2009-02-20 20:27:20.106197578 +0100
+--- kdeplasma-addons-4.2.1.orig/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp 2009-01-21 05:29:18.000000000 -0500
++++ kdeplasma-addons-4.2.1/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp 2009-02-27 17:25:30.000000000 -0500
@@ -227,8 +227,10 @@
void ScrollPane::setGeometry(const QRectF & rect) //>
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list