[SCM] PyKDE4 packaging branch, master, updated. debian/4.13.1-1-7-g23dad67

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 31 15:32:30 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/pykde4.git;a=commitdiff;h=3dbaa99

The following commit has been merged in the master branch:
commit 3dbaa99dea9c6dd342fb1ec863a9b4ba1f1bb330
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jul 31 16:28:17 2014 +0200

    Remove upstream applied patch: no_gl_defines.diff
---
 debian/changelog                  |  1 +
 debian/patches/no_gl_defines.diff | 18 ------------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78ac0c9..8280192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ pykde4 (4:4.13.3-1) UNRELEASED; urgency=medium
 
   [ Maximiliano Curia ]
   * New upstream release.
+  * Remove upstream applied patch: no_gl_defines.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:22:42 +0200
 
diff --git a/debian/patches/no_gl_defines.diff b/debian/patches/no_gl_defines.diff
deleted file mode 100644
index 93307ce..0000000
--- a/debian/patches/no_gl_defines.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix build with python-qt4 4.11
-Author: Rex Dieter <rdieter at math.unl.edu>
-Forwarded: yes, https://bugs.kde.org/show_bug.cgi?id=332223#c4
-Last-Update: 2014-06-07
-
---- a/sip/plasma/glapplet.sip
-+++ b/sip/plasma/glapplet.sip
-@@ -18,8 +18,8 @@
- // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- //force
--typedef unsigned int GLuint;
--typedef unsigned int GLenum;
-+//typedef unsigned int GLuint;
-+//typedef unsigned int GLenum;
- 
- namespace Plasma
- {

-- 
PyKDE4 packaging



More information about the pkg-kde-commits mailing list