[Python-modules-commits] r19561 - in packages/pyside/trunk/debian (25 files)
odyx at users.alioth.debian.org
odyx at users.alioth.debian.org
Fri Dec 9 10:59:52 UTC 2011
Date: Friday, December 9, 2011 @ 10:59:50
Author: odyx
Revision: 19561
Build for python3 versions too:
- Add python3-all-{dev,dbg} build-depends;
- Add X-Python3-Version entry in debian/control;
- Build-Depend on a python3-enabled libshiboken-dev;
- Add a new libpyside-py3-1.0 package;
- Make sure symbols are also tracked for this new library;
- Add new python3 packages for all modules;
- Add a new python3-pyside-dbg package;
- Update dh_pycmakedeps to cope with python3 modules;
- Enhance debian/rules to cope with the additional python3 compilation;
Added:
packages/pyside/trunk/debian/libpyside-py3-1.0.install
packages/pyside/trunk/debian/libpyside-py3-1.0.lintian-overrides
packages/pyside/trunk/debian/python3-pyside-dbg.install
packages/pyside/trunk/debian/python3-pyside-dbg.lintian-overrides
packages/pyside/trunk/debian/python3-pyside.phonon.install
packages/pyside/trunk/debian/python3-pyside.qtcore.install
packages/pyside/trunk/debian/python3-pyside.qtdeclarative.install
packages/pyside/trunk/debian/python3-pyside.qtgui.install
packages/pyside/trunk/debian/python3-pyside.qthelp.install
packages/pyside/trunk/debian/python3-pyside.qtnetwork.install
packages/pyside/trunk/debian/python3-pyside.qtopengl.install
packages/pyside/trunk/debian/python3-pyside.qtscript.install
packages/pyside/trunk/debian/python3-pyside.qtsql.install
packages/pyside/trunk/debian/python3-pyside.qtsvg.install
packages/pyside/trunk/debian/python3-pyside.qttest.install
packages/pyside/trunk/debian/python3-pyside.qtuitools.install
packages/pyside/trunk/debian/python3-pyside.qtwebkit.install
packages/pyside/trunk/debian/python3-pyside.qtxml.install
Modified:
packages/pyside/trunk/debian/control
packages/pyside/trunk/debian/dh_pycmakedeps
packages/pyside/trunk/debian/libpyside1.0.install
packages/pyside/trunk/debian/python-pyside-dbg.install
packages/pyside/trunk/debian/python-pyside.qtcore.install
packages/pyside/trunk/debian/python-pyside.qtdeclarative.install
packages/pyside/trunk/debian/rules
Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control 2011-12-08 20:10:25 UTC (rev 19560)
+++ packages/pyside/trunk/debian/control 2011-12-09 10:59:50 UTC (rev 19561)
@@ -5,9 +5,10 @@
Uploaders: Didier Raboud <odyx at debian.org>
Build-Depends: debhelper (>= 8.9.3~), cmake (>= 2.8.4+dfsg.1-3~), dpkg-dev (>= 1.15.6),
python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3),
+ python3-all-dev, python3-all-dbg,
phonon-backend-gstreamer,
libqt4-dev (>= 4:4.7.0), libphonon-dev, libqt4-opengl-dev (>= 4:4.7.0), libqtwebkit-dev,
- shiboken (>= 1.0.9), libshiboken-dev (>= 1.0.9), shiboken-dbg (>= 1.0.9),
+ shiboken (>= 1.0.9), libshiboken-dev (>= 1.0.9-3+py3~), shiboken-dbg (>= 1.0.9),
generatorrunner (>= 0.6.14), libgenrunner-dev (>= 0.6.14),
libqt4-sql-sqlite (>= 4:4.7.0), xvfb, xauth, libgl1-mesa-dri
# Various Build-Depends are needed for success of the testsuite:
@@ -16,6 +17,7 @@
# phonon-backend-gstreamer is needed to test phonon
Standards-Version: 3.9.2.0
X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyside/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyside/
Homepage: http://www.pyside.org/
@@ -43,6 +45,29 @@
.
Python bindings for Qt4 framework. This is a metapackage for all modules.
+Package: python3-pyside
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ python3-pyside.phonon (>= ${binary:Version}),
+ python3-pyside.qtcore (>= ${binary:Version}),
+ python3-pyside.qtdeclarative (>= ${binary:Version}),
+ python3-pyside.qtgui (>= ${binary:Version}),
+ python3-pyside.qthelp (>= ${binary:Version}),
+ python3-pyside.qtnetwork (>= ${binary:Version}),
+ python3-pyside.qtopengl (>= ${binary:Version}),
+ python3-pyside.qtscript (>= ${binary:Version}),
+ python3-pyside.qtsql (>= ${binary:Version}),
+ python3-pyside.qtsvg (>= ${binary:Version}),
+ python3-pyside.qttest (>= ${binary:Version}),
+ python3-pyside.qtuitools (>= ${binary:Version}),
+ python3-pyside.qtwebkit (>= ${binary:Version}),
+ python3-pyside.qtxml (>= ${binary:Version})
+Description: Python3 bindings for Qt4 (big metapackage)
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ Python3 bindings for Qt4 framework. This is a metapackage for all modules.
+
Package: python-pyside-dbg
Architecture: any
Priority: extra
@@ -71,6 +96,34 @@
.
This package contains the debugging symbols.
+Package: python3-pyside-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Pre-Depends: dpkg (>= 1.15.6)
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ shiboken-dbg (>= 1.0.9),
+ python3-pyside.phonon (>= ${binary:Version}) |
+ python3-pyside.qtcore (>= ${binary:Version}) |
+ python3-pyside.qtdeclarative (>= ${binary:Version}) |
+ python3-pyside.qtgui (>= ${binary:Version}) |
+ python3-pyside.qthelp (>= ${binary:Version}) |
+ python3-pyside.qtnetwork (>= ${binary:Version}) |
+ python3-pyside.qtopengl (>= ${binary:Version}) |
+ python3-pyside.qtscript (>= ${binary:Version}) |
+ python3-pyside.qtsql (>= ${binary:Version}) |
+ python3-pyside.qtsvg (>= ${binary:Version}) |
+ python3-pyside.qttest (>= ${binary:Version}) |
+ python3-pyside.qtuitools (>= ${binary:Version}) |
+ python3-pyside.qtwebkit (>= ${binary:Version}) |
+ python3-pyside.qtxml (>= ${binary:Version}),
+ libpyside-py3-1.0 (= ${binary:Version})
+Description: Python3 bindings for Qt 4 (debug symbols)
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the debugging symbols for the python3 modules.
+
Package: libpyside1.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
@@ -82,10 +135,21 @@
.
This package contains base files used by all modules.
+Package: libpyside-py3-1.0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Python3 bindings for Qt 4 (base files)
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains base files used by all python3 modules.
+
Package: libpyside-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpyside1.0 (= ${binary:Version}), libqt4-dev (>= 4:4.7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpyside1.0 (= ${binary:Version}), libpyside-py3-1.0 (= ${binary:Version}), libqt4-dev (>= 4:4.7.0)
Replaces: libpyside0.3 (<< 0.4.0)
Breaks: libpyside0.3 (<< 0.4.0)
Description: Python bindings for Qt 4 (development files)
@@ -104,6 +168,16 @@
.
This package provides Python bindings for the QtCore module.
+Package: python3-pyside.qtcore
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 core module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtCore module.
+
Package: python-pyside.qtdeclarative
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -114,6 +188,16 @@
.
This package provides Python bindings for the QtDeclarative module.
+Package: python3-pyside.qtdeclarative
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 Declarative module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtDeclarative module.
+
Package: python-pyside.qtgui
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -124,6 +208,16 @@
.
This package provides Python bindings for the QtGui module.
+Package: python3-pyside.qtgui
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 GUI module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtGui module.
+
Package: python-pyside.qthelp
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -134,6 +228,16 @@
.
This package provides Python bindings for the QtHelp module.
+Package: python3-pyside.qthelp
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 help module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtHelp module.
+
Package: python-pyside.qtnetwork
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -144,6 +248,16 @@
.
This package provides Python bindings for the QtNetwork module.
+Package: python3-pyside.qtnetwork
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 network module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtNetwork module.
+
Package: python-pyside.qtopengl
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -157,6 +271,19 @@
OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D
rendering and provides little or no support for GUI programming issues.
+Package: python3-pyside.qtopengl
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 OpenGL module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtOpenGL module.
+ .
+ OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D
+ rendering and provides little or no support for GUI programming issues.
+
Package: python-pyside.phonon
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -167,6 +294,16 @@
.
This package provides Python bindings for the Phonon multimedia module.
+Package: python3-pyside.phonon
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 Phonon module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the Phonon multimedia module.
+
Package: python-pyside.qtscript
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -178,6 +315,17 @@
This package provides Python bindings for the QtScript and QtScriptTools
modules.
+Package: python3-pyside.qtscript
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 script module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtScript and QtScriptTools
+ modules.
+
Package: python-pyside.qtsql
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -188,6 +336,16 @@
.
This package provides Python bindings for the QtSql module.
+Package: python3-pyside.qtsql
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 SQL module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtSql module.
+
Package: python-pyside.qtsvg
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -201,6 +359,19 @@
Scalable Vector Graphics (SVG) is a language for describing two-dimensional
graphics and graphical applications in XML.
+Package: python3-pyside.qtsvg
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 SVG module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtSvg module.
+ .
+ Scalable Vector Graphics (SVG) is a language for describing two-dimensional
+ graphics and graphical applications in XML.
+
Package: python-pyside.qttest
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -211,6 +382,16 @@
.
This package provides Python bindings for the QtTest module.
+Package: python3-pyside.qttest
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 test module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtTest module.
+
Package: python-pyside.qtuitools
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -221,6 +402,16 @@
.
This package provides Python bindings for the QtUiTools module.
+Package: python3-pyside.qtuitools
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 UI tools module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtUiTools module.
+
Package: python-pyside.qtwebkit
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -231,6 +422,16 @@
.
This package provides Python bindings for the QtWebKit module.
+Package: python3-pyside.qtwebkit
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 WebKit module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtWebKit module.
+
Package: python-pyside.qtxml
Architecture: any
Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside1.0 (= ${binary:Version})
@@ -240,3 +441,13 @@
is its rich set of widgets that provide standard GUI functionality.
.
This package provides Python bindings for the QtXml and QtXmlPatterns modules.
+
+Package: python3-pyside.qtxml
+Architecture: any
+Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libpyside-py3-1.0 (= ${binary:Version})
+Provides: ${python:Provides}
+Description: Qt 4 XML module - Python3 bindings
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package provides Python3 bindings for the QtXml and QtXmlPatterns modules.
Modified: packages/pyside/trunk/debian/dh_pycmakedeps
===================================================================
--- packages/pyside/trunk/debian/dh_pycmakedeps 2011-12-08 20:10:25 UTC (rev 19560)
+++ packages/pyside/trunk/debian/dh_pycmakedeps 2011-12-09 10:59:50 UTC (rev 19561)
@@ -41,11 +41,17 @@
if ($install) {
my @installModules=filearray(${install});
- my @allInstall=glob('debian/*.install');
# Determine the modules name (can have more than 1)
foreach my $installModule (@installModules) {
+ my @allInstall;
+ # Don't mix python2 and python3 modules
+ if ( $installModule =~ m/\.cpython-.*\.so/ ) {
+ @allInstall=glob('debian/python3-pyside.*.install');
+ } else {
+ @allInstall=glob('debian/python-pyside.*.install');
+ }
# Only take those that are explicitely named
- if ( $installModule =~ m/.so$/ and $installModule =~ s/^.*\/([a-zA-Z]*)\.so$/$1/g ) {
+ if ( $installModule =~ m/.so$/ and $installModule =~ s/^.*\/([a-zA-Z]*)(\.cpython.*)?\.so$/$1/g ) {
# Go along them
foreach my $module ($installModule) {
# Parse the CMakeLists to find the dependencies
@@ -60,15 +66,15 @@
$line =~ s/^"(.*)"$/$1/; # Strip single quotes.
print ${module}."=>".$line."\n";
foreach my $module_dep (split(' ',$line)) {
- my @allInstall=glob('debian/*.install');
# Find the modules packages
foreach my $other_package_install (@allInstall) {
my @opi_content = filearray($other_package_install);
foreach my $opi_line (@opi_content) {
- if( $opi_line =~ m/\/${module_dep}.so$/ ) {
- $other_package_install =~ s/debian\/(.*)\.install/$1/;
+ if( $opi_line =~ m/\/${module_dep}(.cpython.*)?.so$/ ) {
+ my $other_package_name = $other_package_install;
+ $other_package_name =~ s/debian\/(.*)\.install/$1/;
if ( $package ne $other_package_install ) {
- addsubstvar($package, "pycmakedeps:Depends", "$other_package_install (= \${binary:Version})");
+ addsubstvar($package, "pycmakedeps:Depends", "$other_package_name (= \${binary:Version})");
}
}
}
Added: packages/pyside/trunk/debian/libpyside-py3-1.0.install
===================================================================
--- packages/pyside/trunk/debian/libpyside-py3-1.0.install (rev 0)
+++ packages/pyside/trunk/debian/libpyside-py3-1.0.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/*/libpyside.cpython-3*.so.*
Added: packages/pyside/trunk/debian/libpyside-py3-1.0.lintian-overrides
===================================================================
--- packages/pyside/trunk/debian/libpyside-py3-1.0.lintian-overrides (rev 0)
+++ packages/pyside/trunk/debian/libpyside-py3-1.0.lintian-overrides 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1,2 @@
+# We ship compiled versions for each supported python3 version, with a symlink to the default version
+package-name-doesnt-match-sonames
Modified: packages/pyside/trunk/debian/libpyside1.0.install
===================================================================
--- packages/pyside/trunk/debian/libpyside1.0.install 2011-12-08 20:10:25 UTC (rev 19560)
+++ packages/pyside/trunk/debian/libpyside1.0.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -1 +1 @@
-usr/lib/*/libpyside*.so.*
+usr/lib/*/libpyside-python2*.so.*
Modified: packages/pyside/trunk/debian/python-pyside-dbg.install
===================================================================
--- packages/pyside/trunk/debian/python-pyside-dbg.install 2011-12-08 20:10:25 UTC (rev 19560)
+++ packages/pyside/trunk/debian/python-pyside-dbg.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -1 +1,3 @@
-usr/lib/python*/*-packages/PySide/*_d.so
+usr/lib/python2*/*-packages/PySide/*_d.so
+usr/lib/*/*-dbg.so*
+usr/lib/*/cmake/PySide-*/*-dbg.cmake
Modified: packages/pyside/trunk/debian/python-pyside.qtcore.install
===================================================================
--- packages/pyside/trunk/debian/python-pyside.qtcore.install 2011-12-08 20:10:25 UTC (rev 19560)
+++ packages/pyside/trunk/debian/python-pyside.qtcore.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -1,2 +1,2 @@
-usr/lib/python*/*-packages/PySide/*.py
-usr/lib/python*/*-packages/PySide/QtCore.so
+usr/lib/python2*/*-packages/PySide/*.py
+usr/lib/python2*/*-packages/PySide/QtCore.so
Modified: packages/pyside/trunk/debian/python-pyside.qtdeclarative.install
===================================================================
--- packages/pyside/trunk/debian/python-pyside.qtdeclarative.install 2011-12-08 20:10:25 UTC (rev 19560)
+++ packages/pyside/trunk/debian/python-pyside.qtdeclarative.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -1 +1 @@
-usr/lib/python*/*-packages/PySide/QtDeclarative.so
+usr/lib/python2*/*-packages/PySide/QtDeclarative.so
Added: packages/pyside/trunk/debian/python3-pyside-dbg.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside-dbg.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside-dbg.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1,3 @@
+usr/lib/python3*/*-packages/PySide/*dmu.so
+usr/lib/*/*dmu.so*
+usr/lib/*/cmake/PySide-*/*dmu.cmake
Added: packages/pyside/trunk/debian/python3-pyside-dbg.lintian-overrides
===================================================================
--- packages/pyside/trunk/debian/python3-pyside-dbg.lintian-overrides (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside-dbg.lintian-overrides 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+link python-pyside-dbg.lintian-overrides
\ No newline at end of file
Property changes on: packages/pyside/trunk/debian/python3-pyside-dbg.lintian-overrides
___________________________________________________________________
Added: svn:special
+ *
Added: packages/pyside/trunk/debian/python3-pyside.phonon.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.phonon.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.phonon.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/phonon.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtcore.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtcore.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtcore.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1,2 @@
+usr/lib/python3*/*-packages/PySide/*.py
+usr/lib/python3*/*-packages/PySide/QtCore.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtdeclarative.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtdeclarative.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtdeclarative.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtDeclarative.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtgui.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtgui.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtgui.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtGui.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qthelp.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qthelp.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qthelp.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtHelp.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtnetwork.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtnetwork.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtnetwork.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtNetwork.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtopengl.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtopengl.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtopengl.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtOpenGL.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtscript.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtscript.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtscript.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1,2 @@
+usr/lib/python3*/*-packages/PySide/QtScript.cpython-*mu.so
+usr/lib/python3*/*-packages/PySide/QtScriptTools.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtsql.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtsql.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtsql.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtSql.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtsvg.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtsvg.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtsvg.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtSvg.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qttest.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qttest.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qttest.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtTest.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtuitools.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtuitools.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtuitools.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtUiTools.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtwebkit.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtwebkit.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtwebkit.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PySide/QtWebKit.cpython-*mu.so
Added: packages/pyside/trunk/debian/python3-pyside.qtxml.install
===================================================================
--- packages/pyside/trunk/debian/python3-pyside.qtxml.install (rev 0)
+++ packages/pyside/trunk/debian/python3-pyside.qtxml.install 2011-12-09 10:59:50 UTC (rev 19561)
@@ -0,0 +1,2 @@
+usr/lib/python3*/*-packages/PySide/QtXml.cpython-*mu.so
+usr/lib/python3*/*-packages/PySide/QtXmlPatterns.cpython-*mu.so
Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules 2011-12-08 20:10:25 UTC (rev 19560)
+++ packages/pyside/trunk/debian/rules 2011-12-09 10:59:50 UTC (rev 19561)
@@ -4,11 +4,13 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=-format
%:
- dh $@ --with python2 --buildsystem=cmake --parallel
+ dh $@ --with python2 --with python3 --buildsystem=cmake --parallel
# Python versions
PYVERSIONS=$(shell pyversions -v -r)
DEFAULT_PY=$(shell pyversions -v -d)
+PY3VERSIONS=$(shell py3versions -v -r)
+DEFAULT_PY3=$(shell py3versions -v -d)
LIBPYSIDE_SOVERSION=1.0
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -17,37 +19,62 @@
g++-version := $(shell readlink /usr/bin/g++ | sed -e 's/g++-\(.*\)\.\(.*\)/\1\2/')
g++-version-ge-4.5 := $(shell if test $(g++-version) -ge 45; then echo "yes"; else echo "no"; fi)
+CMAKE_COMMON_OPTIONS := -DCMAKE_SKIP_RPATH=true \
+ -DCMAKE_VERBOSE_MAKEFILE=OFF \
+ -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
+ -DUSE_XVFB=true \
+ -DCTEST_TESTING_TIMEOUT=600
+
#### CONFIGURE ####
-override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure_dbg-%) $(PYVERSIONS:%=override_dh_auto_configure-%)
+override_dh_auto_configure: configure_2 configure_3
+configure_2: $(PYVERSIONS:%=override_dh_auto_configure_dbg-%) $(PYVERSIONS:%=override_dh_auto_configure-%)
+ @echo "Python2 versions configured."
+
+configure_3: $(PY3VERSIONS:%=override_dh_auto_configure_dbg_3-%) $(PY3VERSIONS:%=override_dh_auto_configure_3-%)
+ @echo "Python3 versions configured."
+
override_dh_auto_configure_dbg-%:
mkdir -p build-$*-dbg
dh_auto_configure -a --builddirectory=build-$*-dbg -- \
- -DCMAKE_VERBOSE_MAKEFILE=OFF \
+ $(CMAKE_COMMON_OPTIONS) \
-DCMAKE_BUILD_TYPE:STRING="Debug" \
-DPYTHON_SUFFIX=-python$*-dbg \
- -DCMAKE_SKIP_RPATH=true \
- -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
- -DCTEST_TESTING_TIMEOUT=600 \
- -DUSE_XVFB=true
override_dh_auto_configure-%:
mkdir -p build-$*
dh_auto_configure -a --builddirectory=build-$* -- \
- -DCMAKE_VERBOSE_MAKEFILE=OFF \
+ $(CMAKE_COMMON_OPTIONS) \
-DCMAKE_BUILD_TYPE:STRING="Release" \
-DPYTHON_SUFFIX=-python$* \
- -DCMAKE_SKIP_RPATH=true \
- -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
- -DCTEST_TESTING_TIMEOUT=600 \
- -DUSE_XVFB=true \
-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
+override_dh_auto_configure_dbg_3-%:
+ mkdir -p build-$*-dbg
+ dh_auto_configure -a --builddirectory=build-$*-dbg -- \
+ $(CMAKE_COMMON_OPTIONS) \
+ -DCMAKE_BUILD_TYPE:STRING="Debug" \
+ -DPYTHON_SUFFIX=.cpython-$(subst .,,$*)dmu
+
+override_dh_auto_configure_3-%:
+ mkdir -p build-$*
+ dh_auto_configure -a --builddirectory=build-$* -- \
+ $(CMAKE_COMMON_OPTIONS) \
+ -DCMAKE_BUILD_TYPE:STRING="Release" \
+ -DPYTHON_SUFFIX=.cpython-$(subst .,,$*)mu \
+ -DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
+
#### BUILD ####
-override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build_dbg-%) $(PYVERSIONS:%=override_dh_auto_build-%)
+override_dh_auto_build: build_2 build_3
+build_2: $(PYVERSIONS:%=override_dh_auto_build_dbg-%) $(PYVERSIONS:%=override_dh_auto_build-%)
+ @echo "Python2 versions built."
+
+build_3: $(PY3VERSIONS:%=override_dh_auto_build_dbg-%) $(PY3VERSIONS:%=override_dh_auto_build-%)
+ @echo "Python3 versions built."
+
override_dh_auto_build_dbg-%:
dh_auto_build -a --builddirectory=build-$*-dbg
@@ -56,17 +83,39 @@
#### INSTALL ####
-override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install_dbg-%) $(PYVERSIONS:%=override_dh_auto_install-%)
+override_dh_auto_install: install_2 install_3
+install_2: $(PYVERSIONS:%=override_dh_auto_install_dbg-%) $(PYVERSIONS:%=override_dh_auto_install-%)
+ # Name the debug .so's correctly for python2
+ rename 's|(.*)\.so(.*)$$|$$1_d.so$$2|'\
+ debian/tmp-dbg/usr/lib/python2*/*-packages/PySide/*.so
+ @echo "Python2 versions installed."
+
+install_3: $(PY3VERSIONS:%=override_dh_auto_install_3_dbg-%) $(PY3VERSIONS:%=override_dh_auto_install_3-%)
+ @echo "Python3 versions installed."
+
override_dh_auto_install_dbg-%:
dh_auto_install -a --builddirectory=build-$*-dbg --destdir=debian/tmp-dbg
override_dh_auto_install-%:
dh_auto_install -a --builddirectory=build-$*
+override_dh_auto_install_3_dbg-%:
+ dh_auto_install -a --builddirectory=build-$*-dbg --destdir=debian/tmp-dbg
+ # Name the debug .so's correctly for python3
+ rename 's|(.*)/PySide/(.*)\.so$$|$$1/PySide/$$2.cpython-$(subst .,,$*)dmu.so|'\
+ debian/tmp-dbg/usr/lib/python3/*-packages/PySide/*.so
+
+override_dh_auto_install_3-%:
+ dh_auto_install -a --builddirectory=build-$*
+ # Name the debug .so's correctly for python3
+ rename 's|(.*)/PySide/(.*)\.so$$|$$1/PySide/$$2.cpython-$(subst .,,$*)mu.so|'\
+ debian/tmp/usr/lib/python3/*-packages/PySide/*.so
+
#### Shared libs ####
-override_dh_makeshlibs: $(PYVERSIONS:%=override_dh_makeshlibs-%)
+override_dh_makeshlibs: $(PYVERSIONS:%=override_dh_makeshlibs-%) $(PY3VERSIONS:%=override_dh_makeshlibs_py3-%)
cat debian/libpyside${LIBPYSIDE_SOVERSION}.symbols-py* > debian/libpyside${LIBPYSIDE_SOVERSION}.symbols
+ cat debian/libpyside-py3-${LIBPYSIDE_SOVERSION}.symbols-py* > debian/libpyside-py3-${LIBPYSIDE_SOVERSION}.symbols
dh_makeshlibs -a
override_dh_makeshlibs-%:
@@ -80,13 +129,42 @@
sed -e 's|^ _| (lt-g++4.5)_|g' debian/libpyside${LIBPYSIDE_SOVERSION}.symbols.g++-lt-4.5 >> debian/libpyside${LIBPYSIDE_SOVERSION}.symbols-py$*
endif
+override_dh_makeshlibs_py3-%:
+ echo "libpyside.cpython-$(subst .,,$*)mu.so.${LIBPYSIDE_SOVERSION} libpyside-py3-${LIBPYSIDE_SOVERSION} #MINVER#" > debian/libpyside-py3-${LIBPYSIDE_SOVERSION}.symbols-py$*
+ cat debian/libpyside${LIBPYSIDE_SOVERSION}.symbols.pristine >> debian/libpyside-py3-${LIBPYSIDE_SOVERSION}.symbols-py$*
+ifeq ($(g++-version-ge-4.5),yes)
+ # g++ version is >= 4.5, add related symbols
+ sed -e 's|^ _| (ge-g++4.5)_|g' debian/libpyside${LIBPYSIDE_SOVERSION}.symbols.g++-ge-4.5 >> debian/libpyside-py3-${LIBPYSIDE_SOVERSION}.symbols-py$*
+else
+ # g++ version is < 4.5, add related symbols
+ sed -e 's|^ _| (lt-g++4.5)_|g' debian/libpyside${LIBPYSIDE_SOVERSION}.symbols.g++-lt-4.5 >> debian/libpyside-py3-${LIBPYSIDE_SOVERSION}.symbols-py$*
+endif
+
+
#### STRIP ####
override_dh_strip:
- dh_strip -a --dbg-package=python-pyside-dbg --exclude=-dbg.so --exclude=_d.so
+ for p in `dh_listpackages -a -Npython-pyside-dbg -Npython3-pyside-dbg`; do \
+ if echo $$p | egrep -s '^python-pyside\.' > /dev/null; \
+ then \
+ dh_strip -p$$p --dbg-package=python-pyside-dbg --exclude=-dbg.so --exclude=_d.so ; \
+ fi; \
+ if echo $$p | egrep -s '^python3-pyside\.' > /dev/null; \
+ then \
+ dh_strip -p$$p --dbg-package=python3-pyside-dbg --exclude=-dbg.so --exclude=dmu.so ; \
+ fi; \
+ done
+ dh_strip -plibpyside-py3-$(LIBPYSIDE_SOVERSION) --dbg-package=python3-pyside-dbg
+ dh_strip -plibpyside$(LIBPYSIDE_SOVERSION) --dbg-package=python-pyside-dbg
#### TEST ####
-override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)
+override_dh_auto_test: test_2 test_3
+test_2: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)
+ @echo "Python2 versions tested."
+
+test_3: $(PY3VERSIONS:%=override_dh_auto_test_dbg-%) $(PY3VERSIONS:%=override_dh_auto_test-%)
+ @echo "Python3 versions tested."
+
override_dh_auto_test_dbg-%:
- dh_auto_test -a --builddirectory=build-$*-dbg
@@ -97,8 +175,16 @@
override_dh_link:
# Replace doc directories by symlinks
for p in `dh_listpackages -a -Nlibpyside${LIBPYSIDE_SOVERSION}`; do \
- rm -Rf debian/$$p/usr/share/doc/$$p; \
- ln -sf libpyside${LIBPYSIDE_SOVERSION} debian/$$p/usr/share/doc/$$p ; \
+ if echo $$p | egrep -s '^python-pyside\.' > /dev/null; \
+ then \
+ rm -Rf debian/$$p/usr/share/doc/$$p; \
+ ln -sf libpyside${LIBPYSIDE_SOVERSION} debian/$$p/usr/share/doc/$$p ; \
+ fi; \
+ if echo $$p | egrep -s '^python3-pyside\.' > /dev/null; \
+ then \
+ rm -Rf debian/$$p/usr/share/doc/$$p; \
+ ln -sf libpyside-py3-${LIBPYSIDE_SOVERSION} debian/$$p/usr/share/doc/$$p ; \
+ fi; \
done
dh_link
@@ -115,16 +201,6 @@
override_dh_install: override_dh_install_3
override_dh_install_1:
-ifneq (,$(filter python-pyside-dbg, $(shell dh_listpackages)))
- # Move the debug .so's right in place
- rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2_d.so$$3/'\
- debian/tmp-dbg/usr/lib/python*/*-packages/PySide/*.so
- rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2.so$$3/'\
- debian/tmp-dbg/usr/lib/${DEB_HOST_MULTIARCH}/*.so*
- # Move the PySideConfig snippets for the debug flavours in the standard install directory
- rename 's/(debian\/tmp-dbg\/)(.*)$$/debian\/tmp\/$$2/'\
- debian/tmp-dbg/usr/lib/${DEB_HOST_MULTIARCH}/cmake/PySide-*/*-dbg.cmake
-endif
ifneq (,$(filter libpyside$(LIBPYSIDE_SOVERSION), $(shell dh_listpackages)))
# Setup the default version symbolic links
ln -sf libpyside-python${DEFAULT_PY}.so.${LIBPYSIDE_SOVERSION} \
@@ -134,18 +210,12 @@
override_dh_install_2: override_dh_install_1
# Do the legacy install for the rest
- dh_install -a --list-missing
+ dh_install -ppython-pyside-dbg --sourcedir=debian/tmp-dbg
+ dh_install -ppython3-pyside-dbg --sourcedir=debian/tmp-dbg
+ dh_install -a --remaining-packages --list-missing
override_dh_install_3: override_dh_install_2
-ifneq (,$(filter python-pyside-dbg, $(shell dh_listpackages)))
- # Move the debug library to the correct package.
- mkdir -p debian/python-pyside-dbg/usr/lib/${DEB_HOST_MULTIARCH}/
- rename 's/(debian\/libpyside(-dev|${LIBPYSIDE_SOVERSION}))(.*)-dbg\.so(.*)$$/debian\/python-pyside-dbg\/$$3-dbg.so$$4/' \
- debian/libpyside*/usr/lib/${DEB_HOST_MULTIARCH}/*-dbg.so*
- # Move the debug cmake files to the correct package
- mkdir -p debian/python-pyside-dbg/usr/lib/${DEB_HOST_MULTIARCH}/cmake/`basename debian/libpyside-dev/usr/lib/${DEB_HOST_MULTIARCH}/cmake/PySide-*`
- rename 's/(debian\/libpyside-dev\/)(.*)-dbg\.cmake/debian\/python-pyside-dbg\/$$2-dbg.cmake/'\
- debian/libpyside-dev/usr/lib/${DEB_HOST_MULTIARCH}/cmake/PySide-*/*-dbg.cmake
+ifneq (,$(filter libpyside-dev, $(shell dh_listpackages)))
# Make sure the pkg-config is the default's
install -D -m 644 build-${DEFAULT_PY}/libpyside/pyside.pc \
debian/libpyside-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/pyside.pc
@@ -157,5 +227,5 @@
override_dh_builddeb:
# XZ-compress the huge python-pyside-dbg.
- dh_builddeb -ppython-pyside-dbg -- -Zxz
+ dh_builddeb -ppython-pyside-dbg -ppython3-pyside-dbg -- -Zxz
dh_builddeb --remaining-packages
More information about the Python-modules-commits
mailing list