[Python-modules-commits] r14329 - in packages/pyside/branches/trunk-maverick/debian (5 files)

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Tue Aug 31 12:47:15 UTC 2010 

    Date: Tuesday, August 31, 2010 @ 12:47:13
  Author: odyx-guest
Revision: 14329

* Re-enforce the libpyside-dev dependency.
* Include QtWebkit, with qt4.7.patch.
* Make sure libpyside-dev ships the default symlink.
* Drop the QtMultimedia sub-module, remove the qtmobility-dev B-D.
* Add libqtwebkit-dev and qtmobility-dev to compile against Qt4.7.
* Uploading to maverick's PPA.

Added:
  packages/pyside/branches/trunk-maverick/debian/patches/qt4.7.patch
Modified:
  packages/pyside/branches/trunk-maverick/debian/changelog
  packages/pyside/branches/trunk-maverick/debian/control
  packages/pyside/branches/trunk-maverick/debian/patches/series
  packages/pyside/branches/trunk-maverick/debian/rules

Modified: packages/pyside/branches/trunk-maverick/debian/changelog
===================================================================
--- packages/pyside/branches/trunk-maverick/debian/changelog	2010-08-31 12:44:54 UTC (rev 14328)
+++ packages/pyside/branches/trunk-maverick/debian/changelog	2010-08-31 12:47:13 UTC (rev 14329)
@@ -1,3 +1,39 @@
+pyside (0.4.0-1+ubuntu6) maverick; urgency=low
+
+  * Re-enforce the libpyside-dev dependency.
+
+ -- Didier Raboud <didier at raboud.com>  Tue, 31 Aug 2010 13:20:45 +0200
+
+pyside (0.4.0-1+ubuntu5) maverick; urgency=low
+
+  * Include QtWebkit, with qt4.7.patch.
+
+ -- Didier Raboud <didier at raboud.com>  Tue, 31 Aug 2010 12:59:56 +0200
+
+pyside (0.4.0-1+ubuntu4) maverick; urgency=low
+
+  * Make sure libpyside-dev ships the default symlink.
+
+ -- Didier Raboud <didier at raboud.com>  Fri, 27 Aug 2010 15:02:54 +0200
+
+pyside (0.4.0-1+ubuntu3) maverick; urgency=low
+
+  * Drop the QtMultimedia sub-module, remove the qtmobility-dev B-D.
+
+ -- Didier Raboud <didier at raboud.com>  Fri, 27 Aug 2010 12:04:11 +0200
+
+pyside (0.4.0-1+ubuntu2) maverick; urgency=low
+
+  * Add libqtwebkit-dev and qtmobility-dev to compile against Qt4.7.
+
+ -- Didier Raboud <didier at raboud.com>  Fri, 27 Aug 2010 10:15:12 +0200
+
+pyside (0.4.0-1+ubuntu1) maverick; urgency=low
+
+  * Uploading to maverick's PPA.
+
+ -- Didier Raboud <didier at raboud.com>  Thu, 26 Aug 2010 16:43:52 +0200
+
 pyside (0.4.0-1) experimental; urgency=low
 
   * New 0.4.0 upstream release (Closes: #591981)

Modified: packages/pyside/branches/trunk-maverick/debian/control
===================================================================
--- packages/pyside/branches/trunk-maverick/debian/control	2010-08-31 12:44:54 UTC (rev 14328)
+++ packages/pyside/branches/trunk-maverick/debian/control	2010-08-31 12:47:13 UTC (rev 14329)
@@ -5,7 +5,7 @@
 Uploaders: Didier Raboud <didier at raboud.com>
 Build-Depends: debhelper (>= 7.4.12~), cmake (>= 2.8.2), dpkg-dev (>= 1.15.6),
 	python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), python-support (>= 0.3.9),
-	libqt4-dev, libphonon-dev, libqt4-opengl-dev,
+	libqt4-dev, libphonon-dev, libqt4-opengl-dev, libqtwebkit-dev,
 	shiboken (>= 0.4.0), libshiboken-dev (>= 0.4.0), shiboken-dbg (>= 0.4.0),
 	generatorrunner (>= 0.6.0),
 	libqt4-sql-sqlite, xvfb, xauth,
