[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 01e26b7269916185739e0abd37abd7effd3dcc91
Author: Scott Kitterman <scott at kitterman.com>
Date:   Thu Aug 25 12:35:57 2011 -0400

    kdeplasma-addons (4:4.7.0-0ubuntu3) oneiric; urgency=low
    
      * Switch to build-dep on libqwt-dev to support transition to qwt6
      * Add debian/patches/qwt6_build.patch backported from upstream trunk to
        fix FTBFS with newer qwt
    
     -- Scott Kitterman <scott at kitterman.com>  Thu, 25 Aug 2011 12:23:57 -0400
---
 debian/changelog                |  8 ++++++++
 debian/control                  |  2 +-
 debian/patches/qwt6_build.patch | 17 +++++++++++++++++
 debian/patches/series           |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b6b8427..a38b39d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kdeplasma-addons (4:4.7.0-0ubuntu3) oneiric; urgency=low
+
+  * Switch to build-dep on libqwt-dev to support transition to qwt6
+  * Add debian/patches/qwt6_build.patch backported from upstream trunk to
+    fix FTBFS with newer qwt
+
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 25 Aug 2011 12:23:57 -0400
+
 kdeplasma-addons (4:4.7.0-0ubuntu2) oneiric; urgency=low
 
   * Cherry-pick upstream commit 67b5c56e564f5052238bab38342a85e5f4af570b
diff --git a/debian/control b/debian/control
index d8c8d60..1cda74f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.7.0),
  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,
  libqt4-opengl-dev, libboost1.46-dev, libqimageblitz-dev, libeigen2-dev, libxrender-dev,
- shared-desktop-ontologies, libattica-dev, libxtst-dev, libqwt5-qt4-dev, libqalculate-dev,
+ shared-desktop-ontologies, libattica-dev, libxtst-dev, libqwt-dev, libqalculate-dev,
  libqca2-dev, libqtwebkit-dev
 Standards-Version: 3.9.2
 Homepage: http://plasma.kde.org/
diff --git a/debian/patches/qwt6_build.patch b/debian/patches/qwt6_build.patch
new file mode 100644
index 0000000..33fa8a1
--- /dev/null
+++ b/debian/patches/qwt6_build.patch
@@ -0,0 +1,17 @@
+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 368ddc3..923440a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ 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