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

Proposed by Jonathan Kolberg on 2011-09-04
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 2011-09-04 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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-08-25 16:35:57 +0000
3+++ debian/changelog 2011-09-04 10:13:23 +0000
4@@ -1,3 +1,11 @@
5+kdeplasma-addons (4:4.7.1-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release
8+ * droped qwt6_build.patch
9+ * droped kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
10+
11+ -- Jonathan Kolberg <bulldog98@kubuntu-de.org> Sun, 04 Sep 2011 11:26:03 +0200
12+
13 kdeplasma-addons (4:4.7.0-0ubuntu3) oneiric; urgency=low
14
15 * Switch to build-dep on libqwt-dev to support transition to qwt6
16
17=== modified file 'debian/control'
18--- debian/control 2011-08-25 16:35:57 +0000
19+++ debian/control 2011-09-04 10:13:23 +0000
20@@ -6,7 +6,7 @@
21 Uploaders: Sune Vuorela <sune@debian.org>, Fathi Boudra <fabo@debian.org>,
22 Armin Berres <armin+debian@space-based.de>, Modestas Vainius <modax@debian.org>, George Kiagiadakis <kiagiadakis.george@gmail.com>,
23 José Manuel Santamaría Lema <panfaust@gmail.com>
24-Build-Depends: kde-sc-dev-latest (>= 4:4.7.0),
25+Build-Depends: kde-sc-dev-latest (>= 4:4.7.1),
26 cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
27 kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), kde-workspace-dev (>= 4:4.6),
28 libkexiv2-dev (>= 4:4.6), libmarble-dev (>= 4:4.6), shared-mime-info, libglib2.0-dev,
29
30=== modified file 'debian/patches/kubuntu_04_kimpanel_disable_scim.diff'
31--- debian/patches/kubuntu_04_kimpanel_disable_scim.diff 2010-12-07 13:13:36 +0000
32+++ debian/patches/kubuntu_04_kimpanel_disable_scim.diff 2011-09-04 10:13:23 +0000
33@@ -1,7 +1,7 @@
34-Index: kdeplasma-addons-4.5.80/applets/CMakeLists.txt
35+Index: kdeplasma-addons-4.7.1/applets/CMakeLists.txt
36 ===================================================================
37---- kdeplasma-addons-4.5.80.orig/applets/CMakeLists.txt 2010-10-19 13:40:15.000000000 +0000
38-+++ kdeplasma-addons-4.5.80/applets/CMakeLists.txt 2010-11-26 13:35:57.058951002 +0000
39+--- kdeplasma-addons-4.7.1.orig/applets/CMakeLists.txt 2011-05-20 22:37:49.000000000 +0200
40++++ kdeplasma-addons-4.7.1/applets/CMakeLists.txt 2011-09-04 11:29:14.000000000 +0200
41 @@ -87,11 +87,11 @@
42 if (Q_WS_X11)
43 if (X11_Xrender_FOUND)
44@@ -18,10 +18,10 @@
45 endif (X11_Xrender_FOUND)
46 endif (Q_WS_X11)
47
48-Index: kdeplasma-addons-4.5.80/applets/kimpanel/backend/CMakeLists.txt
49+Index: kdeplasma-addons-4.7.1/applets/kimpanel/backend/CMakeLists.txt
50 ===================================================================
51---- kdeplasma-addons-4.5.80.orig/applets/kimpanel/backend/CMakeLists.txt 2009-12-01 00:35:52.000000000 +0000
52-+++ kdeplasma-addons-4.5.80/applets/kimpanel/backend/CMakeLists.txt 2010-11-26 13:35:57.058951002 +0000
53+--- kdeplasma-addons-4.7.1.orig/applets/kimpanel/backend/CMakeLists.txt 2011-05-20 22:37:49.000000000 +0200
54++++ kdeplasma-addons-4.7.1/applets/kimpanel/backend/CMakeLists.txt 2011-09-04 11:29:14.000000000 +0200
55 @@ -1 +1 @@
56 -macro_optional_add_subdirectory(scim)
57 +#macro_optional_add_subdirectory(scim)
58
59=== removed file 'debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff'
60--- debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff 2011-07-30 18:04:29 +0000
61+++ debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff 1970-01-01 00:00:00 +0000
62@@ -1,75 +0,0 @@
63-From 67b5c56e564f5052238bab38342a85e5f4af570b Mon Sep 17 00:00:00 2001
64-From: Christoph Feck <christoph@maxiom.de>
65-Date: Sat, 30 Jul 2011 19:15:28 +0200
66-Subject: [PATCH] Fix assignment operator and add copy constructor
67-
68-This fixes the crash in Grid Desktop and Grouping Desktop.
69-Thanks to Aaron Seigo for investigation and patch review.
70-
71-BUG: 278222
72-FIXED-IN: 4.7.1
73----
74- containments/groupingdesktop/lib/groupinfo.cpp | 17 +++++++++++------
75- containments/groupingdesktop/lib/groupinfo.h | 3 ++-
76- 2 files changed, 13 insertions(+), 7 deletions(-)
77-
78-diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp
79-index 2106cca..c945551 100644
80---- a/containments/groupingdesktop/lib/groupinfo.cpp
81-+++ b/containments/groupingdesktop/lib/groupinfo.cpp
82-@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName)
83- d->prettyName = prettyName;
84- }
85-
86-+GroupInfo::GroupInfo(const GroupInfo &other)
87-+ : d(new GroupInfoPrivate())
88-+{
89-+ *d = *other.d;
90-+}
91-+
92- GroupInfo::~GroupInfo()
93- {
94- delete d;
95-@@ -78,13 +84,12 @@ QString GroupInfo::icon() const
96- return d->icon;
97- }
98-
99--GroupInfo GroupInfo::operator=(const GroupInfo &gi)
100-+GroupInfo &GroupInfo::operator=(const GroupInfo &gi)
101- {
102-- GroupInfo g(gi.name(), gi.prettyName());
103-- g.setFormFactors(gi.formFactors());
104-- g.setIcon(gi.icon());
105--
106-- return g;
107-+ if (this != &gi) {
108-+ *d = *gi.d;
109-+ }
110-+ return *this;
111- }
112-
113- bool GroupInfo::operator==(const GroupInfo &gi) const
114-diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h
115-index f8cc66f..320c800 100644
116---- a/containments/groupingdesktop/lib/groupinfo.h
117-+++ b/containments/groupingdesktop/lib/groupinfo.h
118-@@ -31,6 +31,7 @@ class GroupInfo
119- {
120- public:
121- explicit GroupInfo(const QString &name, const QString &prettyName = QString());
122-+ GroupInfo(const GroupInfo &other);
123- ~GroupInfo();
124- void setFormFactors(QSet<Plasma::FormFactor> formFactors);
125- void setIcon(const QString &icon);
126-@@ -40,7 +41,7 @@ class GroupInfo
127- QSet<Plasma::FormFactor> formFactors() const;
128- QString icon() const;
129-
130-- GroupInfo operator=(const GroupInfo &gi);
131-+ GroupInfo &operator=(const GroupInfo &gi);
132- bool operator==(const GroupInfo &gi) const;
133- bool operator<(const GroupInfo &gi) const;
134-
135---
136-1.7.5.4
137-
138
139=== removed file 'debian/patches/qwt6_build.patch'
140--- debian/patches/qwt6_build.patch 2011-08-25 16:35:57 +0000
141+++ debian/patches/qwt6_build.patch 1970-01-01 00:00:00 +0000
142@@ -1,17 +0,0 @@
143-Backport from KDE trunk b3527f12ad9f577535d07e9614cfda9ef8131910
144-Index: kdeplasma-addons-4.7.0/applets/kdeobservatory/src/commithistoryview.cpp
145-===================================================================
146---- kdeplasma-addons-4.7.0.orig/applets/kdeobservatory/src/commithistoryview.cpp 2011-08-25 12:21:01.379133375 -0400
147-+++ kdeplasma-addons-4.7.0/applets/kdeobservatory/src/commithistoryview.cpp 2011-08-25 12:22:39.299133403 -0400
148-@@ -124,7 +124,11 @@
149- plot->setCanvasBackground(QColor(0, 0, 140));
150-
151- QwtPlotCurve *curve = new QwtPlotCurve;
152-+#if QWT_VERSION >= (((6) << 16) | ((0) << 8) | (0))
153-+ curve->setSamples(x, y, j);
154-+#else
155- curve->setData(x, y, j);
156-+#endif
157- delete []x;
158- delete []y;
159-
160
161=== modified file 'debian/patches/series'
162--- debian/patches/series 2011-08-25 16:35:57 +0000
163+++ debian/patches/series 2011-09-04 10:13:23 +0000
164@@ -1,5 +1,3 @@
165 kubuntu_04_kimpanel_disable_scim.diff
166 #kubuntu_02_microblog_default_configuration.diff
167 #kubuntu_03_opendestop_setup.diff
168-kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
169-qwt6_build.patch

Subscribers

People subscribed via source and target branches

to all changes: