[Python-modules-commits] r13726 - in packages/pyside/trunk/debian (4 files)

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

    Date: Wednesday, June 30, 2010 @ 15:05:11
  Author: odyx-guest
Revision: 13726

* Remove custom cmake files in favour of cmake-data's.
 - Remove debian/cmake/*.
 - Bump cmake B-D to 2.8.2
 - Bump libshiboken-dev B-D to 0.3.2-3
 - Adapt debian/rules.

Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/control
  packages/pyside/trunk/debian/rules
Deleted:
  packages/pyside/trunk/debian/cmake/

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-06-30 14:45:05 UTC (rev 13725)
+++ packages/pyside/trunk/debian/changelog	2010-06-30 15:05:11 UTC (rev 13726)
@@ -1,3 +1,13 @@
+pyside (0.3.2-4) UNRELEASED; urgency=low
+
+  * Remove custom cmake files in favour of cmake-data's.
+   - Remove debian/cmake/*.
+   - Bump cmake B-D to 2.8.2
+   - Bump libshiboken-dev B-D to 0.3.2-3
+   - Adapt debian/rules.
+
+ -- Didier Raboud <didier at raboud.com>  Wed, 30 Jun 2010 17:01:50 +0200
+
 pyside (0.3.2-3) unstable; urgency=low
 
   * Patches:

Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control	2010-06-30 14:45:05 UTC (rev 13725)
+++ packages/pyside/trunk/debian/control	2010-06-30 15:05:11 UTC (rev 13726)
@@ -3,10 +3,10 @@
 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.4.12~), cmake (>= 2.6.0), dpkg-dev (>= 1.15.6),
+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,
-	shiboken (>= 0.3.2), libshiboken-dev (>= 0.3.2), shiboken-dbg (>= 0.3.2-2),
+	shiboken (>= 0.3.2), libshiboken-dev (>= 0.3.2-3), shiboken-dbg (>= 0.3.2-2),
 	generatorrunner (>= 0.5.0),
 	libqt4-sql-sqlite, xvfb, xauth,
 	phonon-backend-gstreamer

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2010-06-30 14:45:05 UTC (rev 13725)
+++ packages/pyside/trunk/debian/rules	2010-06-30 15:05:11 UTC (rev 13726)
@@ -17,9 +17,7 @@
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
-	-DCMAKE_MODULE_PATH="$(shell pwd)/debian/cmake" \
-	-DCMAKE_PYTHON_VERSION="$*-dbg;$*" \
-	-DCMAKE_PYTHONLIB_VERSION="$*_d;$*" \
+	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
 	-DCMAKE_DEBUG_POSTFIX=_d \
 	-DLIBPYSIDE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -) \
 	-DSHIBOKEN_POSTFIX=$(shell echo -py$*_d | sed -e 's/\.//g' -)
@@ -30,9 +28,7 @@
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
-	-DCMAKE_MODULE_PATH="$(shell pwd)/debian/cmake" \
-	-DCMAKE_PYTHON_VERSION=$* \
-	-DCMAKE_PYTHONLIB_VERSION=$* \
+	-DCMAKE_USE_PYTHON_VERSION="$*" \
 	-DLIBPYSIDE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -) \
 	-DSHIBOKEN_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -)