[SCM] cantor packaging branch, master, updated. debian/4.7.4-3-10-gb764a68

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/cantor.git;a=commitdiff;h=15e63e9

The following commit has been merged in the master branch:
commit 15e63e9d2929682e10cbf83976f388a029f158ba
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Jun 17 15:42:15 2012 +0200

    Remove upstream_Qualify-which-setupUi-is-being-called.patch.
---
 debian/changelog                                   |    2 +
 debian/patches/series                              |    1 -
 ...eam_Qualify-which-setupUi-is-being-called.patch |   29 --------------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb33068..3128d98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ cantor (4:4.8.4-0r0) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
   * Bump kdelibs5-dev build dependency to 4:4.8.
+  * Remove upstream_Qualify-which-setupUi-is-being-called.patch, applied
+    upstream.
   * Add watch file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 17 Jun 2012 03:14:24 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 1bfea8b..0fe063c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 no_install_rpath_use_link_path.diff
-upstream_Qualify-which-setupUi-is-being-called.patch
diff --git a/debian/patches/upstream_Qualify-which-setupUi-is-being-called.patch b/debian/patches/upstream_Qualify-which-setupUi-is-being-called.patch
deleted file mode 100644
index e0a4c75..0000000
--- a/debian/patches/upstream_Qualify-which-setupUi-is-being-called.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 56040ac851dc9180ae51c0e5041984abef54e7f2 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <kubo at profusion.mobi>
-Date: Mon, 2 Jan 2012 11:15:54 -0200
-Subject: [PATCH] Qualify which setupUi() is being called.
-
-DirectiveControl inherits from both UI and DirectiveProducer, and both
-provide setupUi(), which breaks the build with clang.
-
-Be explicit and call UI::setupUi().
----
- src/lib/extension.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/extension.h b/src/lib/extension.h
-index 2fec771..bfd859d 100644
---- a/src/lib/extension.h
-+++ b/src/lib/extension.h
-@@ -249,7 +249,7 @@ class CANTOR_EXPORT AdvancedPlotExtension : public Extension
-     template <class UI> class DirectiveControl : protected UI, public DirectiveProducer
-     {
-         public:
--            DirectiveControl(QWidget* parent) : DirectiveProducer(parent) { setupUi(this); }
-+            DirectiveControl(QWidget* parent) : DirectiveProducer(parent) { UI::setupUi(this); }
-         protected:
-             typedef DirectiveControl<UI> AbstractParent;
-     };
--- 
-1.7.10
-

-- 
cantor packaging