[Python-modules-commits] r13722 - in packages/shiboken/trunk/debian (4 files)

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

    Date: Wednesday, June 30, 2010 @ 13:26:55
  Author: odyx-guest
Revision: 13722

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

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

Modified: packages/shiboken/trunk/debian/changelog
===================================================================
--- packages/shiboken/trunk/debian/changelog	2010-06-30 07:29:21 UTC (rev 13721)
+++ packages/shiboken/trunk/debian/changelog	2010-06-30 13:26:55 UTC (rev 13722)
@@ -1,3 +1,12 @@
+shiboken (0.3.2-3) UNRELEASED; urgency=low
+
+  * Remove custom cmake files in favour of cmake-data's.
+    - Remove debian/cmake/*.
+    - Bump cmake B-D to 2.8.2
+    - Adapt debian/rules.
+
+ -- Didier Raboud <didier at raboud.com>  Wed, 30 Jun 2010 15:02:41 +0200
+
 shiboken (0.3.2-2) unstable; urgency=low
 
   * Add debug-built versions to fix PySide's debug build

Modified: packages/shiboken/trunk/debian/control
===================================================================
--- packages/shiboken/trunk/debian/control	2010-06-30 07:29:21 UTC (rev 13721)
+++ packages/shiboken/trunk/debian/control	2010-06-30 13:26:55 UTC (rev 13722)
@@ -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: dpkg-dev (>= 1.15.7), debhelper (>= 7.3.12), cmake (>= 2.6.0),
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7.3.12), cmake (>= 2.8.2),
 	libqt4-dev (>= 4.5.0), libapiextractor-dev (>= 0.6.0), generatorrunner (>= 0.5.0), libgenrunner-dev (>= 0.5.0),
 	libsparsehash-dev (>= 1.6),
 	python-all-dev, python-all-dbg

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2010-06-30 07:29:21 UTC (rev 13721)
+++ packages/shiboken/trunk/debian/rules	2010-06-30 13:26:55 UTC (rev 13722)
@@ -17,8 +17,7 @@
 	-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=$(shell echo -py$*_d | sed -e 's/\.//g' -)
 
 override_dh_auto_configure-%:
@@ -27,8 +26,7 @@
 	-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=$* \
 	-DCMAKE_RELEASE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -)
 
 #### BUILD ####