--- python-qt4-4.4.3.orig/debian/python-qt4-doc.doc-base +++ python-qt4-4.4.3/debian/python-qt4-doc.doc-base @@ -0,0 +1,12 @@ +Document: pyqt4 +Title: PyQt4 Reference and API Documentation +Author: Phil Thompson +Abstract: PyQt4 exposes the Qt4 API to Python programs + This documentation contains a general reference of + PyQt4 together with an API documentation for all + wrapped C++ classes. +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-qt4-doc/html/pyqt4ref.html +Files: /usr/share/doc/python-qt4-doc/html/*.html --- python-qt4-4.4.3.orig/debian/python-qt4-gl.install +++ python-qt4-4.4.3/debian/python-qt4-gl.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/PyQt4/QtOpenGL.so --- python-qt4-4.4.3.orig/debian/python-qt4-doc.examples +++ python-qt4-4.4.3/debian/python-qt4-doc.examples @@ -0,0 +1,2 @@ +examples/* + --- python-qt4-4.4.3.orig/debian/copyright +++ python-qt4-4.4.3/debian/copyright @@ -0,0 +1,81 @@ +This package was debianized by Torsten Marek on +Fri, 2 Dec 2005 11:43:16 +0100. + +It was downloaded from http://www.riverbankcomputing.co.uk + +Copyright (c) 2007 Riverbank Computing Limited + +License: + +PyQt4 is released under the terms of the GNU General Public License. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License with + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; + if not, write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA + + On Debian systems, the complete text of the GNU General Public + License, version 2, can be found in /usr/share/common-licenses/GPL-2. +------------------------------------------------------------------- + + +The files in pyuic/ are (c) 2005 Torsten Marek (shlomme@gmx.net) and +double-licensted under the GPL and the BSD license. A copy of the BSD +license is available as /usr/share/common-licenses/BSD in the +Debian GNU/Linux distribution. +------------------------------------------------------------------- + + +The files in elementtree/ are (c) 1999-2004 by Fredrik Lundh. +By obtaining, using, and/or copying this software and/or its +associated documentation, you agree that you have read, understood, +and will comply with the following terms and conditions: + +Permission to use, copy, modify, and distribute this software and +its associated documentation for any purpose and without fee is +hereby granted, provided that the above copyright notice appears in +all copies, and that both that copyright notice and this permission +notice appear in supporting documentation, and that the name of +Secret Labs AB or the author not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. + +SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- +ABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR +BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. +-------------------------------------------------------------------- + + +The Debian packaging is (C) 2006-2008, Torsten Marek +and licensed under the GPL. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License with + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; + if not, write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA + + On Debian systems, the complete text of the GNU General Public + License, version 2, can be found in /usr/share/common-licenses/GPL-2. --- python-qt4-4.4.3.orig/debian/python-qt4-doc.docs +++ python-qt4-4.4.3/debian/python-qt4-doc.docs @@ -0,0 +1,2 @@ +doc/pyqt4ref.txt +doc/html --- python-qt4-4.4.3.orig/debian/control +++ python-qt4-4.4.3/debian/control @@ -0,0 +1,144 @@ +Source: python-qt4 +Section: python +Priority: optional +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team +Uploaders: Torsten Marek +Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.7.6), python-sip4-dev (>= 4.7.6), python-central (>= 0.6), dpatch, python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip4-dbg, libqt4-opengl-dev +Build-Conflicts: python-xml, python-xml-dbg +Standards-Version: 3.8.0 +Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/ +XS-Python-Version: all +Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt4/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/?op=log + +Package: python-qt4 +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.7.6), python-sip4 (<< 4.8), python-qt4-common +Suggests: python-qt4-dbg +XB-Python-Version: ${python:Versions} +Description: Python bindings for Qt4 + PyQt4 exposes the Qt4 API to Python. The following modules are supported: + * QtCore + * QtGui + * QtNetwork + * QtXml + * QtScript + * QtSvg + * QtTest + * QtAssistant + * QtWebKit + * QtOpenGL (in python-qt4-gl) + * QtSql (in python-qt4-sql) + +Package: python-qt4-dbg +Priority: extra +Architecture: any +Depends: python-qt4 (= ${binary:Version}), python-dbg, python-sip4-dbg (>= 4.7), ${shlibs:Depends} +XB-Python-Version: ${python:Versions} +Description: Python bindings for Qt4 (debug extensions) + PyQt4 exposes the Qt4 API to Python. + . + This package contains the extensions built for the Python debug interpreter. + +Package: python-qt4-dbus +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-dbus (>= 0.80.0) +XB-Python-Version: ${python:Versions} +Description: DBus Support for PyQt4 + The DBus module of PyQt4 provides integration of PyQt4 applications + with the DBus main loop. + +Package: python-qt4-dbus-dbg +Architecture: any +Priority: extra +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4-dbus, python-dbus-dbg +XB-Python-Version: ${python:Versions} +Description: DBus Support for PyQt4 (debug extensions) + The DBus module of PyQt4 provides integration of PyQt4 applications + with the DBus main loop. + . + This package contains the extensions built for the Python debug interpreter. + +Package: python-qt4-gl +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4 (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), libqt4-opengl +XB-Python-Version: ${python:Versions} +Description: Python bindings for Qt4's OpenGL module + The OpenGL module of PyQt4 provides widgets and utility classes + for OpenGL rendering in a PyQt4 application. + +Package: python-qt4-gl-dbg +Priority: extra +Architecture: any +Depends: python-qt4-gl (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends} +XB-Python-Version: ${python:Versions} +Description: Python bindings for Qt4's OpenGL module (debug extension) + The OpenGL module of PyQt4 provides widgets and utility classes + for OpenGL rendering in a PyQt4 application. + . + This package contains the extension built for the Python debug interpreter. + +Package: python-qt4-sql +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4 (= ${binary:Version}) +XB-Python-Version: ${python:Versions} +Description: Python bindings for PyQt4's SQL module + The SQL module of PyQt4 provides widgets and utility classes for + SQL database access. + +Package: python-qt4-sql-dbg +Priority: extra +Architecture: any +Depends: python-qt4-sql (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends} +XB-Python-Version: ${python:Versions} +Description: Python bindings for PyQt4's SQL module (debug extension) + The SQL module of PyQt4 provides widgets and utility classes for + SQL database access. + . + This package contains the extension built for the Python debug interpreter. + +Package: python-qt4-dev +Architecture: all +Depends: ${python:Depends}, python-sip4-dev, python-qt4-common +Replaces: python-qt4 (<< 4.3) +XB-Python-Version: ${python:Versions} +Description: Development files for PyQt4 + This package contains the source SIP files from which the Python + bindings for Qt4 are created. They are needed for building PyQt4 + as well as creating bindings for own Qt4 widgets written in C++. + +Package: python-qt4-common +Architecture: all +Depends: ${python:Depends} +Conflicts: python-qt4 (<< 4.3-3) +XB-Python-Version: ${python:Versions} +Description: Shared files for PyQt4 + This package contains files that are shared between python-qt4 + and python-qt4-dev. + +Package: python-qt4-doc +Architecture: all +Section: doc +Suggests: qt4-doc +Description: Documentation and examples for PyQt4 + PyQt4 exposes the Qt4 GUI toolkit in Python. + . + This package contains Python-specific documentation for PyQt4 and + the Qt example programs ported to Python. + +Package: pyqt4-dev-tools +Depends: ${shlibs:Depends}, python, python-qt4 +XB-Python-Version: current +Architecture: any +Description: Development tools for PyQt4 + This package contains various support tools for PyQt4 developers: + * a user interface compiler (pyuic4) + * a resource file generator (pyrcc4) + * a translation string finder (pylupdate) + --- python-qt4-4.4.3.orig/debian/python-qt4-phonon.install +++ python-qt4-4.4.3/debian/python-qt4-phonon.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/PyQt4/phonon.so --- python-qt4-4.4.3.orig/debian/python-qt4.install +++ python-qt4-4.4.3/debian/python-qt4.install @@ -0,0 +1,15 @@ +usr/lib/python*/site-packages/PyQt4/Qt.so +usr/lib/python*/site-packages/PyQt4/QtAssistant.so +usr/lib/python*/site-packages/PyQt4/QtCore.so +usr/lib/python*/site-packages/PyQt4/QtDesigner.so +usr/lib/python*/site-packages/PyQt4/QtGui.so +usr/lib/python*/site-packages/PyQt4/QtHelp.so +usr/lib/python*/site-packages/PyQt4/QtNetwork.so +usr/lib/python*/site-packages/PyQt4/QtScript.so +usr/lib/python*/site-packages/PyQt4/QtSvg.so +usr/lib/python*/site-packages/PyQt4/QtTest.so +usr/lib/python*/site-packages/PyQt4/QtWebKit.so +usr/lib/python*/site-packages/PyQt4/QtXml.so +usr/lib/python*/site-packages/PyQt4/QtXmlPatterns.so +usr/lib/python*/site-packages/PyQt4/uic/ +usr/lib/qt4/* --- python-qt4-4.4.3.orig/debian/python-qt4-dbus.install +++ python-qt4-4.4.3/debian/python-qt4-dbus.install @@ -0,0 +1,2 @@ +var/lib/python-support/python*/dbus/mainloop/* + --- python-qt4-4.4.3.orig/debian/compat +++ python-qt4-4.4.3/debian/compat @@ -0,0 +1 @@ +5 --- python-qt4-4.4.3.orig/debian/python-qt4-doc.install +++ python-qt4-4.4.3/debian/python-qt4-doc.install @@ -0,0 +1 @@ +doc/*.html usr/share/doc/python-qt4-doc/html --- python-qt4-4.4.3.orig/debian/pyqt4-dev-tools.install +++ python-qt4-4.4.3/debian/pyqt4-dev-tools.install @@ -0,0 +1 @@ +usr/bin/* --- python-qt4-4.4.3.orig/debian/README.source +++ python-qt4-4.4.3/debian/README.source @@ -0,0 +1,4 @@ +python-qt4 package uses pycentral, while you'll find some installation +directory being under .../python-support/...: this is because that file will +have to be "injected" in other packages (for example python-dbus) that uses +python-support. --- python-qt4-4.4.3.orig/debian/watch +++ python-qt4-4.4.3/debian/watch @@ -0,0 +1,4 @@ +version=3 +#http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-(.*)\.tar\.gz debian uupdate +http://www.riverbankcomputing.co.uk/software/pyqt/download \ + /static/Downloads/PyQt4/PyQt-x11-gpl-([\d\.]*)\.tar\.gz debian uupdate --- python-qt4-4.4.3.orig/debian/rules +++ python-qt4-4.4.3/debian/rules @@ -0,0 +1,211 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_OPTIONS + +include /usr/share/dpatch/dpatch.make + +export QMAKESPEC=linux-g++ + +GCCVER := $(shell gcc -dumpversion | sed -e 's/.[0-9]$$//') + +LDFLAGS += -Wl,-O1 + +ifeq ($(DEB_BUILD_ARCH),alpha) + LDFLAGS += -Wl,--no-relax +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CXXFLAGS += -O0 +else +ifneq (,$(filter $(GCCVER),4.2)) + CXXFLAGS += -O1 +else + CXXFLAGS += -Os +endif +endif + +PYTHONS := $(shell pyversions -vr debian/control) + +DEFAULT_PYTHON := $(shell pyversions -vd) + +ifneq (,$(filter $(GCCVER),4.2)) + SPLIT=40 +else + SPLIT=10 +endif + +.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp + +configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp) + +build-%/configure-stamp: patch-stamp + dh_testdir + # echo yes is needed because of the license question in configure.py + # LIBS_* is unset to avoid linking to too many libraries + # STRIP is unset to let stripping be handled by dh_strip + mkdir -p build-$* + cd build-$* && python$* ../configure.py \ + --confirm-license \ + -q /usr/bin/qmake-qt4 -c \ + -j $(SPLIT) -m /usr/lib/python$*/config \ + $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \ + LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \ + LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4 LFLAGS_RELEASE="${LDFLAGS}" + touch $@ + +dbg-build-%/configure-stamp: patch-stamp + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* && python$*-dbg ../configure.py \ + --confirm-license \ + -q /usr/bin/qmake-qt4 -c \ + -j $(SPLIT) -l /usr/include/python$*_d \ + -m /usr/lib/python$*/config_d \ + $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \ + LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \ + LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4 LFLAGS_RELEASE="${LDFLAGS}" + touch $@ + +build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + $(MAKE) -C build-$* + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + $(MAKE) -C dbg-build-$* + touch $@ + +install-indep: configure + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + for version in ${PYTHONS};\ + do\ + mkdir -p debian/python-qt4-common/usr/lib/python$$version/site-packages/PyQt4;\ + install -m 644 -o root -g root __init__.py debian/python-qt4-common/usr/lib/python$$version/site-packages/PyQt4;\ + mkdir -p debian/python-qt4-dev/usr/lib/python$$version/site-packages/PyQt4;\ + install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-qt4-dev/usr/lib/python$$version/site-packages/PyQt4;\ + done + dh_install -i + +install-arch: build + dh_testdir + dh_testroot + dh_clean -k -a + dh_installdirs -a +# no stripping, please, we are a family bar + sed -i -e '/strip/ d' $(CURDIR)/designer/Makefile + for v in ${PYTHONS}; do \ + $(MAKE) -C build-$$v install \ + INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp; \ + done + + set -e; \ + d=debian/python-qt4-dbg; \ + for v in ${PYTHONS}; do \ + $(MAKE) -C dbg-build-$$v install DESTDIR=$(CURDIR)/$$d; \ + mv $$d/usr/lib/python$$v/site-packages/PyQt4/pyqtconfig.py \ + $$d/usr/lib/python$$v/site-packages/PyQt4/pyqtconfig_d.py; \ + mkdir -p debian/python-qt4-gl-dbg/usr/lib/python$$v/site-packages/PyQt4;\ + mv $$d/usr/lib/python$$v/site-packages/PyQt4/QtOpenGL.so debian/python-qt4-gl-dbg/usr/lib/python$$v/site-packages/PyQt4;\ + mkdir -p debian/python-qt4-sql-dbg/usr/lib/python$$v/site-packages/PyQt4;\ + mv $$d/usr/lib/python$$v/site-packages/PyQt4/QtSql.so debian/python-qt4-sql-dbg/usr/lib/python$$v/site-packages/PyQt4;\ + mkdir -p debian/python-qt4-dbus-dbg/var/lib/python-support/python$$v/dbus/mainloop;\ + mv $$d//var/lib/python-support/python$$v/dbus/mainloop/qt.so debian/python-qt4-dbus-dbg/var/lib/python-support/python$$v/dbus/mainloop;\ + done + +# mkdir -p debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\ +# mv $$d/usr/lib/python$$v/site-packages/PyQt4/phonon.so debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\ + + dh_install -a --sourcedir=$(CURDIR)/debian/tmp + + for i in $$(find debian/python-*-dbg -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + + : # make the dbus extension available in /var + set -e; \ + for v in ${PYTHONS}; do \ + d=debian/python-qt4-dbus; \ + mkdir -p $$d/usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop; \ + mv $$d/var/lib/python-support/python$$v/dbus/mainloop/qt.so \ + $$d/usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop/; \ + ln -sf /usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop/qt.so \ + $$d/var/lib/python-support/python$$v/dbus/mainloop/qt.so; \ + d=debian/python-qt4-dbus-dbg; \ + mkdir -p $$d/usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop; \ + mv $$d/var/lib/python-support/python$$v/dbus/mainloop/qt_d.so \ + $$d/usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop/; \ + ln -sf /usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop/qt_d.so \ + $$d/var/lib/python-support/python$$v/dbus/mainloop/qt_d.so; \ + done + + find debian/python-*-dbg ! -type d \ + ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f + find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \; + + cp pyuic/uic/pyuic.py debian/pyqt4-dev-tools/usr/bin/pyuic4 + rm debian/*/usr/lib/*/site-packages/PyQt4/uic/pyuic.py + + +clean: unpatch + dh_testdir + dh_testroot + -cd designer && make distclean + -cd qpy/QtDesigner && make distclean + rm -f designer/python.pro designer/Makefile *-stamp + rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) sip/Qt + dh_clean + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installman + dh_installchangelogs ChangeLog + dh_installdocs -A NEWS THANKS + dh_installexamples + dh_link +ifeq (,$(findstring -i, $(DH_OPTIONS))) + DH_OPTIONS= dh_strip -ppyqt4-dev-tools +# add python-qt4-phonon again! + set -e; \ + for p in python-qt4 python-qt4-dbus python-qt4-gl python-qt4-sql ; do \ + DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \ + rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \ + mkdir -p debian/$$p-dbg/usr/share/doc; \ + ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \ + done +endif + dh_compress -X.py -X.bmp -X.ui -X.sql + dh_fixperms + # DH_PYCENTRAL=nomove is set in binary-indep since only + # python-qt4-dev contains files that may not be moved. + dh_pycentral + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb -- -Z bzip2 + +# Build architecture independant packages using the common target. +binary-indep: install-indep + DH_PYCENTRAL=nomove $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + + +binary: binary-arch binary-indep + +.PHONY: build clean binary-indep binary-arch binary configure --- python-qt4-4.4.3.orig/debian/python-qt4-sql.install +++ python-qt4-4.4.3/debian/python-qt4-sql.install @@ -0,0 +1 @@ +usr/lib/python*/site-packages/PyQt4/QtSql.so --- python-qt4-4.4.3.orig/debian/changelog +++ python-qt4-4.4.3/debian/changelog @@ -0,0 +1,265 @@ +python-qt4 (4.4.3-1ubuntu1) intrepid; urgency=low + + * debian/control: removed python-elementtree from depends...cause it's not + available anymore + + -- Stephan Hermann Thu, 21 Aug 2008 12:50:43 +0200 + +python-qt4 (4.4.3-1) experimental; urgency=low + + * New upstream release + + -- Torsten Marek Tue, 12 Aug 2008 08:13:10 +0200 + +python-qt4 (4.4.2-4) unstable; urgency=medium + + * urgency=medium to speed up migration to testing + * debian/control + - build with -Wl,--no-relax on alpha + - link with -Wl,-O1 to speed up dynamic loading + - build with -Os, decreases size of so's by about 10% + - don't overwrite CXXFLAGS + + -- Torsten Marek Thu, 03 Jul 2008 22:45:26 +0200 + +python-qt4 (4.4.2-3) unstable; urgency=medium + + * urgency=medium to speed up QScintilla2 migration to testing + * debian/rules + - properly escape dollar sign in sed expressions + - compile with -O1 on gcc 4.2 + + -- Torsten Marek Tue, 01 Jul 2008 11:22:20 +0200 + +python-qt4 (4.4.2-2) unstable; urgency=medium + + * Fix build failure on Mips(el) architectures + * urgency=medium to speed up QScintilla2 migration to testing + * Phonon bindings have to wait until Phonon 4.2 comes to unstable + * debian/patches + - drop qreal fixes for Mips(el) to fix build failure + - prepare configure.py patch for phonon bindings build + * debian/control + - fix GCC version detection + - only split into 10 parts for non-4.2 GCCs + - set optimization to -O2 + + -- Torsten Marek Wed, 25 Jun 2008 01:33:43 +0200 + +python-qt4 (4.4.2-1) unstable; urgency=low + + [ Sandro Tosi ] + * debian/control + - added Build-Conflicts to python-xml + - added Depends on libqt4-opengl for python-qt4-gl (Closes: #480293) + - added libqt4-opengl-dev to Build-Dep; thanks to Sune Vuorela (Closes: + #479924) + - updated Homepage field + - bump Standard-Version to 3.8.0 (no changes needed) + * debian/watch + - updated + + [ Torsten Marek ] + * New upstream release (Closes: #481603) + * debian/control + - bump sip4 build-dependency to 4.7.6 + - bump python-sip4 dependency to 4.7.6 + + -- Torsten Marek Wed, 11 Jun 2008 23:25:48 +0200 + +python-qt4 (4.3.3-3) unstable; urgency=low + + * debian/rules + - Installed PyQt4/__init__.py in correct location + for new python-central version (Closes: #472049). + + * debian/control + - Updated build dependency on python-central to 0.6 + - Build-conflict with python-xml for the time being, + debug DBus module cannot be imported otherwise. + - Set Maintainer field to DPMT. + - Added myself to uploaders. + - Drop -1 suffixes from build dependencies. + - Fixed spelling of Python. + + * debian/copyright + - Updated copyright information. + + * Fixed section of python-qt4-doc doc-base document + to be Programming/Python + + -- Torsten Marek Fri, 21 Mar 2008 20:37:38 +0100 + +python-qt4 (4.3.3-2) unstable; urgency=low + + [ Sandro Tosi ] + * debian/control + - uniforming Vcs-Browser field + + [ Torsten Marek ] + * Override LFLAGS from qmake-qt4, libqt4-dev 4.3.3-1 changed + from -Wl,--as-needed to -Wl,--no-undefined. This lead + to Python symbols to be reported as undefined references. + (Closes: #458869) + * Use bzip2 as compression method for debs, since the + packages with the debug symbols are quite large. + + -- Torsten Marek Sun, 06 Jan 2008 12:26:24 +0100 + +python-qt4 (4.3.3-1) unstable; urgency=low + + * New upstream release. + * Bumped Standards version to 3.7.3, no changes necessary. + * Changed priority of python-qt4-dbus-dbg to extra. + * Fixed lintian warnings for doc-base, renamed document + from PyQt4 to pyqt4 + + -- Torsten Marek Sun, 16 Dec 2007 15:14:57 +0100 + +python-qt4 (4.3.1-1) unstable; urgency=low + + [ Piotr Ożarowski ] + * Vcs-Svn, Vcs-Browser and Homepage fields added + + [ Torsten Marek ] + * New upstream release. (Closes: #445337) + * Added python-qt4-dbus-dbg package. + + -- Torsten Marek Mon, 22 Oct 2007 18:35:19 +0200 + +python-qt4 (4.3-7) unstable; urgency=low + + * Added watch file. + * python-qt4-{sql,gl}-dbg now really contain debug extensions. + * Do not strip the Qt4 desigern plugin in the Makefile + * Correctly install debug symbols. + + -- Torsten Marek Sun, 16 Sep 2007 10:53:32 +0200 + +python-qt4 (4.3-6) experimental; urgency=low + + * Merged back changes from Ubuntu: + * Added debug packages. (Closes: #435652) + * Move dbus mainloop module to other location. (Closes: #439359) + + -- Torsten Marek Wed, 12 Sep 2007 19:18:31 +0200 + +python-qt4 (4.3-5) unstable; urgency=low + + * Added DPMT to uploaders field. + * Changed patch to substitute double by float where needed + instead of qreal, because there is a sip bug that prevents + a proper fix. + * Split into more files and use -O1 only to be able to build with + g++ 4.2. + + -- Torsten Marek Mon, 03 Sep 2007 23:12:09 +0200 + +python-qt4 (4.3-4) unstable; urgency=low + + * Forward CXXFLAGS to the build system (Closes: #438392) + * Handle nostrip build option correctly (Closes: #437867) + * Fixed another build error related to qreal/double/float. + * Added dpatch patch list for armel. + + -- Torsten Marek Sun, 12 Aug 2007 15:31:52 +0200 + +python-qt4 (4.3-3) unstable; urgency=low + + * Include patch for build issues on ARM and Mips. (Closes: #434378) + * Put PyQt4/__init__.py into new package python-qt4-common + It's not an elegant solution, but a clean one at least. + * python-qt4-dev depends on python-sip4-dev + + -- Torsten Marek Tue, 07 Aug 2007 23:11:19 +0200 + +python-qt4 (4.3-2) unstable; urgency=low + + * It's the simple things... + * readded __init__.py in PyQt4 + + -- Torsten Marek Wed, 01 Aug 2007 21:42:36 +0200 + +python-qt4 (4.3-1) unstable; urgency=low + + * New upstream release (Closes: #435392, #397551) + * pyqtconfig.py is now contained in python-qt4-dev + * Includes the QtTest module + * Added manpages for pyuic4, pyrcc4 and pylupdate4. + + -- Torsten Marek Tue, 31 Jul 2007 20:00:26 +0200 + +python-qt4 (4.2-1) unstable; urgency=low + + * DBus support module is now built + * QtDesigner module is now built + * QtDesigner plugin for PyQt4 widget support is now built + + -- Torsten Marek Sat, 19 May 2007 22:18:14 +0200 + +python-qt4 (4.2-0) unstable; urgency=low + + * New upstream release + * QtDesigner plugin support still missing + * DBus support still missing + + -- Torsten Marek Mon, 07 May 2007 21:53:56 +0200 + +python-qt4 (4.1.1-1) experimental; urgency=low + + * New upstream release + * Dropped unused patches + + -- Torsten Marek Wed, 3 Jan 2007 21:10:54 +0100 + +python-qt4 (4.0.1-5) unstable; urgency=low + + * Build-depend on fixed version of libqt4-dev + * Drop build-dependency on GLib 2.0 (Closes: #393067) + * Merge all Qt 4.2 patches into one patch + * Install API documentation files (Closes: #393921) + * Added doc-base file for documentation package + + -- Torsten Marek Thu, 19 Oct 2006 20:08:27 +0200 + +python-qt4 (4.0.1-4) unstable; urgency=medium + + * The "You are now entering a world of pain" release + * Include the minimal amount of changes to build against + Qt 4.2 + * Build-depend against Glib 2.0 (Closes: #393067) + + -- Torsten Marek Mon, 16 Oct 2006 22:09:39 +0200 + +python-qt4 (4.0.1-3) unstable; urgency=low + + * Rebuilt with fixed sip4 to include QtAssistantClient + (Closes: #385818) + + -- Torsten Marek Sun, 17 Sep 2006 13:41:52 +0200 + +python-qt4 (4.0.1-2) unstable; urgency=low + + * Surround imports in Qt.py with exception handlers + (Closes: #381432) + + -- Torsten Marek Wed, 30 Aug 2006 14:54:59 +0200 + +python-qt4 (4.0.1-1) unstable; urgency=low + + * New upstream release (Closes: #378086) + + -- Torsten Marek Sun, 16 Jul 2006 12:15:35 +0200 + +python-qt4 (4.0-2) unstable; urgency=low + + * Install distinct pyqtconfig.py for all python versions + * Added debian/pycompat (level 2) + + -- Torsten Marek Mon, 10 Jul 2006 19:13:10 +0200 + +python-qt4 (4.0-1) unstable; urgency=low + + * Initial upload (Closes: #362185, #372872) + + -- Torsten Marek Tue, 27 Jun 2006 00:23:48 +0200 --- python-qt4-4.4.3.orig/debian/pycompat +++ python-qt4-4.4.3/debian/pycompat @@ -0,0 +1 @@ +2 --- python-qt4-4.4.3.orig/debian/python-qt4-dev.install +++ python-qt4-4.4.3/debian/python-qt4-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip/PyQt4 + --- python-qt4-4.4.3.orig/debian/pyqt4-dev-tools.manpages +++ python-qt4-4.4.3/debian/pyqt4-dev-tools.manpages @@ -0,0 +1,3 @@ +debian/manpages/pyuic4.1 +debian/manpages/pyrcc4.1 +debian/manpages/pylupdate4.1 --- python-qt4-4.4.3.orig/debian/manpages/pyrcc4.1 +++ python-qt4-4.4.3/debian/manpages/pyrcc4.1 @@ -0,0 +1,41 @@ +.\" +.\" Created by Torsten Marek + +.TH PYRCC4 1 "2007/07/31" "pyrcc 4.3" +.SH NAME +pyrcc4 \- compile Qt resource files for PyQt4 applications +.SH SYNOPSIS +.B pyrcc4 +[\fIOPTION\fR]... \fIFILES\fR +.SH DESCRIPTION +.B pyrcc4 +takes a Qt Resource File (\.qrc) and converts it into a Python module which can be imported into a PyQt4 application. All files loaded by Qt that are prefixed with a colon will be loaded from the resources rather than the file system. + +.SH OPTIONS +.TP +\fB\-help\fR +Show a summary of the options. +.TP +.B \-version +Display the version number of pyrcc4 of the version of Qt which PyQt4 was generated for. +.TP +\fB\-o\fR \fIFILE\fR +Write the generated output to \fIFILE\fR instead of stdout. +.TP +\fB\-name\fR \fIFUN\fR +Create an external initialization function named \fIFUN\fR. +.TP +\fB\-threshold\fR \fILEVEL\fR +Set the threshold above which files should be compressed. +.TP +\fB\-compress\fR \fILEVEL\fR +Set the compression level for all input files. +.TP +\fB\-root\fR \fIPATH\fR +Search all resource referenced in a .qrc file under \fIPATH\fR. +.TP +.B \-no\-compress +Do not compress the resource files at all. + +.SH AUTHOR +This manual page was written for Debian GNU/Linux by and Torsten Marek , but may freely be used by others. --- python-qt4-4.4.3.orig/debian/manpages/pyuic4.1 +++ python-qt4-4.4.3/debian/manpages/pyuic4.1 @@ -0,0 +1,37 @@ +.\" +.\" Created by Torsten Marek + +.TH PYUIC4 1 "2007/07/31" "pyuic 4.3" +.SH NAME +pyuic4 \- compile Qt4 user interfaces to Python code +.SH SYNOPSIS +.B pyuic4 +[\fIOPTION\fR]... \fIFILE\fR +.SH DESCRIPTION +.B pyuic4 +takes a Qt4 user interface description file and compiles it to Python code. It can also show a preview of the user interface. + +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +Show a summary of the options. +.TP +.B \-\-version +Display the version number of pyuic4 of the version of Qt which PyQt4 was generated for. +.TP +\fB\-p\fR, \fB\-\-preview\fR +Show a preview of the UI instead of generating Python code. +.TP +\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR +Write the generated Python code to \fIFILE\fR instead of stdout. +.TP +\fB\-d\fR, \fB\-\-debug\fR +Show detailed debugging information about the UI generation process. +.TP +\fB\-x\fR, \fB\-\-execute\fR +Generate extra code to test and display the class when executed as a script. +.TP +\fB\-i\fR, \fB\-\-indent\fR=\fINUM\fR +Set the indentation width to \fINUM\fR spaces. A TAB character will be used if \fINUM\fR is 0 (default: 4). +.SH AUTHOR +This manual page was written for Debian GNU/Linux by and Torsten Marek , but may freely be used by others. --- python-qt4-4.4.3.orig/debian/manpages/pylupdate4.1 +++ python-qt4-4.4.3/debian/manpages/pylupdate4.1 @@ -0,0 +1,34 @@ +.\" +.\" Created by Torsten Marek + +.TH PYLUPDATE4 1 "2007/07/31" "pylupdate 4.3" +.SH NAME +pylupdate4 \- create or update Qt Linguist translation files for PyQt4 applications +.SH SYNOPSIS +.B pylupdate4 +[\fIOPTION\fR]... \fIPROJECT-FILE\fR +.br +.B pylupdate4 +[\fIOPTION\fR]... \fISOURCE\fR... \fB\-ts\fR \fITRANSLATION-FILE\fR... +.SH DESCRIPTION +.B pylupdate4 +reads a qmake project file (.pro), finds the translatable strings in the specified sources and updates the translation files (.ts files) specified in it. The translation files are given to the translator who can use Qt Linguist to read the files and insert the translations. +.br +The .ts file format is a simple human-readable XML format that can be used with version control systems if required. + +.SH OPTIONS +.TP +\fB\-help\fR +Show a summary of the options. +.TP +.B \-version +Display the version number of pylupdate4 of the version of Qt which PyQt4 was generated for. +.TP +.B \-noobsolete +Drop all obsolete strings. +.TP +.B \-verbose +Increase verbosity. + +.SH AUTHOR +This manual page was written for Debian GNU/Linux by and Torsten Marek , but may freely be used by others. --- python-qt4-4.4.3.orig/debian/patches/01_configure.dpatch +++ python-qt4-4.4.3/debian/patches/01_configure.dpatch @@ -0,0 +1,304 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_configure.dpatch by Torsten Marek +## +## DP: Make PyQt4 objectdir-buildable + +@DPATCH@ +diff -urNad python-qt4-4.4.2~/configure.py python-qt4-4.4.2/configure.py +--- python-qt4-4.4.2~/configure.py 2008-06-25 02:45:17.000000000 +0200 ++++ python-qt4-4.4.2/configure.py 2008-06-25 02:45:44.000000000 +0200 +@@ -33,6 +33,8 @@ + # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + ++# Modified for Debian by Torsten Marek ++ + import sys + import os + import string +@@ -42,6 +44,23 @@ + + import sipconfig + ++topsrcdir = os.path.dirname(os.path.abspath(__file__)) ++has_objdir = topsrcdir != os.path.abspath(os.path.curdir) ++if not has_objdir: ++ topsrcdir = None ++ ++ ++def makeDir(dirname): ++ try: ++ os.mkdir(dirname) ++ except OSError, e: ++ if e.errno != 17: ++ raise ++ ++def srcPath(filename): ++ if topsrcdir is not None: ++ return os.path.join(topsrcdir, filename) ++ return filename + + # Initialise the globals. + pyqt_version = 0x040402 +@@ -146,6 +165,8 @@ + p.add_option("-g", "--consolidate", action="store_true", default=False, + dest="bigqt", help="create a single module which links against " + "all the Qt libraries") ++ p.add_option("--disable-designer-plugin", action="store_true", default=False, ++ help="do not build the Qt Designer plugin") + + # These are internal options used to build the mega Windows GPL package. + p.add_option("--mwg-odbc", action="store_true", default=False, +@@ -296,7 +317,7 @@ + check_module("QtWebKit", "qwebpage.h", "new QWebPage()") + check_module("QtXml", "qdom.h", "new QDomDocument()") + check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()") +- check_module("phonon", "phonon", "new Phonon::VideoWidget()") ++ check_module("phonon", "videowidget.h", "new Phonon::VideoWidget()", extra_include_dirs=["/usr/include/phonon"]) + check_module("QtAssistant", "qassistantclient.h", + "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, + extra_libs=ass_libs) +@@ -312,6 +333,7 @@ + check_module("QAxContainer", "qaxobject.h", "new QAxObject()", + extra_libs=["QAxContainer"]) + ++ makeDir("dbus") + if os.path.isdir("dbus"): + check_dbus() + +@@ -390,13 +412,13 @@ + generate_code("QtXmlPatterns") + + if "phonon" in pyqt_modules: +- generate_code("phonon") ++ generate_code("phonon", extra_include_dirs=["/usr/include/phonon"]) + + if "QtAssistant" in pyqt_modules: + generate_code("QtAssistant") + + if "QtDesigner" in pyqt_modules: +- qpy_dir = os.path.abspath(os.path.join("qpy", "QtDesigner")) ++ qpy_dir = os.path.abspath(srcPath(os.path.join("qpy", "QtDesigner"))) + + if sys.platform == "win32": + if opts.debug: +@@ -422,10 +444,10 @@ + + # Generate the composite module. + qtmod_sipdir = os.path.join("sip", "Qt") +- mk_clean_dir(qtmod_sipdir) ++ mk_clean_dir(srcPath(qtmod_sipdir)) + + qtmod_sipfile = os.path.join(qtmod_sipdir, "Qtmod.sip") +- f = open(qtmod_sipfile, "w") ++ f = open(srcPath(qtmod_sipfile), "w") + + f.write("""%CompositeModule PyQt4.Qt + +@@ -600,7 +622,7 @@ + return libs, libdirs + + def module_installs(self): +- return ["__init__.py", "pyqtconfig.py"] ++ return [srcPath("__init__.py"), "pyqtconfig.py"] + + def qpylibs(self): + # See which QPy libraries to build. +@@ -616,8 +638,8 @@ + for qpy, pro in qpylibs.iteritems(): + sipconfig.inform("Creating QPy library for %s Makefile..." % qpy) + +- os.chdir(os.path.join("qpy", qpy)) +- ++ os.chdir(srcPath(os.path.join("qpy", qpy))) ++ + if sipcfg.universal: + upro = "u_" + pro + +@@ -641,6 +663,8 @@ + + sipconfig.inform("Creating QPy libraries Makefile...") + ++ makeDir("qpy") ++ os.system("ln -s %s qpy/QtDesigner" % (srcPath("qpy/QtDesigner"),)) + sipconfig.ParentMakefile( + configuration=sipcfg, + dir="qpy", +@@ -662,6 +686,7 @@ + install_dir=pydbusmoddir, + qt=["QtCore"], + debug=opts.debug, ++ topsrcdir=topsrcdir, + universal=sipcfg.universal + ) + +@@ -670,18 +695,19 @@ + makefile.generate() + tool.append("dbus") + +- # Only include ElementTree for older versions of Python. +- if sipcfg.py_version < 0x020500: +- sipconfig.inform("Creating elementtree Makefile...") ++ # Don't include elementtree on Debian ++## # Only include ElementTree for older versions of Python. ++## if sipcfg.py_version < 0x020500: ++## sipconfig.inform("Creating elementtree Makefile...") + +- makefile = sipconfig.PythonModuleMakefile( +- configuration=sipcfg, +- dstdir=os.path.join(pyqt_modroot, "elementtree"), +- dir="elementtree" +- ) ++## makefile = sipconfig.PythonModuleMakefile( ++## configuration=sipcfg, ++## dstdir=os.path.join(pyqt_modroot, "elementtree"), ++## dir="elementtree" ++## ) + +- makefile.generate() +- tool.append("elementtree") ++## makefile.generate() ++## tool.append("elementtree") + + # Create the pyuic4 wrapper. Use the GUI version on MacOS (so that + # previews work properly and normal console use will work anyway), but +@@ -689,16 +715,18 @@ + sipconfig.inform("Creating pyuic4 wrapper...") + + uicdir=os.path.join(pyqt_modroot, "uic") +- wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin")) ++ makeDir("pyuic") ++ # Wrapper script is not needed on Debian ++ #wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin")) + + sipconfig.inform("Creating pyuic4 Makefile...") + + makefile = sipconfig.PythonModuleMakefile( + configuration=sipcfg, + dstdir=uicdir, +- srcdir="uic", ++ srcdir=srcPath(os.path.join("pyuic", "uic")), + dir="pyuic", +- installs=[[os.path.basename(wrapper), opts.pyqtbindir]] ++ #installs=[[os.path.basename(wrapper), opts.pyqtbindir]] + ) + + makefile.generate() +@@ -706,7 +734,7 @@ + + if "QtXml" in pyqt_modules: + sipconfig.inform("Creating pylupdate4 Makefile...") +- ++ makeDir("pylupdate") + makefile = sipconfig.ProgramMakefile( + configuration=sipcfg, + build_file="pylupdate.sbf", +@@ -716,14 +744,15 @@ + qt=["QtCore", "QtGui", "QtXml"], + debug=opts.debug, + warnings=1, ++ topsrcdir=topsrcdir, + universal=sipcfg.universal + ) +- ++ makefile.extra_include_dirs.append(srcPath("pylupdate")) + makefile.generate() + tool.append("pylupdate") + + sipconfig.inform("Creating pyrcc4 Makefile...") +- ++ makeDir("pyrcc") + makefile = sipconfig.ProgramMakefile( + configuration=sipcfg, + build_file="pyrcc.sbf", +@@ -733,6 +762,7 @@ + qt=["QtCore", "QtXml"], + debug=opts.debug, + warnings=1, ++ topsrcdir=topsrcdir, + universal=sipcfg.universal + ) + +@@ -742,7 +772,7 @@ + sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.") + + if "QtDesigner" in pyqt_modules: +- enabled = True ++ enabled = not opts.disable_designer_plugin + + py_major = sipcfg.py_version >> 16 + py_minor = (sipcfg.py_version >> 8) & 0x0ff +@@ -776,7 +806,7 @@ + # Run qmake to generate the Makefile. + qmake_args = fix_qmake_args() + cwd = os.getcwd() +- os.chdir("designer") ++ os.chdir(srcPath("designer")) + + # Create the qmake project file. + fin = open("python.pro-in") +@@ -800,7 +830,7 @@ + run_command("%s %s" % (opts.qmake, qmake_args)) + os.chdir(cwd) + +- tool.append("designer") ++ tool.append(srcPath("designer")) + + return tool + +@@ -947,7 +977,6 @@ + add_makefile_extras(makefile, extra_include_dirs, extra_lib_dirs, extra_libs) + + exe, build = makefile.build_command(name) +- + # Make sure the executable file doesn't exist. + remove_file(exe) + run_command(build) +@@ -1097,7 +1126,7 @@ + return + + # Check the module's main .sip file exists. +- if os.access(os.path.join("sip", mname, mname + "mod.sip"), os.F_OK): ++ if os.access(srcPath(os.path.join("sip", mname, mname + "mod.sip")), os.F_OK): + sipconfig.inform("Checking to see if the %s module should be built..." % mname) + + if check_api(incfile, test, mname, extra_include_dirs=extra_include_dirs, extra_lib_dirs=extra_lib_dirs, extra_libs=extra_libs): +@@ -1303,10 +1332,14 @@ + argv.append(buildfile) + + argv.append("-I") +- argv.append("sip") ++ argv.append(srcPath("sip")) + + # SIP assumes POSIX style path separators. +- argv.append(string.join(["sip", mname, mname + "mod.sip"], "/")) ++ if topsrcdir is not None: ++ argv.append(string.join([topsrcdir, "sip", mname, mname + "mod.sip"], "/")) ++ else: ++ argv.append(string.join(["sip", mname, mname + "mod.sip"], "/")) ++ + + cmd = string.join(argv) + +@@ -1328,7 +1361,11 @@ + sipfiles = [] + + for s in glob.glob("sip/" + mname + "/*.sip"): +- sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s))) ++ if has_objdir: ++ topdir = topsrcdir ++ else: ++ topdir = ".." ++ sipfiles.append(os.path.join(topdir, "sip", mname, os.path.basename(s))) + + installs.append([sipfiles, os.path.join(opts.pyqtsipdir, mname)]) + +@@ -1799,7 +1836,7 @@ + ).generate() + + # Install the configuration module. +- create_config("pyqtconfig.py", "pyqtconfig.py.in", macros) ++ create_config("pyqtconfig.py", srcPath("pyqtconfig.py.in"), macros) + + + ############################################################################### --- python-qt4-4.4.3.orig/debian/patches/00list +++ python-qt4-4.4.3/debian/patches/00list @@ -0,0 +1,2 @@ +01_configure +02_htmllinks --- python-qt4-4.4.3.orig/debian/patches/04_qreal_api_fixes.dpatch +++ python-qt4-4.4.3/debian/patches/04_qreal_api_fixes.dpatch @@ -0,0 +1,259 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_qreal_api_fixes.dpatch by Torsten Marek +## +## DP: Exchanges double by qreal in some wrapped methods. + +@DPATCH@ +diff -urNad python-qt4-4.3~/sip/QtCore/qlist.sip python-qt4-4.3/sip/QtCore/qlist.sip +--- python-qt4-4.3~/sip/QtCore/qlist.sip 2007-09-02 00:35:50.000000000 +0200 ++++ python-qt4-4.3/sip/QtCore/qlist.sip 2007-09-02 00:35:53.000000000 +0200 +@@ -322,8 +322,8 @@ + %End + }; + %If (Qt_4_3_0 -) +-// QList > is implemented as a Python list of 2-element tuples. +-%MappedType QList > ++// QList > is implemented as a Python list of 2-element tuples. ++%MappedType QList > + { + %TypeHeaderCode + #include +@@ -340,7 +340,7 @@ + // Set the list elements. + for (int i = 0; i < sipCpp->size(); ++i) + { +- const QPair &p = sipCpp->at(i); ++ const QPair &p = sipCpp->at(i); + PyObject *pobj; + + if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL) +@@ -370,16 +370,16 @@ + return 1; + } + +- QList > *ql = new QList >; ++ QList > *ql = new QList >; + + for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) + { + PyObject *tup = PyList_GET_ITEM(sipPy, i); + +- double first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0)); +- double second = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 1)); ++ float first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0)); ++ float second = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 1)); + +- ql->append(QPair(first, second)); ++ ql->append(QPair(first, second)); + } + + *sipCppPtr = ql; +@@ -389,9 +389,9 @@ + }; + %End + %If (Qt_4_3_0 -) +-// QList > is implemented as a Python list of 2-element tuples. +-template +-%MappedType QList > ++// QList > is implemented as a Python list of 2-element tuples. ++template ++%MappedType QList > + { + %TypeHeaderCode + #include +@@ -408,7 +408,7 @@ + // Set the list elements. + for (int i = 0; i < sipCpp->size(); ++i) + { +- const QPair &p = sipCpp->at(i); ++ const QPair &p = sipCpp->at(i); + TYPE *t = new TYPE(p.second); + PyObject *pobj; + +@@ -447,12 +447,12 @@ + return 1; + } + +- QList > *ql = new QList >; ++ QList > *ql = new QList >; + + for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) + { + PyObject *tup = PyList_GET_ITEM(sipPy, i); +- double d; ++ float d; + int state; + + d = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0)); +@@ -466,7 +466,7 @@ + return 0; + } + +- ql->append(QPair(d, *t)); ++ ql->append(QPair(d, *t)); + + sipReleaseInstance(t, sipClass_TYPE, state); + } +@@ -524,8 +524,8 @@ + return sipGetState(sipTransferObj); + %End + }; +-// QList is implemented as a Python list of floats. +-%MappedType QList ++// QList is implemented as a Python list of floats. ++%MappedType QList + { + %TypeHeaderCode + #include +@@ -561,7 +561,7 @@ + if (sipIsErr == NULL) + return PyList_Check(sipPy); + +- QList *ql = new QList; ++ QList *ql = new QList; + + for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) + ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i))); +diff -urNad python-qt4-4.3~/sip/QtCore/qvector.sip python-qt4-4.3/sip/QtCore/qvector.sip +--- python-qt4-4.3~/sip/QtCore/qvector.sip 2007-09-02 00:35:50.000000000 +0200 ++++ python-qt4-4.3/sip/QtCore/qvector.sip 2007-09-02 00:35:53.000000000 +0200 +@@ -143,8 +143,8 @@ + return sipGetState(sipTransferObj); + %End + }; +-// QVector is implemented as a Python list of floats. +-%MappedType QVector ++// QVector is implemented as a Python list of floats. ++%MappedType QVector + { + %TypeHeaderCode + #include +@@ -180,7 +180,7 @@ + if (sipIsErr == NULL) + return PyList_Check(sipPy); + +- QVector *ql = new QVector; ++ QVector *ql = new QVector; + + for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) + ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i))); +@@ -190,9 +190,9 @@ + return sipGetState(sipTransferObj); + %End + }; +-// QVector > is implemented as a Python list of 2-element tuples. ++// QVector > is implemented as a Python list of 2-element tuples. + template +-%MappedType QVector > ++%MappedType QVector > + { + %TypeHeaderCode + #include +@@ -209,7 +209,7 @@ + // Set the list elements. + for (int i = 0; i < sipCpp->size(); ++i) + { +- const QPair &p = sipCpp->at(i); ++ const QPair &p = sipCpp->at(i); + TYPE *pt = new TYPE(p.second); + PyObject *pobj; + +@@ -248,14 +248,14 @@ + return 1; + } + +- QVector > *qv = new QVector >; ++ QVector > *qv = new QVector >; + + for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) + { + PyObject *tup = PyList_GET_ITEM(sipPy, i); + int state; + TYPE *s; +- QPair p; ++ QPair p; + + p.first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0)); + +diff -urNad python-qt4-4.3~/sip/QtGui/qbrush.sip python-qt4-4.3/sip/QtGui/qbrush.sip +--- python-qt4-4.3~/sip/QtGui/qbrush.sip 2007-09-02 00:35:50.000000000 +0200 ++++ python-qt4-4.3/sip/QtGui/qbrush.sip 2007-09-02 00:35:53.000000000 +0200 +@@ -138,7 +138,7 @@ + + QDataStream &operator>>(QDataStream &, QBrush & /Constrained/); + QDataStream &operator<<(QDataStream &, const QBrush & /Constrained/); +-typedef QVector > QGradientStops; ++typedef QVector > QGradientStops; + + class QGradient + { +diff -urNad python-qt4-4.3~/sip/QtGui/qgraphicsitemanimation.sip python-qt4-4.3/sip/QtGui/qgraphicsitemanimation.sip +--- python-qt4-4.3~/sip/QtGui/qgraphicsitemanimation.sip 2007-09-02 00:35:50.000000000 +0200 ++++ python-qt4-4.3/sip/QtGui/qgraphicsitemanimation.sip 2007-09-02 00:35:53.000000000 +0200 +@@ -64,19 +64,19 @@ + + public: + %If (Qt_4_3_0 -) +- QList > posList() const; ++ QList > posList() const; + %End + %If (Qt_4_3_0 -) +- QList > rotationList() const; ++ QList > rotationList() const; + %End + %If (Qt_4_3_0 -) +- QList > translationList() const; ++ QList > translationList() const; + %End + %If (Qt_4_3_0 -) +- QList > scaleList() const; ++ QList > scaleList() const; + %End + %If (Qt_4_3_0 -) +- QList > shearList() const; ++ QList > shearList() const; + %End + + private: +diff -urNad python-qt4-4.3~/sip/QtGui/qpainterpath.sip python-qt4-4.3/sip/QtGui/qpainterpath.sip +--- python-qt4-4.3~/sip/QtGui/qpainterpath.sip 2007-09-02 00:35:50.000000000 +0200 ++++ python-qt4-4.3/sip/QtGui/qpainterpath.sip 2007-09-02 00:35:53.000000000 +0200 +@@ -194,8 +194,8 @@ + void setCurveThreshold(qreal threshold); + qreal curveThreshold() const; + void setDashPattern(Qt::PenStyle); +- void setDashPattern(const QVector &dashPattern); +- QVector dashPattern() const; ++ void setDashPattern(const QVector &dashPattern); ++ QVector dashPattern() const; + QPainterPath createStroke(const QPainterPath &path) const; + %If (Qt_4_3_0 -) + void setDashOffset(qreal offset); +diff -urNad python-qt4-4.3~/sip/QtGui/qpen.sip python-qt4-4.3/sip/QtGui/qpen.sip +--- python-qt4-4.3~/sip/QtGui/qpen.sip 2007-09-02 00:35:50.000000000 +0200 ++++ python-qt4-4.3/sip/QtGui/qpen.sip 2007-09-02 00:35:53.000000000 +0200 +@@ -91,8 +91,8 @@ + void setCapStyle(Qt::PenCapStyle pcs); + Qt::PenJoinStyle joinStyle() const; + void setJoinStyle(Qt::PenJoinStyle pcs); +- QVector dashPattern() const; +- void setDashPattern(const QVector &pattern); ++ QVector dashPattern() const; ++ void setDashPattern(const QVector &pattern); + qreal miterLimit() const; + void setMiterLimit(qreal limit); + bool operator==(const QPen &p) const; +diff -urNad python-qt4-4.3~/sip/QtGui/qtextoption.sip python-qt4-4.3/sip/QtGui/qtextoption.sip +--- python-qt4-4.3~/sip/QtGui/qtextoption.sip 2007-09-02 00:35:50.000000000 +0200 ++++ python-qt4-4.3/sip/QtGui/qtextoption.sip 2007-09-02 00:35:53.000000000 +0200 +@@ -62,8 +62,8 @@ + typedef QFlags Flags; + QFlags flags() const; + qreal tabStop() const; +- void setTabArray(QList tabStops); +- QList tabArray() const; ++ void setTabArray(QList tabStops); ++ QList tabArray() const; + void setUseDesignMetrics(bool b); + bool useDesignMetrics() const; + void setAlignment(Qt::Alignment aalignment); --- python-qt4-4.4.3.orig/debian/patches/02_htmllinks.dpatch +++ python-qt4-4.4.3/debian/patches/02_htmllinks.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_htmllinks.dpatch by Torsten Marek + +## DP: Fix the links in the documentation HTML files. + +@DPATCH@ +diff -urNad python-qt4-4.1~/doc/pyqt4ref.html python-qt4-4.1/doc/pyqt4ref.html +--- python-qt4-4.1~/doc/pyqt4ref.html 2006-11-05 00:51:19.000000000 +0100 ++++ python-qt4-4.1/doc/pyqt4ref.html 2006-11-21 23:35:52.000000000 +0100 +@@ -85,7 +85,7 @@ +

