[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:26 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=5f86228

The following commit has been merged in the master branch:
commit 5f86228a56c15f7eb0826af0a5f72f6cd4d6b594
Author: Jonathan Kolberg <bulldog98 at kubuntu-de.org>
Date:   Sun Sep 4 11:59:10 2011 +0200

    New upstream release
---
 debian/changelog                                   |  8 +++
 debian/control                                     |  2 +-
 .../patches/kubuntu_04_kimpanel_disable_scim.diff  | 12 ++--
 ...signment-operator-and-add-copy-constructor.diff | 75 ----------------------
 debian/patches/qwt6_build.patch                    | 17 -----
 debian/patches/series                              |  2 -
 6 files changed, 15 insertions(+), 101 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a38b39d..a397b78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <bulldog98 at kubuntu-de.org>  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
diff --git a/debian/control b/debian/control
index 1cda74f..dd5b65a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.
 Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
  José Manuel Santamaría Lema <panfaust at gmail.com>
-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,
diff --git a/debian/patches/kubuntu_04_kimpanel_disable_scim.diff b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
index be199b8..4d6c9f2 100644
--- a/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
+++ b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
@@ -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 @@ Index: kdeplasma-addons-4.5.80/applets/CMakeLists.txt
     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)
diff --git a/debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff b/debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
deleted file mode 100644
index cc65f3b..0000000
--- a/debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-From 67b5c56e564f5052238bab38342a85e5f4af570b Mon Sep 17 00:00:00 2001
-From: Christoph Feck <christoph at maxiom.de>
-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
-
diff --git a/debian/patches/qwt6_build.patch b/debian/patches/qwt6_build.patch
deleted file mode 100644
index 33fa8a1..0000000
--- a/debian/patches/qwt6_build.patch
+++ /dev/null
@@ -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;
- 
diff --git a/debian/patches/series b/debian/patches/series
index 923440a..fc93edc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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

-- 
KDE Plasma Addons module packaging



More information about the pkg-kde-commits mailing list