Jonathan Kolberg has proposed merging lp:~bulldog98/kubuntu-packaging/kdeplasma-addons into lp:~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~bulldog98/kubuntu-packaging/kdeplasma-addons/+merge/73991 -- https://code.launchpad.net/~bulldog98/kubuntu-packaging/kdeplasma-addons/+merge/73991 Your team Kubuntu Packagers is requested to review the proposed merge of lp:~bulldog98/kubuntu-packaging/kdeplasma-addons into lp:~kubuntu-packagers/kubuntu-packaging/kdeplasma-addons.
=== 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 @@ +kdeplasma-addons (4:4.7.1-0ubuntu1) UNRELEASED; urgency=low + + * New upstream release + * droped qwt6_build.patch + * droped kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff + + -- Jonathan Kolberg <[email protected]> Sun, 04 Sep 2011 11:26:03 +0200 + kdeplasma-addons (4:4.7.0-0ubuntu3) oneiric; urgency=low * Switch to build-dep on libqwt-dev to support transition to qwt6 === 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 @@ Uploaders: Sune Vuorela <[email protected]>, Fathi Boudra <[email protected]>, Armin Berres <[email protected]>, Modestas Vainius <[email protected]>, George Kiagiadakis <[email protected]>, José Manuel SantamarÃa Lema <[email protected]> -Build-Depends: kde-sc-dev-latest (>= 4:4.7.0), +Build-Depends: kde-sc-dev-latest (>= 4:4.7.1), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), kde-workspace-dev (>= 4:4.6), libkexiv2-dev (>= 4:4.6), libmarble-dev (>= 4:4.6), shared-mime-info, libglib2.0-dev, === 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 @@ -Index: kdeplasma-addons-4.5.80/applets/CMakeLists.txt +Index: kdeplasma-addons-4.7.1/applets/CMakeLists.txt =================================================================== ---- kdeplasma-addons-4.5.80.orig/applets/CMakeLists.txt 2010-10-19 13:40:15.000000000 +0000 -+++ kdeplasma-addons-4.5.80/applets/CMakeLists.txt 2010-11-26 13:35:57.058951002 +0000 +--- kdeplasma-addons-4.7.1.orig/applets/CMakeLists.txt 2011-05-20 22:37:49.000000000 +0200 ++++ kdeplasma-addons-4.7.1/applets/CMakeLists.txt 2011-09-04 11:29:14.000000000 +0200 @@ -87,11 +87,11 @@ if (Q_WS_X11) if (X11_Xrender_FOUND) @@ -18,10 +18,10 @@ endif (X11_Xrender_FOUND) endif (Q_WS_X11) -Index: kdeplasma-addons-4.5.80/applets/kimpanel/backend/CMakeLists.txt +Index: kdeplasma-addons-4.7.1/applets/kimpanel/backend/CMakeLists.txt =================================================================== ---- kdeplasma-addons-4.5.80.orig/applets/kimpanel/backend/CMakeLists.txt 2009-12-01 00:35:52.000000000 +0000 -+++ kdeplasma-addons-4.5.80/applets/kimpanel/backend/CMakeLists.txt 2010-11-26 13:35:57.058951002 +0000 +--- kdeplasma-addons-4.7.1.orig/applets/kimpanel/backend/CMakeLists.txt 2011-05-20 22:37:49.000000000 +0200 ++++ kdeplasma-addons-4.7.1/applets/kimpanel/backend/CMakeLists.txt 2011-09-04 11:29:14.000000000 +0200 @@ -1 +1 @@ -macro_optional_add_subdirectory(scim) +#macro_optional_add_subdirectory(scim) === 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 @@ -From 67b5c56e564f5052238bab38342a85e5f4af570b Mon Sep 17 00:00:00 2001 -From: Christoph Feck <[email protected]> -Date: Sat, 30 Jul 2011 19:15:28 +0200 -Subject: [PATCH] Fix assignment operator and add copy constructor - -This fixes the crash in Grid Desktop and Grouping Desktop. -Thanks to Aaron Seigo for investigation and patch review. - -BUG: 278222 -FIXED-IN: 4.7.1 ---- - containments/groupingdesktop/lib/groupinfo.cpp | 17 +++++++++++------ - containments/groupingdesktop/lib/groupinfo.h | 3 ++- - 2 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp -index 2106cca..c945551 100644 ---- a/containments/groupingdesktop/lib/groupinfo.cpp -+++ b/containments/groupingdesktop/lib/groupinfo.cpp -@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName) - d->prettyName = prettyName; - } - -+GroupInfo::GroupInfo(const GroupInfo &other) -+ : d(new GroupInfoPrivate()) -+{ -+ *d = *other.d; -+} -+ - GroupInfo::~GroupInfo() - { - delete d; -@@ -78,13 +84,12 @@ QString GroupInfo::icon() const - return d->icon; - } - --GroupInfo GroupInfo::operator=(const GroupInfo &gi) -+GroupInfo &GroupInfo::operator=(const GroupInfo &gi) - { -- GroupInfo g(gi.name(), gi.prettyName()); -- g.setFormFactors(gi.formFactors()); -- g.setIcon(gi.icon()); -- -- return g; -+ if (this != &gi) { -+ *d = *gi.d; -+ } -+ return *this; - } - - bool GroupInfo::operator==(const GroupInfo &gi) const -diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h -index f8cc66f..320c800 100644 ---- a/containments/groupingdesktop/lib/groupinfo.h -+++ b/containments/groupingdesktop/lib/groupinfo.h -@@ -31,6 +31,7 @@ class GroupInfo - { - public: - explicit GroupInfo(const QString &name, const QString &prettyName = QString()); -+ GroupInfo(const GroupInfo &other); - ~GroupInfo(); - void setFormFactors(QSet<Plasma::FormFactor> formFactors); - void setIcon(const QString &icon); -@@ -40,7 +41,7 @@ class GroupInfo - QSet<Plasma::FormFactor> formFactors() const; - QString icon() const; - -- GroupInfo operator=(const GroupInfo &gi); -+ GroupInfo &operator=(const GroupInfo &gi); - bool operator==(const GroupInfo &gi) const; - bool operator<(const GroupInfo &gi) const; - --- -1.7.5.4 - === 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 @@ -Backport from KDE trunk b3527f12ad9f577535d07e9614cfda9ef8131910 -Index: kdeplasma-addons-4.7.0/applets/kdeobservatory/src/commithistoryview.cpp -=================================================================== ---- kdeplasma-addons-4.7.0.orig/applets/kdeobservatory/src/commithistoryview.cpp 2011-08-25 12:21:01.379133375 -0400 -+++ kdeplasma-addons-4.7.0/applets/kdeobservatory/src/commithistoryview.cpp 2011-08-25 12:22:39.299133403 -0400 -@@ -124,7 +124,11 @@ - plot->setCanvasBackground(QColor(0, 0, 140)); - - QwtPlotCurve *curve = new QwtPlotCurve; -+#if QWT_VERSION >= (((6) << 16) | ((0) << 8) | (0)) -+ curve->setSamples(x, y, j); -+#else - curve->setData(x, y, j); -+#endif - delete []x; - delete []y; - === 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 @@ kubuntu_04_kimpanel_disable_scim.diff #kubuntu_02_microblog_default_configuration.diff #kubuntu_03_opendestop_setup.diff -kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff -qwt6_build.patch
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
