[Python-modules-commits] r15873 - in packages/pyqwt3d/trunk/debian (17 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sat Feb 26 09:29:36 UTC 2011
Date: Saturday, February 26, 2011 @ 09:29:32
Author: gudjon-guest
Revision: 15873
* Remove qt3 support (Closes: #604372)
* Switch from dpatch to quilt. Rewrite all patches
* Switch to dpkg-source 3.0 (quilt) format
* Bump standards version to 3.9.1
Added:
packages/pyqwt3d/trunk/debian/patches/01_configure.patch
packages/pyqwt3d/trunk/debian/patches/02_ezplot.patch
packages/pyqwt3d/trunk/debian/patches/03_fix_const_char.patch
packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.patch
packages/pyqwt3d/trunk/debian/patches/series
Modified:
packages/pyqwt3d/trunk/debian/changelog
packages/pyqwt3d/trunk/debian/control
packages/pyqwt3d/trunk/debian/rules
packages/pyqwt3d/trunk/debian/source/format
Deleted:
packages/pyqwt3d/trunk/debian/patches/00list
packages/pyqwt3d/trunk/debian/patches/01_configure.dpatch
packages/pyqwt3d/trunk/debian/patches/02_ezplot.dpatch
packages/pyqwt3d/trunk/debian/patches/03_fix_const_char.dpatch
packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch
packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.dirs
packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.install
packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.preinst
Modified: packages/pyqwt3d/trunk/debian/changelog
===================================================================
--- packages/pyqwt3d/trunk/debian/changelog 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/changelog 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1,3 +1,12 @@
+pyqwt3d (0.1.7~cvs20090625-5) UNRELEASED; urgency=low
+
+ * Remove qt3 support (Closes: #604372)
+ * Switch from dpatch to quilt. Rewrite all patches
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Bump standards version to 3.9.1
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sat, 26 Feb 2011 10:25:19 +0100
+
pyqwt3d (0.1.7~cvs20090625-4) unstable; urgency=low
* Fix sip version (Closes: #567227)
Modified: packages/pyqwt3d/trunk/debian/control
===================================================================
--- packages/pyqwt3d/trunk/debian/control 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/control 2011-02-26 09:29:32 UTC (rev 15873)
@@ -3,29 +3,16 @@
Priority: optional
Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.4.4-2), dpatch,
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.4.4-2),
python-sip-dev, python-numpy (>= 1.0.2), python-support (>= 0.7.1),
- python-qt-dev, python-qt3-gl (>= 3.18.1), libqt4-opengl-dev,
- python-qt4-dev (>=4.5.1), python-qt4 (>= 4.5.1), python-qt4-gl (>= 4.5.1),
- libqwtplot3d-qt3-dev (>= 0.2.7+svn191), libqwtplot3d-qt4-dev (>= 0.2.7+svn191)
+ python-qt-dev, libqt4-opengl-dev,
+ python-qt4-dev (>=4.5.1), python-qt4 (>= 4.5.1), python-qt4-gl (>= 4.5.1),
+ libqwtplot3d-qt4-dev
Homepage: http://pyqwt.sourceforge.net/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyqwt3d/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyqwt3d/trunk/
-Package: python-qwt3d-qt3
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${sip:Depends},
- python-qt3-gl
-Recommends: python-numpy
-Description: Python bindings of the QwtPlot3D library
- PyQwt3D is a set of Python bindings for the QwtPlot3D C++ class
- library which extends the Qt framework with widgets to visualize
- 3-dimensional data.
- .
- This package contains the Qt3 Python bindings
-
Package: python-qwt3d-qt4
Section: python
Architecture: any
Deleted: packages/pyqwt3d/trunk/debian/patches/00list
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/00list 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/patches/00list 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1,5 +0,0 @@
-01_configure
-02_ezplot
-03_fix_const_char
-04_fix_sip4.10
-
Deleted: packages/pyqwt3d/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/01_configure.dpatch 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/patches/01_configure.dpatch 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_configure.dpatch by Gudjon I. Gudjonsson <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The Debian QwtPlot3D libraries are named libqwtplot3d-qt{3,4},
-## DP: not libqwtplot3d
-
- at DPATCH@
-
---- pyqwt3d-0.1.4.orig/configure/configure.py
-+++ pyqwt3d-0.1.4/configure/configure.py
-@@ -564,6 +564,9 @@
- elif 'qwtplot3d' not in options.extra_libs:
- # no, add 'qwtplot3d' if needed
- options.extra_libs.append('qwtplot3d')
-+ # This line is added by the Debian
-+ while options.extra_libs.count('qwtplot3d'):
-+ options.extra_libs.remove('qwtplot3d')
-
- # do we also compile and link the sources of zlib into PyQwt3D?
- if options.zlib_sources:
Added: packages/pyqwt3d/trunk/debian/patches/01_configure.patch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/01_configure.patch (rev 0)
+++ packages/pyqwt3d/trunk/debian/patches/01_configure.patch 2011-02-26 09:29:32 UTC (rev 15873)
@@ -0,0 +1,16 @@
+The Debian QwtPlot3D libraries are named libqwtplot3d-qt{3,4},
+not libqwtplot3d
+--- a/configure/configure.py
++++ b/configure/configure.py
+@@ -586,7 +586,10 @@
+ elif 'qwtplot3d' not in options.extra_libs:
+ # no, add 'qwtplot3d' if needed
+ options.extra_libs.append('qwtplot3d')
+-
++ # This line is added by the Debian
++ while options.extra_libs.count('qwtplot3d'):
++ options.extra_libs.remove('qwtplot3d')
++
+ # do we also compile and link the sources of zlib into PyQwt3D?
+ if options.zlib_sources:
+ options.extra_defines.append('HAVE_ZLIB')
Deleted: packages/pyqwt3d/trunk/debian/patches/02_ezplot.dpatch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/02_ezplot.dpatch 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/patches/02_ezplot.dpatch 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_ezplot.dpatch by Gudjon I. Gudjonsson <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP:
-
- at DPATCH@
-diff -urNad pyqwt3d-0.1.6~/qt3lib/Qwt3D/ezplot.py pyqwt3d-0.1.6/qt3lib/Qwt3D/ezplot.py
---- pyqwt3d-0.1.6~/qt3lib/Qwt3D/ezplot.py 2007-10-01 14:41:18.000000000 +0200
-+++ pyqwt3d-0.1.6/qt3lib/Qwt3D/ezplot.py 2007-10-01 15:29:00.000000000 +0200
-@@ -1,7 +1,4 @@
--#!/usr/bin/env python
--"""
--ezplot is some sugar coating for Qwt3D
--"""
-+# ezplot is some sugar coating for Qwt3D
- # Copyright (C) 2003-2007 Gerard Vermeulen
- #
- # This file is part of PyQwt3D.
-@@ -32,8 +29,8 @@
- __all__ = ('plot',)
-
- import numpy as np
--from _Qwt3D import SurfacePlot, RGBA
--from _Qwt3D import X1, X2, X3, X4, Y1, Y2, Y3, Y4, Z1, Z2, Z3, Z4
-+from Qwt3D._Qwt3D import SurfacePlot, RGBA
-+from Qwt3D._Qwt3D import X1, X2, X3, X4, Y1, Y2, Y3, Y4, Z1, Z2, Z3, Z4
-
-
- def tocube(x, y, z):
-diff -urNad pyqwt3d-0.1.6~/qt4lib/PyQt4/Qwt3D/ezplot.py pyqwt3d-0.1.6/qt4lib/PyQt4/Qwt3D/ezplot.py
---- pyqwt3d-0.1.6~/qt4lib/PyQt4/Qwt3D/ezplot.py 2007-10-01 14:41:18.000000000 +0200
-+++ pyqwt3d-0.1.6/qt4lib/PyQt4/Qwt3D/ezplot.py 2007-10-01 15:29:09.000000000 +0200
-@@ -1,7 +1,4 @@
--#!/usr/bin/env python
--"""
--ezplot is some sugar coating for Qwt3D
--"""
-+# ezplot is some sugar coating for Qwt3D
- # Copyright (C) 2003-2007 Gerard Vermeulen
- #
- # This file is part of PyQwt3D.
-@@ -32,8 +29,8 @@
- __all__ = ('plot',)
-
- import numpy as np
--from _Qwt3D import SurfacePlot, RGBA
--from _Qwt3D import X1, X2, X3, X4, Y1, Y2, Y3, Y4, Z1, Z2, Z3, Z4
-+from PyQt4.Qwt3D._Qwt3D import SurfacePlot, RGBA
-+from PyQt4.Qwt3D._Qwt3D import X1, X2, X3, X4, Y1, Y2, Y3, Y4, Z1, Z2, Z3, Z4
-
-
- def tocube(x, y, z):
Added: packages/pyqwt3d/trunk/debian/patches/02_ezplot.patch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/02_ezplot.patch (rev 0)
+++ packages/pyqwt3d/trunk/debian/patches/02_ezplot.patch 2011-02-26 09:29:32 UTC (rev 15873)
@@ -0,0 +1,25 @@
+ezplot should not contain #!/usr/bin/python in first line.
+Fix import of Qwt3D modules
+--- a/qt4lib/PyQt4/Qwt3D/ezplot.py
++++ b/qt4lib/PyQt4/Qwt3D/ezplot.py
+@@ -1,7 +1,5 @@
+-#!/usr/bin/env python
+-"""
+-ezplot is some sugar coating for Qwt3D
+-"""
++#ezplot is some sugar coating for Qwt3D
++
+ # Copyright (C) 2003-2007 Gerard Vermeulen
+ #
+ # This file is part of PyQwt3D.
+@@ -32,8 +30,8 @@
+ __all__ = ('plot',)
+
+ import numpy as np
+-from _Qwt3D import SurfacePlot, RGBA
+-from _Qwt3D import X1, X2, X3, X4, Y1, Y2, Y3, Y4, Z1, Z2, Z3, Z4
++from PyQt4.Qwt3D._Qwt3D import SurfacePlot, RGBA
++from PyQt4.Qwt3D._Qwt3D import X1, X2, X3, X4, Y1, Y2, Y3, Y4, Z1, Z2, Z3, Z4
+
+
+ def tocube(x, y, z):
Deleted: packages/pyqwt3d/trunk/debian/patches/03_fix_const_char.dpatch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/03_fix_const_char.dpatch 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/patches/03_fix_const_char.dpatch 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03.dpatch by <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch fixes compilation with sip 4.8.1
-
- at DPATCH@
-diff -urNad pyqwt3d-0.1.7~cvs20090625~/sip/qwt3d_plot.sip pyqwt3d-0.1.7~cvs20090625/sip/qwt3d_plot.sip
---- pyqwt3d-0.1.7~cvs20090625~/sip/qwt3d_plot.sip 2008-11-02 09:57:02.000000000 +0100
-+++ pyqwt3d-0.1.7~cvs20090625/sip/qwt3d_plot.sip 2009-06-26 15:52:56.000000000 +0200
-@@ -41,7 +41,7 @@
-
- %ConvertToSubClassCode
- static struct class_graph {
-- char *name;
-+ const char *name;
- sipWrapperType **type;
- int yes, no;
- } graph[] = {
Added: packages/pyqwt3d/trunk/debian/patches/03_fix_const_char.patch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/03_fix_const_char.patch (rev 0)
+++ packages/pyqwt3d/trunk/debian/patches/03_fix_const_char.patch 2011-02-26 09:29:32 UTC (rev 15873)
@@ -0,0 +1,12 @@
+This patch fixes compilation with sip 4.8.1
+--- a/sip/qwt3d_plot.sip
++++ b/sip/qwt3d_plot.sip
+@@ -41,7 +41,7 @@
+
+ %ConvertToSubClassCode
+ static struct class_graph {
+- char *name;
++ const char *name;
+ sipWrapperType **type;
+ int yes, no;
+ } graph[] = {
Deleted: packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.dpatch 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1,40 +0,0 @@
-#! /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] */
Added: packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.patch
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.patch (rev 0)
+++ packages/pyqwt3d/trunk/debian/patches/04_fix_sip4.10.patch 2011-02-26 09:29:32 UTC (rev 15873)
@@ -0,0 +1,21 @@
+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 @@
+
+ // 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] */
Added: packages/pyqwt3d/trunk/debian/patches/series
===================================================================
--- packages/pyqwt3d/trunk/debian/patches/series (rev 0)
+++ packages/pyqwt3d/trunk/debian/patches/series 2011-02-26 09:29:32 UTC (rev 15873)
@@ -0,0 +1,4 @@
+01_configure.patch
+02_ezplot.patch
+03_fix_const_char.patch
+04_fix_sip4.10.patch
Deleted: packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.dirs
===================================================================
--- packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.dirs 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.dirs 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1 +0,0 @@
-usr/share/sip/qt/Qwt3D
Deleted: packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.install
===================================================================
--- packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.install 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.install 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1,2 +0,0 @@
-usr/*/python*/*-packages/Qwt3D/*
-usr/share/sip/qt/Qwt3D/*
Deleted: packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.preinst
===================================================================
--- packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.preinst 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/python-qwt3d-qt3.preinst 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1,9 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 0.1.7~cvs20090625-1
-then
- pycentral pkgremove python-qwt3d-qt3
-fi
-
-#DEBHELPER#
Modified: packages/pyqwt3d/trunk/debian/rules
===================================================================
--- packages/pyqwt3d/trunk/debian/rules 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/rules 2011-02-26 09:29:32 UTC (rev 15873)
@@ -4,11 +4,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
PYTHONS := $(shell pyversions -vr)
CURDIR := $(shell pwd)
-QTS=3 4
+QTS=4
py_qt_version = $(shell dpkg -s python-qt$(strip $(1))-gl | grep '^Version' | sed 's,Version: \(.*\)-[^-]*$$,\1,')
@@ -24,10 +22,9 @@
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
chmod 644 qt4lib/PyQt4/Qwt3D/ezplot.py
- chmod 644 qt3lib/Qwt3D/ezplot.py
for pyvers in ${PYTHONS};\
do\
for qtvers in ${QTS};\
@@ -55,7 +52,7 @@
done
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -75,8 +72,7 @@
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install);\
done;\
done
- mkdir -p debian/tmp/usr/share/doc/python-qwt3d-doc/qt3examples
- cp -a examples/* debian/tmp/usr/share/doc/python-qwt3d-doc/qt3examples
+ mkdir -p debian/tmp/usr/share/doc/python-qwt3d-doc/
cp -a qt4examples debian/tmp/usr/share/doc/python-qwt3d-doc/
cp -a Doc/html debian/tmp/usr/share/doc/python-qwt3d-doc/
@@ -103,7 +99,6 @@
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
dh_pysupport -a
dh_sip -a
Modified: packages/pyqwt3d/trunk/debian/source/format
===================================================================
--- packages/pyqwt3d/trunk/debian/source/format 2011-02-26 08:01:47 UTC (rev 15872)
+++ packages/pyqwt3d/trunk/debian/source/format 2011-02-26 09:29:32 UTC (rev 15873)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list