@@ -27,7 +27,6 @@
 	 python-pyside.qtcore (>= ${binary:Version}),
 	 python-pyside.qtgui (>= ${binary:Version}),
 	 python-pyside.qthelp (>= ${binary:Version}),
-	 python-pyside.qtmultimedia (>= ${binary:Version}), 
 	 python-pyside.qtnetwork (>= ${binary:Version}),
 	 python-pyside.qtopengl (>= ${binary:Version}),
 	 python-pyside.qtscript (>= ${binary:Version}),
@@ -52,7 +51,6 @@
 	 python-pyside.qtcore (>= ${binary:Version}) |
 	 python-pyside.qtgui (>= ${binary:Version}) |
 	 python-pyside.qthelp (>= ${binary:Version}) |
-	 python-pyside.qtmultimedia (>= ${binary:Version}) |
 	 python-pyside.qtnetwork (>= ${binary:Version}) |
 	 python-pyside.qtopengl (>= ${binary:Version}) |
 	 python-pyside.qtscript (>= ${binary:Version}) |
@@ -80,7 +78,7 @@
 Package: libpyside-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev (>= 4.5.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpyside0.4 (=${binary:Version}), libqt4-dev (>= 4.5.0)
 Replaces: libpyside0.3 (<< 0.4.0)
 Breaks: libpyside0.3 (<< 0.4.0)
 Description: Python bindings for Qt 4 (development files)
@@ -119,16 +117,6 @@
  .
  This package provides Python bindings for the QtHelp module.
 
-Package: python-pyside.qtmultimedia
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-Description: Qt 4 Multimedia module - Python 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 Python bindings for the QtMultimedia module.
-
 Package: python-pyside.qtnetwork
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}

Added: packages/pyside/branches/trunk-maverick/debian/patches/qt4.7.patch
===================================================================
--- packages/pyside/branches/trunk-maverick/debian/patches/qt4.7.patch	                        (rev 0)
+++ packages/pyside/branches/trunk-maverick/debian/patches/qt4.7.patch	2010-08-31 12:47:13 UTC (rev 14329)
@@ -0,0 +1,13 @@
+Index: pyside/PySide/global.h.in
+===================================================================
+--- pyside.orig/PySide/global.h.in	2010-08-31 12:56:58.000000000 +0200
++++ pyside/PySide/global.h.in	2010-08-31 12:59:11.000000000 +0200
+@@ -371,7 +371,7 @@
+ #  include <QtXmlPatterns/QtXmlPatterns>
+ #endif
+ 
+-#ifndef QT_NO_WEBKIT
++#if @QT_QTWEBKIT_FOUND@
+ #  include <QtWebKit/QtWebKit>
+ #endif
+ 

Modified: packages/pyside/branches/trunk-maverick/debian/patches/series
===================================================================
--- packages/pyside/branches/trunk-maverick/debian/patches/series	2010-08-31 12:44:54 UTC (rev 14328)
+++ packages/pyside/branches/trunk-maverick/debian/patches/series	2010-08-31 12:47:13 UTC (rev 14329)
@@ -2,3 +2,4 @@
 libPythonVersionPostfix.patch
 usePySpecificShiboken.patch
 lessBuildVerbosity.patch
+qt4.7.patch

Modified: packages/pyside/branches/trunk-maverick/debian/rules
===================================================================
--- packages/pyside/branches/trunk-maverick/debian/rules	2010-08-31 12:44:54 UTC (rev 14328)
+++ packages/pyside/branches/trunk-maverick/debian/rules	2010-08-31 12:47:13 UTC (rev 14329)
@@ -84,8 +84,9 @@
 	$(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2.so$$3/'\
 	             debian/tmp-dbg/usr/lib/*.so*)
 	# Setup the default version symbolic links
-	$(shell ln -s libpyside0.4`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so \
+	$(shell ln -s libpyside`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so.0.4 \
 	             debian/tmp/usr/lib/libpyside0.4.so)
+	$(shell ln -s libpyside0.4.so debian/tmp/usr/lib/libpyside.so)
 
 override_dh_install_2: override_dh_install_1
 	# Do the legacy install for the rest

More information about the Python-modules-commits mailing list