kubuntu-packaging

Merge lp:~bulldog98/kubuntu-packaging/kdeplasma-addons into lp:~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons

  1. kdeplasma-addons
  2. Merge into kdeplasma-addons
Proposed by Jonathan Kolberg
Status: Merged
Merged at revision: 168
Proposed branch: lp:~bulldog98/kubuntu-packaging/kdeplasma-addons
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons
Diff against target: 169 lines (+15/-101)
6 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/patches/kubuntu_04_kimpanel_disable_scim.diff (+6/-6)
debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff (+0/-75)
debian/patches/qwt6_build.patch (+0/-17)
debian/patches/series (+0/-2)
To merge this branch: bzr merge lp:~bulldog98/kubuntu-packaging/kdeplasma-addons
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+73991@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-08-25 16:35:57 +0000
+++ debian/changelog 2011-09-04 10:13:23 +0000
@@ -1,3 +1,11 @@
1kdeplasma-addons (4:4.7.1-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release
4 * droped qwt6_build.patch
5 * droped kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
6
7 -- Jonathan Kolberg <bulldog98@kubuntu-de.org> Sun, 04 Sep 2011 11:26:03 +0200
8
1kdeplasma-addons (4:4.7.0-0ubuntu3) oneiric; urgency=low9kdeplasma-addons (4:4.7.0-0ubuntu3) oneiric; urgency=low
210
3 * Switch to build-dep on libqwt-dev to support transition to qwt611 * Switch to build-dep on libqwt-dev to support transition to qwt6
412
=== modified file 'debian/control'
--- debian/control 2011-08-25 16:35:57 +0000
+++ debian/control 2011-09-04 10:13:23 +0000
@@ -6,7 +6,7 @@
6Uploaders: Sune Vuorela <sune@debian.org>, Fathi Boudra <fabo@debian.org>,6Uploaders: Sune Vuorela <sune@debian.org>, Fathi Boudra <fabo@debian.org>,
7 Armin Berres <armin+debian@space-based.de>, Modestas Vainius <modax@debian.org>, George Kiagiadakis <kiagiadakis.george@gmail.com>,7 Armin Berres <armin+debian@space-based.de>, Modestas Vainius <modax@debian.org>, George Kiagiadakis <kiagiadakis.george@gmail.com>,
8 José Manuel Santamaría Lema <panfaust@gmail.com>8 José Manuel Santamaría Lema <panfaust@gmail.com>
9Build-Depends: kde-sc-dev-latest (>= 4:4.7.0),9Build-Depends: kde-sc-dev-latest (>= 4:4.7.1),
10 cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),10 cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
11 kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), kde-workspace-dev (>= 4:4.6),11 kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), kde-workspace-dev (>= 4:4.6),
12 libkexiv2-dev (>= 4:4.6), libmarble-dev (>= 4:4.6), shared-mime-info, libglib2.0-dev,12 libkexiv2-dev (>= 4:4.6), libmarble-dev (>= 4:4.6), shared-mime-info, libglib2.0-dev,
1313
=== modified file 'debian/patches/kubuntu_04_kimpanel_disable_scim.diff'
--- debian/patches/kubuntu_04_kimpanel_disable_scim.diff 2010-12-07 13:13:36 +0000
+++ debian/patches/kubuntu_04_kimpanel_disable_scim.diff 2011-09-04 10:13:23 +0000
@@ -1,7 +1,7 @@
1Index: kdeplasma-addons-4.5.80/applets/CMakeLists.txt1Index: kdeplasma-addons-4.7.1/applets/CMakeLists.txt
2===================================================================2===================================================================
3--- kdeplasma-addons-4.5.80.orig/applets/CMakeLists.txt 2010-10-19 13:40:15.000000000 +00003--- kdeplasma-addons-4.7.1.orig/applets/CMakeLists.txt 2011-05-20 22:37:49.000000000 +0200
4+++ kdeplasma-addons-4.5.80/applets/CMakeLists.txt 2010-11-26 13:35:57.058951002 +00004+++ kdeplasma-addons-4.7.1/applets/CMakeLists.txt 2011-09-04 11:29:14.000000000 +0200
5@@ -87,11 +87,11 @@5@@ -87,11 +87,11 @@
6 if (Q_WS_X11)6 if (Q_WS_X11)
7 if (X11_Xrender_FOUND)7 if (X11_Xrender_FOUND)
@@ -18,10 +18,10 @@
18 endif (X11_Xrender_FOUND)18 endif (X11_Xrender_FOUND)
19 endif (Q_WS_X11)19 endif (Q_WS_X11)
20 20
21Index: kdeplasma-addons-4.5.80/applets/kimpanel/backend/CMakeLists.txt21Index: kdeplasma-addons-4.7.1/applets/kimpanel/backend/CMakeLists.txt
22===================================================================22===================================================================
23--- kdeplasma-addons-4.5.80.orig/applets/kimpanel/backend/CMakeLists.txt 2009-12-01 00:35:52.000000000 +000023--- kdeplasma-addons-4.7.1.orig/applets/kimpanel/backend/CMakeLists.txt 2011-05-20 22:37:49.000000000 +0200
24+++ kdeplasma-addons-4.5.80/applets/kimpanel/backend/CMakeLists.txt 2010-11-26 13:35:57.058951002 +000024+++ kdeplasma-addons-4.7.1/applets/kimpanel/backend/CMakeLists.txt 2011-09-04 11:29:14.000000000 +0200
25@@ -1 +1 @@25@@ -1 +1 @@
26-macro_optional_add_subdirectory(scim)26-macro_optional_add_subdirectory(scim)
27+#macro_optional_add_subdirectory(scim)27+#macro_optional_add_subdirectory(scim)
2828
=== removed file 'debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff'
--- debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff 2011-07-30 18:04:29 +0000
+++ debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff 1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
1From 67b5c56e564f5052238bab38342a85e5f4af570b Mon Sep 17 00:00:00 2001
2From: Christoph Feck <christoph@maxiom.de>
3Date: Sat, 30 Jul 2011 19:15:28 +0200
4Subject: [PATCH] Fix assignment operator and add copy constructor
5
6This fixes the crash in Grid Desktop and Grouping Desktop.
7Thanks to Aaron Seigo for investigation and patch review.
8
9BUG: 278222
10FIXED-IN: 4.7.1
11---
12 containments/groupingdesktop/lib/groupinfo.cpp | 17 +++++++++++------
13 containments/groupingdesktop/lib/groupinfo.h | 3 ++-
14 2 files changed, 13 insertions(+), 7 deletions(-)
15
16diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp
17index 2106cca..c945551 100644
18--- a/containments/groupingdesktop/lib/groupinfo.cpp
19+++ b/containments/groupingdesktop/lib/groupinfo.cpp
20@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName)
21 d->prettyName = prettyName;
22 }
23
24+GroupInfo::GroupInfo(const GroupInfo &other)
25+ : d(new GroupInfoPrivate())
26+{
27+ *d = *other.d;
28+}
29+
30 GroupInfo::~GroupInfo()
31 {
32 delete d;
33@@ -78,13 +84,12 @@ QString GroupInfo::icon() const
34 return d->icon;
35 }
36
37-GroupInfo GroupInfo::operator=(const GroupInfo &gi)
38+GroupInfo &GroupInfo::operator=(const GroupInfo &gi)
39 {
40- GroupInfo g(gi.name(), gi.prettyName());
41- g.setFormFactors(gi.formFactors());
42- g.setIcon(gi.icon());
43-
44- return g;
45+ if (this != &gi) {
46+ *d = *gi.d;
47+ }
48+ return *this;
49 }
50
51 bool GroupInfo::operator==(const GroupInfo &gi) const
52diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h
53index f8cc66f..320c800 100644
54--- a/containments/groupingdesktop/lib/groupinfo.h
55+++ b/containments/groupingdesktop/lib/groupinfo.h
56@@ -31,6 +31,7 @@ class GroupInfo
57 {
58 public:
59 explicit GroupInfo(const QString &name, const QString &prettyName = QString());
60+ GroupInfo(const GroupInfo &other);
61 ~GroupInfo();
62 void setFormFactors(QSet<Plasma::FormFactor> formFactors);
63 void setIcon(const QString &icon);
64@@ -40,7 +41,7 @@ class GroupInfo
65 QSet<Plasma::FormFactor> formFactors() const;
66 QString icon() const;
67
68- GroupInfo operator=(const GroupInfo &gi);
69+ GroupInfo &operator=(const GroupInfo &gi);
70 bool operator==(const GroupInfo &gi) const;
71 bool operator<(const GroupInfo &gi) const;
72
73--
741.7.5.4
75
760
=== removed file 'debian/patches/qwt6_build.patch'
--- debian/patches/qwt6_build.patch 2011-08-25 16:35:57 +0000
+++ debian/patches/qwt6_build.patch 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
1Backport from KDE trunk b3527f12ad9f577535d07e9614cfda9ef8131910
2Index: kdeplasma-addons-4.7.0/applets/kdeobservatory/src/commithistoryview.cpp
3===================================================================
4--- kdeplasma-addons-4.7.0.orig/applets/kdeobservatory/src/commithistoryview.cpp 2011-08-25 12:21:01.379133375 -0400
5+++ kdeplasma-addons-4.7.0/applets/kdeobservatory/src/commithistoryview.cpp 2011-08-25 12:22:39.299133403 -0400
6@@ -124,7 +124,11 @@
7 plot->setCanvasBackground(QColor(0, 0, 140));
8
9 QwtPlotCurve *curve = new QwtPlotCurve;
10+#if QWT_VERSION >= (((6) << 16) | ((0) << 8) | (0))
11+ curve->setSamples(x, y, j);
12+#else
13 curve->setData(x, y, j);
14+#endif
15 delete []x;
16 delete []y;
17
180
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-08-25 16:35:57 +0000
+++ debian/patches/series 2011-09-04 10:13:23 +0000
@@ -1,5 +1,3 @@
1kubuntu_04_kimpanel_disable_scim.diff1kubuntu_04_kimpanel_disable_scim.diff
2#kubuntu_02_microblog_default_configuration.diff2#kubuntu_02_microblog_default_configuration.diff
3#kubuntu_03_opendestop_setup.diff3#kubuntu_03_opendestop_setup.diff
4kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
5qwt6_build.patch

Subscribers

People subscribed via source and target branches

to all changes: