[Python-modules-commits] r11617 - in packages/pyqwt3d/trunk/debian (5 files)

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

    Date: Sunday, February 7, 2010 @ 17:03:35
  Author: gudjon-guest
Revision: 11617

Version 0.1.7~cvs20090625-4 is ready for upload

Added:
  packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch
Modified:
  packages/pyqwt3d/trunk/debian/changelog
  packages/pyqwt3d/trunk/debian/control
  packages/pyqwt3d/trunk/debian/patches/00list
  packages/pyqwt3d/trunk/debian/rules

Modified: packages/pyqwt3d/trunk/debian/changelog
===================================================================
--- packages/pyqwt3d/trunk/debian/changelog	2010-02-07 15:10:50 UTC (rev 11616)
+++ packages/pyqwt3d/trunk/debian/changelog	2010-02-07 17:03:35 UTC (rev 11617)
@@ -2,8 +2,10 @@
 
   * Fix sip version (Closes: #567227)
   * Bump standards version to 3.8.4
+  * Add patch 04_fix_sip4.10 to fix compilation with sip4.10
+  * Add misc depends to python-qwt3d-doc
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 06 Feb 2010 13:36:02 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sun, 07 Feb 2010 18:02:53 +0100
 
 pyqwt3d (0.1.7~cvs20090625-3) unstable; urgency=low
 

Modified: packages/pyqwt3d/trunk/debian/control
===================================================================
--- packages/pyqwt3d/trunk/debian/control	2010-02-07 15:10:50 UTC (rev 11616)
+++ packages/pyqwt3d/trunk/debian/control	2010-02-07 17:03:35 UTC (rev 11617)
@@ -42,6 +42,7 @@
 Package: python-qwt3d-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Documentation for the Python-qwt3d library
  PyQwt3D is a set of Python bindings for the QwtPlot3D C++ class
  library which extends the Qt framework with widgets to visualize

Modified: packages/pyqwt3d/trunk/debian/patches/00list
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/00list	2010-02-07 15:10:50 UTC (rev 11616)
+++ packages/pyqwt3d/trunk/debian/patches/00list	2010-02-07 17:03:35 UTC (rev 11617)
@@ -1,3 +1,5 @@
 01_configure
 02_ezplot
 03_fix_const_char
+04_fix_sip4.10
+

Added: packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch	                        (rev 0)
+++ packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch	2010-02-07 17:03:35 UTC (rev 11617)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_sip4.10.dpatch by  <gudjon at gudjon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Comment out two typedefs that are redefined when using sip >=4.10
+
+ at DPATCH@
+diff -urNad pyqwt3d-0.1.7~cvs20090625~/sip/Qwt3D_Qt3_Module.sip pyqwt3d-0.1.7~cvs20090625/sip/Qwt3D_Qt3_Module.sip
+--- pyqwt3d-0.1.7~cvs20090625~/sip/Qwt3D_Qt3_Module.sip	2010-02-07 16:36:56.000000000 +0100
++++ pyqwt3d-0.1.7~cvs20090625/sip/Qwt3D_Qt3_Module.sip	2010-02-07 16:37:33.000000000 +0100
+@@ -35,7 +35,7 @@
+ 
+ typedef unsigned int    GLenum;
+ typedef unsigned char   GLboolean;
+-typedef unsigned int    GLbitfield;
++//typedef unsigned int    GLbitfield;
+ typedef void            GLvoid;
+ typedef /*signed*/ char GLbyte;         /* 1-byte signed */
+ typedef short           GLshort;        /* 2-byte signed */
+diff -urNad pyqwt3d-0.1.7~cvs20090625~/sip/Qwt3D_Qt4_Module.sip pyqwt3d-0.1.7~cvs20090625/sip/Qwt3D_Qt4_Module.sip
+--- pyqwt3d-0.1.7~cvs20090625~/sip/Qwt3D_Qt4_Module.sip	2010-02-07 16:36:56.000000000 +0100
++++ pyqwt3d-0.1.7~cvs20090625/sip/Qwt3D_Qt4_Module.sip	2010-02-07 16:36:59.000000000 +0100
+@@ -36,7 +36,7 @@
+ 
+ // typedef unsigned int    GLenum;
+ typedef unsigned char   GLboolean;
+-typedef unsigned int    GLbitfield;
++//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 unsigned int    GLuint;         /* 4-byte unsigned */
+ typedef int             GLsizei;        /* 4-byte signed */
+-typedef float           GLfloat;        /* single precision float */
++//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] */


Property changes on: packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/pyqwt3d/trunk/debian/rules
===================================================================
--- packages/pyqwt3d/trunk/debian/rules	2010-02-07 15:10:50 UTC (rev 11616)
+++ packages/pyqwt3d/trunk/debian/rules	2010-02-07 17:03:35 UTC (rev 11617)
@@ -103,8 +103,8 @@
 	dh_link -a
 	dh_strip -a
 	dh_compress -a --exclude=.cpp --exclude=.h --exclude=.resX
-	echo 'python-qt3-gl:Depends=python-qt3-gl (>= $(call py_qt_version, 3))' >> debian/python-qwt3d-qt3.substvars
-	echo 'python-qt4-gl:Depends=python-qt4-gl (>= $(call py_qt_version, 4))' >> debian/python-qwt3d-qt4.substvars
+	#echo 'python-qt3-gl:Depends=python-qt3-gl (>= $(call py_qt_version, 3))' >> debian/python-qwt3d-qt3.substvars
+	#echo 'python-qt4-gl:Depends=python-qt4-gl (>= $(call py_qt_version, 4))' >> debian/python-qwt3d-qt4.substvars
 	dh_pysupport -a
 	dh_sip -a
 	dh_installdeb -a