This is the reference guide for PyQt 4.1. PyQt v4 is a set of + Python bindings for v4 of the Qt application + framework from Trolltech.

+-

There is a separate PyQt API Reference.

++

There is a separate PyQt API Reference.

+

Qt is a set of C++ libraries and development tools that includes platform + independent abstractions for graphical user interfaces, networking, threads, + Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and --- python-qt4-4.4.3.orig/debian/patches/00list.arm +++ python-qt4-4.4.3/debian/patches/00list.arm @@ -0,0 +1,2 @@ +03_qreal +04_qreal_api_fixes --- python-qt4-4.4.3.orig/debian/patches/00list.armel +++ python-qt4-4.4.3/debian/patches/00list.armel @@ -0,0 +1,2 @@ +03_qreal +04_qreal_api_fixes --- python-qt4-4.4.3.orig/debian/patches/03_qreal.dpatch +++ python-qt4-4.4.3/debian/patches/03_qreal.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_qreal.dpatch by Torsten Marek +## +## DP: On ARM, ARMEL, Mips and Mipsel, qreal is a float, not a double. + +@DPATCH@ +diff -urNad python-qt4-4.3~/sip/QtCore/qglobal.sip python-qt4-4.3/sip/QtCore/qglobal.sip +--- python-qt4-4.3~/sip/QtCore/qglobal.sip 2007-08-07 21:52:15.000000000 +0200 ++++ python-qt4-4.3/sip/QtCore/qglobal.sip 2007-08-07 22:10:14.000000000 +0200 +@@ -46,7 +46,7 @@ + typedef unsigned long long quint64; + typedef qint64 qlonglong; + typedef quint64 qulonglong; +-typedef double qreal; ++typedef float qreal; + typedef unsigned char uchar; + typedef unsigned short ushort; + typedef unsigned int uint;