[Python-modules-commits] r10810 - in packages/pyside/trunk/debian (3 files)

[odyx-guest at users.alioth.debian.org]

    Date: Thursday, December 17, 2009 @ 16:14:43
  Author: odyx-guest
Revision: 10810

Some more updates (soonish ready)

Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/control
  packages/pyside/trunk/debian/patches/multiple_python_versions.patch

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2009-12-17 14:53:24 UTC (rev 10809)
+++ packages/pyside/trunk/debian/changelog	2009-12-17 16:14:43 UTC (rev 10810)
@@ -1,4 +1,4 @@
-pyside (0.2-1) UNRELEASED; urgency=low
+pyside (0.2.2-1) UNRELEASED; urgency=low
 
   * Initial release to Debian (Closes: #543636)
     - Use the Ubuntu packaging as starting point.

Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control	2009-12-17 14:53:24 UTC (rev 10809)
+++ packages/pyside/trunk/debian/control	2009-12-17 16:14:43 UTC (rev 10810)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Didier Raboud <didier at raboud.com>
-Build-Depends: debhelper (>= 7.0.50), cmake (>= 2.6.0), quilt (>= 0.46-7), python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), libqt4-dev (>= 4.5.0), libphonon-dev (>= 4.3.0), libqt4-opengl-dev (>= 4.5.0), boostpythongenerator (>= 0.1), python-support (>= 0.3.9), libboost-python-dev
+Build-Depends: debhelper (>= 7.0.50), cmake (>= 2.6.0), quilt (>= 0.46-7), python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), libqt4-dev (>= 4.5.0), libphonon-dev (>= 4.5.0), libqt4-opengl-dev (>= 4.5.0), boostpythongenerator (>= 0.3.2), python-support (>= 0.3.9), libboost-python-dev (>= 1.40)
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyside/trunk/
@@ -12,7 +12,8 @@
 
 Package: python-pyside
 Architecture: all
-Depends: python-pyside.phonon (>= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends},
+	 python-pyside.phonon (>= ${binary:Version}),
 	 python-pyside.qtcore (>= ${binary:Version}),
 	 python-pyside.qtgui (>= ${binary:Version}),
 	 python-pyside.qthelp (>= ${binary:Version}),
@@ -63,7 +64,7 @@
 Package: libpysidebase-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev (>= 4.5.0), libboost-python1.38-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev (>= 4.5.0), libboost-python-dev
 Description: Python bindings for Qt 4 (development files)
  Development headers for the pysidebase library.
 

Modified: packages/pyside/trunk/debian/patches/multiple_python_versions.patch
===================================================================
--- packages/pyside/trunk/debian/patches/multiple_python_versions.patch	2009-12-17 14:53:24 UTC (rev 10809)
+++ packages/pyside/trunk/debian/patches/multiple_python_versions.patch	2009-12-17 16:14:43 UTC (rev 10810)
@@ -1,13 +1,16 @@
-Index: pyside-qt4.5+0.2/CMakeLists.txt
+Description: Allow multiple python versions (taken from the Gammu CMakeLists.txt)
+Author: Didier Raboud <didier at raboud.com>
+Last-Update: 2009-12-17
+Origin: vendor
+
+Index: pyside-0.2.2/CMakeLists.txt
 ===================================================================
---- pyside-qt4.5+0.2.orig/CMakeLists.txt	2009-09-16 14:08:48.000000000 +0000
-+++ pyside-qt4.5+0.2/CMakeLists.txt	2009-09-16 14:26:34.000000000 +0000
-@@ -6,8 +6,39 @@
- set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-common -Wall")
+--- pyside-0.2.2.orig/CMakeLists.txt	2009-11-24 18:39:30.000000000 +0100
++++ pyside-0.2.2/CMakeLists.txt	2009-12-11 13:43:07.000000000 +0100
+@@ -19,8 +19,39 @@
+ endif(CMAKE_HOST_UNIX)
  
- find_package(Boost 1.38.0 COMPONENTS python REQUIRED)
--find_package(PythonLibs REQUIRED)
--find_package(PythonInterp REQUIRED)
+ find_package(Boost 1.40.0 COMPONENTS python REQUIRED)
 +# Select the Python Executable (Taken from the Gammu CMakeLists.txt)
 +if (BUILD_PYTHON)
 +    find_program(PYTHON_EXECUTABLE ${BUILD_PYTHON})
@@ -38,8 +41,8 @@
 +    message (STATUS "Found PythonLibs: ${PYTHON_LIBRARIES}")
 +    message (STATUS "Found PythonInterp: ${PYTHON_EXECUTABLE}")
 +else (BUILD_PYTHON)
-+    find_package(PythonLibs REQUIRED)
-+    find_package(PythonInterp REQUIRED)
+ find_package(PythonLibs REQUIRED)
+ find_package(PythonInterp REQUIRED)
 +endif (BUILD_PYTHON)
  find_package(Qt4 4.5.0 REQUIRED)