[Python-modules-commits] r29559 - in packages/pyqwt3d/trunk/debian (3 files)

[gudjon-guest at users.alioth.debian.org]

    Date: Monday, June 30, 2014 @ 08:08:33
  Author: gudjon-guest
Revision: 29559

* Update patch 04_fix_sip4.10.patch to fix compilation (Closes: #751057)
* Bump standards version to 3.9.5, no changes

Modified:
  packages/pyqwt3d/trunk/debian/changelog
  packages/pyqwt3d/trunk/debian/control
  packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.patch

Modified: packages/pyqwt3d/trunk/debian/changelog
===================================================================
--- packages/pyqwt3d/trunk/debian/changelog	2014-06-29 22:40:34 UTC (rev 29558)
+++ packages/pyqwt3d/trunk/debian/changelog	2014-06-30 08:08:33 UTC (rev 29559)
@@ -1,3 +1,10 @@
+pyqwt3d (0.1.7~cvs20090625-13) unstable; urgency=medium
+
+  * Update patch 04_fix_sip4.10.patch to fix compilation (Closes: #751057)
+  * Bump standards version to 3.9.5, no changes
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Mon, 30 Jun 2014 07:51:06 +0000
+
 pyqwt3d (0.1.7~cvs20090625-12) unstable; urgency=medium
 
   * Binary rebuild, no change. Fixes segmentation fault.

Modified: packages/pyqwt3d/trunk/debian/control
===================================================================
--- packages/pyqwt3d/trunk/debian/control	2014-06-29 22:40:34 UTC (rev 29558)
+++ packages/pyqwt3d/trunk/debian/control	2014-06-30 08:08:33 UTC (rev 29559)
@@ -8,7 +8,7 @@
  python-qt4-dev (>= 4.8.3-3), python-qt4 (>= 4.8.3-3), python-qt4-gl (>= 4.5.1),
  libqwtplot3d-qt4-dev
 Homepage: http://pyqwt.sourceforge.net/
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.3
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyqwt3d/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyqwt3d/trunk/

Modified: packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.patch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.patch	2014-06-29 22:40:34 UTC (rev 29558)
+++ packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.patch	2014-06-30 08:08:33 UTC (rev 29559)
@@ -1,21 +1,35 @@
 04_fix_sip4.10.dpatch by  <gudjon at gudjon.org>
 --- a/sip/Qwt3D_Qt4_Module.sip
 +++ b/sip/Qwt3D_Qt4_Module.sip
-@@ -36,7 +36,7 @@
+@@ -35,20 +35,20 @@
+ %Import QtOpenGL/QtOpenGLmod.sip
  
  // typedef unsigned int    GLenum;
- typedef unsigned char   GLboolean;
+-typedef unsigned char   GLboolean;
 -typedef unsigned int    GLbitfield;
++//typedef unsigned char   GLboolean;
 +//typedef unsigned int    GLbitfield;
  typedef void            GLvoid;
- typedef /*signed*/ char GLbyte;         /* 1-byte signed */
- typedef short           GLshort;        /* 2-byte signed */
-@@ -45,7 +45,7 @@
- typedef unsigned short  GLushort;       /* 2-byte unsigned */
+-typedef /*signed*/ char GLbyte;         /* 1-byte signed */
+-typedef short           GLshort;        /* 2-byte signed */
++//typedef /*signed*/ char GLbyte;         /* 1-byte signed */
++//typedef short           GLshort;        /* 2-byte signed */
+ // typedef int             GLint;          /* 4-byte signed */
+-typedef unsigned char   GLubyte;        /* 1-byte unsigned */
+-typedef unsigned short  GLushort;       /* 2-byte unsigned */
++//typedef unsigned char   GLubyte;        /* 1-byte unsigned */
++//typedef unsigned short  GLushort;       /* 2-byte unsigned */
  // typedef unsigned int    GLuint;         /* 4-byte unsigned */
- typedef int             GLsizei;        /* 4-byte signed */
+-typedef int             GLsizei;        /* 4-byte signed */
 -typedef float           GLfloat;        /* single precision float */
+-typedef float           GLclampf;       /* single precision float in [0,1] */
+-typedef double          GLdouble;       /* double precision float */
+-typedef double          GLclampd;       /* double precision float in [0,1] */
++//typedef int             GLsizei;        /* 4-byte signed */
 +//typedef float           GLfloat;        /* single precision float */
- typedef float           GLclampf;       /* single precision float in [0,1] */
- typedef double          GLdouble;       /* double precision float */
- typedef double          GLclampd;       /* double precision float in [0,1] */
++//typedef float           GLclampf;       /* single precision float in [0,1] */
++//typedef double          GLdouble;       /* double precision float */
++//typedef double          GLclampd;       /* double precision float in [0,1] */
+ 
+ %Include qwt3dmod.sip
+