[Python-modules-commits] r15871 - in packages/pyqwt5/trunk/debian (13 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sat Feb 26 07:53:09 UTC 2011
Date: Saturday, February 26, 2011 @ 07:52:32
Author: gudjon-guest
Revision: 15871
* Remove qt3 support (Closes: #604373)
* Switch to dpkg-source 3.0 (quilt) format
* Bump standards to 3.9.1
* Patch 03_fix_QwtMemArray removed. Only used for qt3
* Rewrite other patches to quilt format
Added:
packages/pyqwt5/trunk/debian/patches/01_confiure.patch
packages/pyqwt5/trunk/debian/patches/02_examples.patch
packages/pyqwt5/trunk/debian/patches/series
Modified:
packages/pyqwt5/trunk/debian/changelog
packages/pyqwt5/trunk/debian/control
packages/pyqwt5/trunk/debian/rules
packages/pyqwt5/trunk/debian/source/format
Deleted:
packages/pyqwt5/trunk/debian/patches/00list
packages/pyqwt5/trunk/debian/patches/01_configure.dpatch
packages/pyqwt5/trunk/debian/patches/02_examples.dpatch
packages/pyqwt5/trunk/debian/patches/03_fix_QwtMemArray.dpatch
packages/pyqwt5/trunk/debian/python-qwt5-qt3.dirs
packages/pyqwt5/trunk/debian/python-qwt5-qt3.install
Modified: packages/pyqwt5/trunk/debian/changelog
===================================================================
--- packages/pyqwt5/trunk/debian/changelog 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/changelog 2011-02-26 07:52:32 UTC (rev 15871)
@@ -1,3 +1,13 @@
+pyqwt5 (5.2.1~cvs20091107+dfsg-4) unstable; urgency=low
+
+ * Remove qt3 support (Closes: #604373)
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Bump standards to 3.9.1
+ * Patch 03_fix_QwtMemArray removed. Only used for qt3
+ * Rewrite other patches to quilt format
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sat, 26 Feb 2011 08:51:48 +0100
+
pyqwt5 (5.2.1~cvs20091107+dfsg-3) unstable; urgency=low
* Upgrade to new sip version (Closes: #567228)
Modified: packages/pyqwt5/trunk/debian/control
===================================================================
--- packages/pyqwt5/trunk/debian/control 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/control 2011-02-26 07:52:32 UTC (rev 15871)
@@ -3,29 +3,14 @@
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), dpatch, python-all-dev (>= 2.4.4-2), python-support (>= 0.7.1),
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.4.4-2), python-support (>= 0.7.1),
python-numpy (>= 1.0.2-2), python-sip-dev,
- libqwt5-qt4-dev (>=5.0.1), python-qt4 (>= 4.5.1), python-qt4-dev (>=4.5.1),
- libqwt5-qt3-dev (>=5.0.1), python-qt3, python-qt-dev
-Standards-Version: 3.8.4
+ libqwt5-qt4-dev (>=5.0.1), python-qt4 (>= 4.5.1), python-qt4-dev (>=4.5.1)
+Standards-Version: 3.9.1
Homepage: http://pyqwt.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyqwt5/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyqwt5/trunk/
-Package: python-qwt5-qt3
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${pythonqt3:Depends},
- ${sip:Depends}, ${libqwt5qt3:Depends}, python-numpy
-Recommends: libqwt5-qt3-dev
-Description: Python version of the Qwt5 technical widget library
- PyQwt is a set of Python bindings for the Qwt C++ class library which extends
- the Qt framework with widgets for scientific and engineering applications.
- It provides a widget to plot 2-dimensional data and various widgets to
- display and control bounded or unbounded floating point values.
- .
- This version is compiled against Qt, version 3.
-
Package: python-qwt5-qt4
Section: python
Architecture: any
Deleted: packages/pyqwt5/trunk/debian/patches/00list
===================================================================
--- packages/pyqwt5/trunk/debian/patches/00list 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/patches/00list 2011-02-26 07:52:32 UTC (rev 15871)
@@ -1,2 +0,0 @@
-01_configure
-03_fix_QwtMemArray
Deleted: packages/pyqwt5/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/pyqwt5/trunk/debian/patches/01_configure.dpatch 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/patches/01_configure.dpatch 2011-02-26 07:52:32 UTC (rev 15871)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_configure.dpatch by Gudjon I. Gudjonsson <gudjon at gudjon.org>
-##
-## All lines beginning with are a description of the patch.
-## DP: The Debian Qwt libraries are named libqwt-qt{3,4}, not libqwt
-
- at DPATCH@
-diff -urNad pyqwt5-5.2.1~cvs20091107+dfsg~/configure/configure.py pyqwt5-5.2.1~cvs20091107+dfsg/configure/configure.py
---- pyqwt5-5.2.1~cvs20091107+dfsg~/configure/configure.py 2009-11-07 19:52:18.000000000 +0100
-+++ pyqwt5-5.2.1~cvs20091107+dfsg/configure/configure.py 2009-11-07 19:53:02.000000000 +0100
-@@ -768,6 +768,9 @@
- elif qwt not in options.extra_libs:
- # no, add the qwt library if needed
- options.extra_libs.append(qwt)
-+ # Added for the Debian packaging script
-+ while options.extra_libs.count(qwt):
-+ options.extra_libs.remove(qwt)
-
- # zap the temporary directory
- try:
-@@ -1119,9 +1122,9 @@
- if __name__ == '__main__':
- try:
- main()
-- except Die as e:
-- inform('%s\n' % e.args)
-- sys.exit(1)
-+ #except Die as e:
-+ # inform('%s\n' % e.args)
-+ # sys.exit(1)
- except:
- for entry in traceback.extract_tb(sys.exc_info()[-1]):
- if 'optparse.py' in entry[0]:
Added: packages/pyqwt5/trunk/debian/patches/01_confiure.patch
===================================================================
--- packages/pyqwt5/trunk/debian/patches/01_confiure.patch (rev 0)
+++ packages/pyqwt5/trunk/debian/patches/01_confiure.patch 2011-02-26 07:52:32 UTC (rev 15871)
@@ -0,0 +1,27 @@
+Remove the extra library added by the configure.py script. Doesn't fit
+the Debian library naming
+--- a/configure/configure.py
++++ b/configure/configure.py
+@@ -768,6 +768,9 @@
+ elif qwt not in options.extra_libs:
+ # no, add the qwt library if needed
+ options.extra_libs.append(qwt)
++ # Added for the Debian packaging script
++ while options.extra_libs.count(qwt):
++ options.extra_libs.remove(qwt)
+
+ # zap the temporary directory
+ try:
+@@ -1119,9 +1122,9 @@
+ if __name__ == '__main__':
+ try:
+ main()
+- except Die as e:
+- inform('%s\n' % e.args)
+- sys.exit(1)
++ #except Die as e:
++ # inform('%s\n' % e.args)
++ # sys.exit(1)
+ except:
+ for entry in traceback.extract_tb(sys.exc_info()[-1]):
+ if 'optparse.py' in entry[0]:
Deleted: packages/pyqwt5/trunk/debian/patches/02_examples.dpatch
===================================================================
--- packages/pyqwt5/trunk/debian/patches/02_examples.dpatch 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/patches/02_examples.dpatch 2011-02-26 07:52:32 UTC (rev 15871)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_examples.dpatch by Gudjon I. Gudjonsson <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: MultiDemo is excluded because the Debian package
-## DP: is compiled without support for numarray and numeric.
-
- at DPATCH@
-
---- pyqwt5-5.0.0.orig/qt3examples/Grab.py
-+++ pyqwt5-5.0.0/qt3examples/Grab.py
-@@ -26,7 +26,7 @@
- # 'EventFilterDemo',
- 'ImagePlotDemo',
- 'MapDemo',
-- 'MultiDemo',
-+# 'MultiDemo',
- 'RadioDemo',
- 'ReallySimpleDemo',
- 'SimpleDemo',
---- pyqwt5-5.0.0.orig/qt4examples/Grab.py
-+++ pyqwt5-5.0.0/qt4examples/Grab.py
-@@ -26,7 +26,7 @@
- 'EventFilterDemo',
- 'ImagePlotDemo',
- 'MapDemo',
-- 'MultiDemo',
-+# 'MultiDemo',
- 'RadioDemo',
- 'ReallySimpleDemo',
- 'SimpleDemo',
Added: packages/pyqwt5/trunk/debian/patches/02_examples.patch
===================================================================
--- packages/pyqwt5/trunk/debian/patches/02_examples.patch (rev 0)
+++ packages/pyqwt5/trunk/debian/patches/02_examples.patch 2011-02-26 07:52:32 UTC (rev 15871)
@@ -0,0 +1,13 @@
+MultiDemo is excluded because the Debian package
+is compiled without support for numarray and numeric
+--- a/qt4examples/Grab.py
++++ b/qt4examples/Grab.py
+@@ -29,7 +29,7 @@
+ 'ImagePlotDemo',
+ 'MapDemo',
+ 'MaskedDataDemo',
+- 'MultiDemo',
++# 'MultiDemo',
+ 'PickerDemo',
+ 'RadioDemo',
+ 'ReallySimpleDemo',
Deleted: packages/pyqwt5/trunk/debian/patches/03_fix_QwtMemArray.dpatch
===================================================================
--- packages/pyqwt5/trunk/debian/patches/03_fix_QwtMemArray.dpatch 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/patches/03_fix_QwtMemArray.dpatch 2011-02-26 07:52:32 UTC (rev 15871)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_QwtMemArray.dpatch by <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The content has to be commented out for the package to compile
-
- at DPATCH@
-diff -urNad pyqwt5-5.1.0.dfsg~/sip/qwt5qt3/common/QwtMemArray.sip pyqwt5-5.1.0.dfsg/sip/qwt5qt3/common/QwtMemArray.sip
---- pyqwt5-5.1.0.dfsg~/sip/qwt5qt3/common/QwtMemArray.sip 2007-01-21 16:02:27.000000000 +0100
-+++ pyqwt5-5.1.0.dfsg/sip/qwt5qt3/common/QwtMemArray.sip 2009-05-07 08:45:37.000000000 +0200
-@@ -31,6 +31,7 @@
-
-
- // QMemArray<TYPE> is implemented as a Python list.
-+/*
- template<TYPE>
- %MappedType QMemArray<TYPE>
- {
-@@ -86,7 +87,7 @@
- return sipGetState(sipTransferObj);
- %End
- }; // template<TYPE> %MappedType QMemArray<TYPE>
--
-+*/
-
- // Local Variables:
- // mode: C++
Added: packages/pyqwt5/trunk/debian/patches/series
===================================================================
--- packages/pyqwt5/trunk/debian/patches/series (rev 0)
+++ packages/pyqwt5/trunk/debian/patches/series 2011-02-26 07:52:32 UTC (rev 15871)
@@ -0,0 +1,2 @@
+01_confiure.patch
+02_examples.patch
Deleted: packages/pyqwt5/trunk/debian/python-qwt5-qt3.dirs
===================================================================
--- packages/pyqwt5/trunk/debian/python-qwt5-qt3.dirs 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/python-qwt5-qt3.dirs 2011-02-26 07:52:32 UTC (rev 15871)
@@ -1 +0,0 @@
-usr/share/sip/qt/Qwt5
Deleted: packages/pyqwt5/trunk/debian/python-qwt5-qt3.install
===================================================================
--- packages/pyqwt5/trunk/debian/python-qwt5-qt3.install 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/python-qwt5-qt3.install 2011-02-26 07:52:32 UTC (rev 15871)
@@ -1,2 +0,0 @@
-usr/*/python*/*-packages/Qwt5/*
-usr/share/sip/qt/Qwt5/*
Modified: packages/pyqwt5/trunk/debian/rules
===================================================================
--- packages/pyqwt5/trunk/debian/rules 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/rules 2011-02-26 07:52:32 UTC (rev 15871)
@@ -4,10 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
PYTHONS := $(shell pyversions -vr)
-QTS=3 4
+QTS=4
py_qt_version = $(shell dpkg -s python-qt$(strip $(1)) | grep '^Version' | sed 's,Version: \(.*\)-[^-]*$$,\1,')
libqwt5_version = $(shell dpkg -s libqwt5-qt$(strip $(1)) | grep '^Version' | sed 's,Version: \(.*\)-[^-]*$$,\1,')
@@ -23,9 +21,8 @@
endif
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
- chmod ugo+x qt3lib/Qwt5/grace.py
chmod ugo+x qt4lib/PyQt4/Qwt5/grace.py
set -e; for pyvers in ${PYTHONS};\
do\
@@ -56,11 +53,11 @@
build-indep: build-indep-stamp
build-indep-stamp: configure-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- rm -f sip/qwt5qt3/QwtTypes.sip sip/qwt5qt4/QwtTypes.sip
+ rm -f sip/qwt5qt4/QwtTypes.sip
rm -rf build
dh_clean
@@ -112,8 +109,6 @@
dh_compress -a --exclude=.py --exclude=.resX
dh_pysupport -a
dh_sip -a
- echo 'pythonqt3:Depends=python-qt3 (>= $(call py_qt_version, 3))' >> debian/python-qwt5-qt3.substvars
- echo 'libqwt5qt3:Depends=libqwt5-qt3 (>= $(call libqwt5_version, 3))' >> debian/python-qwt5-qt3.substvars
echo 'pythonqt4:Depends=python-qt4 (>= $(call py_qt_version, 4))' >> debian/python-qwt5-qt4.substvars
echo 'libqwt5qt4:Depends=libqwt5-qt4 (>= $(call libqwt5_version, 4))' >> debian/python-qwt5-qt4.substvars
dh_fixperms -a
Modified: packages/pyqwt5/trunk/debian/source/format
===================================================================
--- packages/pyqwt5/trunk/debian/source/format 2011-02-25 01:18:28 UTC (rev 15870)
+++ packages/pyqwt5/trunk/debian/source/format 2011-02-26 07:52:32 UTC (rev 15871)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list