[Python-modules-commits] r18455 - in packages/python-qt4/trunk/debian (8 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Wed Sep 7 15:49:49 UTC 2011
Date: Wednesday, September 7, 2011 @ 15:49:47
Author: kitterman
Revision: 18455
python-qt4 (4.8.5-1) UNRELEASED; urgency=low
* Team upload
* New upstream release
- Drop debian/patches/fix_uiparser_buttonbox.diff (was from upstream)
* Build for python3 (except for dbus and opengl)
- Add python3-all-dev/dbg and python3-sip-dev/dbg to build-depends
- Add python3-qt4-* packages
- Add X-Python-Version to debian/rules
- Adjust debian/rules and add install-arch-3.%: rule
- Add .install files for new packages
- Adjust .install files for python packages to install python2* and not
python* files to avoid python3 files
* Use --no-dbg-cleaning for dh_python2
* Drop obsolete Conflicts/Replaces
* Update debian/copyright
* Bump standards version to 3.9.2 without further change
-- Scott Kitterman <scott at kitterman.com> Sun, 04 Sep 2011 00:42:05 -0400
* Note: Still a work in progress.
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/copyright
packages/python-qt4/trunk/debian/patches/series
packages/python-qt4/trunk/debian/python-qt4-phonon.install
packages/python-qt4/trunk/debian/python-qt4-sql.install
packages/python-qt4/trunk/debian/python-qt4.install
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2011-09-06 18:41:14 UTC (rev 18454)
+++ packages/python-qt4/trunk/debian/changelog 2011-09-07 15:49:47 UTC (rev 18455)
@@ -1,3 +1,23 @@
+python-qt4 (4.8.5-1) UNRELEASED; urgency=low
+
+ * Team upload
+ * New upstream release
+ - Drop debian/patches/fix_uiparser_buttonbox.diff (was from upstream)
+ * Build for python3 (except for dbus and opengl)
+ - Add python3-all-dev/dbg and python3-sip-dev/dbg to build-depends
+ - Add python3-qt4-* packages
+ - Add X-Python-Version to debian/rules
+ - Adjust debian/rules and add install-arch-3.%: rule
+ - Add .install files for new packages
+ - Adjust .install files for python packages to install python2* and not
+ python* files to avoid python3 files
+ * Use --no-dbg-cleaning for dh_python2
+ * Drop obsolete Conflicts/Replaces
+ * Update debian/copyright
+ * Bump standards version to 3.9.2 without further change
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 04 Sep 2011 00:42:05 -0400
+
python-qt4 (4.8.3-4) unstable; urgency=medium
* Team upload
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2011-09-06 18:41:14 UTC (rev 18454)
+++ packages/python-qt4/trunk/debian/control 2011-09-07 15:49:47 UTC (rev 18455)
@@ -14,13 +14,18 @@
libqtwebkit-dev,
python-all-dbg,
python-all-dev (>= 2.6.6-3~),
+ python3-all-dbg,
+ python3-all-dev,
python-dbus (>= 0.84.0-2),
python-dbus-dbg,
python-sip-dbg,
- python-sip-dev (>= 4.12.1)
+ python-sip-dev (>= 4.12.1),
+ python3-sip-dbg,
+ python3-sip-dev
Build-Conflicts: python-xml, python-xml-dbg
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt4/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-qt4/trunk/
@@ -30,8 +35,7 @@
Provides: ${python:Provides}
Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, ${sip:Depends}
Suggests: python-qt4-dbg
-Replaces: python-qt4-common, python-qt4-dev (<< 4.4.4-3~)
-Conflicts: python-qt4-common
+Replaces: python-qt4-dev (<< 4.4.4-3~)
Breaks: python-qscintilla2 (<< 2.4.3-3),
python-qwt5-qt4 (<< 5.2.1~cvs20091107+dfsg-6),
python-qwt3d-qt4 (<< 0.1.7~cvs20090625-7),
@@ -58,6 +62,25 @@
* QtSql (in python-qt4-sql)
* phonon (in python-qt4-phonon)
+Package: python3-qt4
+Architecture: any
+Provides: ${python3:Provides}
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, ${sip3:Depends}
+Suggests: python3-qt4-dbg
+Description: Python3 bindings for Qt4
+ PyQt4 exposes the Qt4 API to Python3. The following modules are supported:
+ * QtCore
+ * QtGui
+ * QtNetwork
+ * QtXml
+ * QtScript
+ * QtSvg
+ * QtTest
+ * QtAssistant
+ * QtWebKit
+ * QtSql (in python3-qt4-sql)
+ * phonon (in python3-qt4-phonon)
+
Package: python-qt4-dbg
Priority: extra
Section: debug
@@ -72,6 +95,20 @@
.
This package contains the extensions built for the Python debug interpreter.
+Package: python3-qt4-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python3-dbg,
+ python3-qt4 (= ${binary:Version}),
+ python3-sip-dbg,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python3 bindings for Qt4 (debug extensions)
+ PyQt4 exposes the Qt4 API to Python3.
+ .
+ This package contains the extensions built for the Python3 debug interpreter.
+
Package: python-qt4-phonon
Architecture: any
Provides: ${python:Provides}
@@ -84,6 +121,18 @@
The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
to Python.
+Package: python3-qt4-phonon
+Architecture: any
+Provides: ${python3:Provides}
+Depends: python3-qt4 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Suggests: python3-phonon-dbg
+Description: Python3 bindings for Phonon
+ The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
+ to Python3.
+
Package: python-qt4-phonon-dbg
Priority: extra
Section: debug
@@ -100,6 +149,22 @@
.
This package contains the extensions built for the Python debug interpreter.
+Package: python3-qt4-phonon-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Provides: ${python3:Provides}
+Depends: python3-dbg,
+ python3-qt4-dbg (= ${binary:Version}),
+ python3-qt4-phonon (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python3 bindings for Phonon (debug extensions)
+ The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
+ to Python3.
+ .
+ This package contains the extensions built for the Python3 debug interpreter.
+
Package: python-qt4-dbus
Architecture: any
Provides: ${python:Provides}
@@ -165,6 +230,17 @@
The SQL module of PyQt4 provides widgets and utility classes for
SQL database access.
+Package: python3-qt4-sql
+Architecture: any
+Provides: ${python3:Provides}
+Depends: python3-qt4 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Python3 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
Section: debug
@@ -180,10 +256,24 @@
.
This package contains the extension built for the Python debug interpreter.
+Package: python3-qt4-sql-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python3-dbg,
+ python3-qt4-dbg (= ${binary:Version}),
+ python3-qt4-sql (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python3 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 Python3 debug interpreter.
+
Package: python-qt4-dev
Architecture: all
Depends: python-sip-dev, ${misc:Depends}, ${python:Depends}
-Replaces: python-qt4 (<< 4.3)
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
Modified: packages/python-qt4/trunk/debian/copyright
===================================================================
--- packages/python-qt4/trunk/debian/copyright 2011-09-06 18:41:14 UTC (rev 18454)
+++ packages/python-qt4/trunk/debian/copyright 2011-09-07 15:49:47 UTC (rev 18455)
@@ -3,7 +3,7 @@
It was downloaded from http://www.riverbankcomputing.co.uk
-Copyright (c) 2007 Riverbank Computing Limited
+Copyright (c) 2007,2010,2011 Riverbank Computing Limited
License:
@@ -59,7 +59,50 @@
SUCH DAMAGE.
-------------------------------------------------------------------
+files in examples (except examples/designer/plugins, which are licensed under
+the same terms as the rest of the package) are licensed under the BSD license:
+#############################################################################
+##
+## Copyright (C) 2010 Riverbank Computing Limited.
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+##
+## This file is part of the examples of PyQt.
+##
+## $QT_BEGIN_LICENSE:BSD$
+## You may use this file under the terms of the BSD license as follows:
+##
+## "Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are
+## met:
+## * Redistributions of source code must retain the above copyright
+## notice, this list of conditions and the following disclaimer.
+## * Redistributions in binary form must reproduce the above copyright
+## notice, this list of conditions and the following disclaimer in
+## the documentation and/or other materials provided with the
+## distribution.
+## * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+## the names of its contributors may be used to endorse or promote
+## products derived from this software without specific prior written
+## permission.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
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,
@@ -84,7 +127,27 @@
OF THIS SOFTWARE.
--------------------------------------------------------------------
+The files dbus/dbus.cpp and dbus/dbus.h are:
+// Copyright (c) 2007 Phil Thompson
+//
+// Licensed under the Academic Free License version 2.1
+//
+// 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, or
+// (at your option) any later version.
+//
+// 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
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
The Debian packaging is (C) 2006-2008, Torsten Marek <shlomme at debian.org>
and licensed under the GPL.
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2011-09-06 18:41:14 UTC (rev 18454)
+++ packages/python-qt4/trunk/debian/patches/series 2011-09-07 15:49:47 UTC (rev 18455)
@@ -2,4 +2,3 @@
debian_configure_changes.diff
fix_qthelp_ftbfs.diff
fix_the_QAssitant_ftbfs.diff
-fix_uiparser_buttonbox.diff
Modified: packages/python-qt4/trunk/debian/python-qt4-phonon.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-phonon.install 2011-09-06 18:41:14 UTC (rev 18454)
+++ packages/python-qt4/trunk/debian/python-qt4-phonon.install 2011-09-07 15:49:47 UTC (rev 18455)
@@ -1 +1 @@
-usr/lib/python*/*-packages/PyQt4/phonon.so
+usr/lib/python2*/*-packages/PyQt4/phonon.so
Modified: packages/python-qt4/trunk/debian/python-qt4-sql.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-sql.install 2011-09-06 18:41:14 UTC (rev 18454)
+++ packages/python-qt4/trunk/debian/python-qt4-sql.install 2011-09-07 15:49:47 UTC (rev 18455)
@@ -1 +1 @@
-usr/lib/python*/*-packages/PyQt4/QtSql.so
+usr/lib/python2*/*-packages/PyQt4/QtSql.so
Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install 2011-09-06 18:41:14 UTC (rev 18454)
+++ packages/python-qt4/trunk/debian/python-qt4.install 2011-09-07 15:49:47 UTC (rev 18455)
@@ -1,19 +1,19 @@
-usr/lib/python*/*-packages/PyQt4/Qt.so
-usr/lib/python*/*-packages/PyQt4/QtAssistant.so
-usr/lib/python*/*-packages/PyQt4/QtCore.so
-usr/lib/python*/*-packages/PyQt4/QtDeclarative.so
-usr/lib/python*/*-packages/PyQt4/QtDesigner.so
-usr/lib/python*/*-packages/PyQt4/QtGui.so
-usr/lib/python*/*-packages/PyQt4/QtHelp.so
-usr/lib/python*/*-packages/PyQt4/QtNetwork.so
-usr/lib/python*/*-packages/PyQt4/QtScript.so
-usr/lib/python*/*-packages/PyQt4/QtScriptTools.so
-usr/lib/python*/*-packages/PyQt4/QtSvg.so
-usr/lib/python*/*-packages/PyQt4/QtTest.so
-usr/lib/python*/*-packages/PyQt4/QtWebKit.so
-usr/lib/python*/*-packages/PyQt4/QtXml.so
-usr/lib/python*/*-packages/PyQt4/QtXmlPatterns.so
-usr/lib/python*/*-packages/PyQt4/__init__.py
-usr/lib/python*/*-packages/PyQt4/pyqtconfig.py
-usr/lib/python*/*-packages/PyQt4/uic/*
+usr/lib/python2*/*-packages/PyQt4/Qt.so
+usr/lib/python2*/*-packages/PyQt4/QtAssistant.so
+usr/lib/python2*/*-packages/PyQt4/QtCore.so
+usr/lib/python2*/*-packages/PyQt4/QtDeclarative.so
+usr/lib/python2*/*-packages/PyQt4/QtDesigner.so
+usr/lib/python2*/*-packages/PyQt4/QtGui.so
+usr/lib/python2*/*-packages/PyQt4/QtHelp.so
+usr/lib/python2*/*-packages/PyQt4/QtNetwork.so
+usr/lib/python2*/*-packages/PyQt4/QtScript.so
+usr/lib/python2*/*-packages/PyQt4/QtScriptTools.so
+usr/lib/python2*/*-packages/PyQt4/QtSvg.so
+usr/lib/python2*/*-packages/PyQt4/QtTest.so
+usr/lib/python2*/*-packages/PyQt4/QtWebKit.so
+usr/lib/python2*/*-packages/PyQt4/QtXml.so
+usr/lib/python2*/*-packages/PyQt4/QtXmlPatterns.so
+usr/lib/python2*/*-packages/PyQt4/__init__.py
+usr/lib/python2*/*-packages/PyQt4/pyqtconfig.py
+usr/lib/python2*/*-packages/PyQt4/uic/*
usr/lib/qt4/*
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2011-09-06 18:41:14 UTC (rev 18454)
+++ packages/python-qt4/trunk/debian/rules 2011-09-07 15:49:47 UTC (rev 18455)
@@ -36,7 +36,7 @@
endif
endif
-PYTHONS := $(shell pyversions -vr)
+PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd)
DEFAULT_PYTHON := $(shell pyversions -vd)
@@ -126,6 +126,38 @@
# probably like ipython handles it.
cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
+d3_qt4_dbg = debian/python3-qt4-dbg
+
+install-arch-3.%:
+ $(MAKE) -C build-3.$* install \
+ INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+
+ $(MAKE) -C dbg-build3.$* install DESTDIR=$(CURDIR)/$(d3_qt4_dbg)
+
+ # Don't initiate the uic/widget-plugins
+ touch $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt4/uic/widget-plugins/.noinit
+
+ mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig.py \
+ $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig_d.py
+ # No python3 opengl yet
+ #mkdir -p debian/python3-qt4-gl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+ #mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/QtOpenGL.so \
+ # debian/python3-qt4-gl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+ mkdir -p debian/python3-qt4-sql-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+ mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/QtSql.so \
+ debian/python3-qt4-sql-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+ mkdir -p debian/python3-qt4-phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+ mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/phonon.so \
+ debian/python3-qt4-phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+
+ # No python3 DBUS yet
+ #if [ -e $(d3_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so ]; then \
+ # mkdir -p debian/python-qt4-dbus-dbg/$(call py_dbusmoddir,$*);\
+ # mv $(d_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so \
+ # debian/python-qt4-dbus-dbg$(call py_dbusmoddir,$*);\
+ # echo '$(call py_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-qt4-dbus.install;\
+ #fi
+
d_qt4_dbg = debian/python-qt4-dbg
install-arch-%:
@@ -134,9 +166,6 @@
$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/$(d_qt4_dbg)
- # remove the Python 3 port for now
- rm -r $(CURDIR)/debian/tmp/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/uic/port_v3
-
# Don't initiate the uic/widget-plugins
touch $(CURDIR)/debian/tmp/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/uic/widget-plugins/.noinit
@@ -181,14 +210,16 @@
ifeq (,$(findstring -i, $(DH_OPTIONS)))
DH_OPTIONS= dh_strip -ppyqt4-dev-tools
set -e; \
- for p in python-qt4 python-qt4-dbus python-qt4-gl python-qt4-sql python-qt4-phonon ; do \
+ for p in python-qt4 python3-qt4 python-qt4-dbus python-qt4-gl python-qt4-sql \
+ python3-qt4-sql python-qt4-phonon python3-qt4-phonon ; 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_python2
+ dh_python2 --no-dbg-cleaning
+ dh_python3
dh_fixperms
dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml
dh_installdeb
More information about the Python-modules-commits
mailing list