[Python-modules-commits] r16893 - in packages/pyside/trunk/debian (changelog control rules)

[odyx at users.alioth.debian.org]

    Date: Wednesday, May 4, 2011 @ 07:51:04
  Author: odyx
Revision: 16893

Revert all unneeded changes for the non-released 1.0.1-2.

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

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2011-05-04 02:58:46 UTC (rev 16892)
+++ packages/pyside/trunk/debian/changelog	2011-05-04 07:51:04 UTC (rev 16893)
@@ -1,12 +1,3 @@
-pyside (1.0.1-2) unstable; urgency=low
-
-  * Add a Python_ADDITIONAL_VERSIONS variable definition to cope with
-    cmake 2.8.4.
-  * Bump shiboken B-D and deps to >= 1.0.1-3~ for python2.7.
-  * Build for python2.7 too (no specific action taken).
-
- -- Didier Raboud <odyx at debian.org>  Sun, 17 Apr 2011 12:13:10 +0200
-
 pyside (1.0.1-1) unstable; urgency=low
 
   * New 1.0.1 upstream release

Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control	2011-05-04 02:58:46 UTC (rev 16892)
+++ packages/pyside/trunk/debian/control	2011-05-04 07:51:04 UTC (rev 16893)
@@ -7,7 +7,7 @@
  python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3),
  phonon-backend-gstreamer,
  libqt4-dev (>= 4:4.7.0), libphonon-dev, libqt4-opengl-dev (>= 4:4.7.0), libqtwebkit-dev,
- shiboken (>= 1.0.1-3), libshiboken-dev (>= 1.0.1-3), shiboken-dbg (>= 1.0.1-3),
+ shiboken (>= 1.0.1), libshiboken-dev (>= 1.0.1), shiboken-dbg (>= 1.0.1),
  generatorrunner (>= 0.6.8), libgenrunner-dev (>= 0.6.8), libapiextractor-dev (>= 0.10.1),
  libqt4-sql-sqlite (>= 4:4.7.0), xvfb, xauth, libgl1-mesa-dri
 # Various Build-Depends are needed for success of the testsuite:
@@ -47,7 +47,7 @@
 Priority: extra
 Section: debug
 Depends: ${shlibs:Depends}, ${misc:Depends},
-  shiboken-dbg (>= 1.0.1-3),
+  shiboken-dbg (>= 1.0.1),
   python-pyside.phonon (>= ${binary:Version}) |
   python-pyside.qtcore (>= ${binary:Version}) |
   python-pyside.qtdeclarative (>= ${binary:Version}) |

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-05-04 02:58:46 UTC (rev 16892)
+++ packages/pyside/trunk/debian/rules	2011-05-04 07:51:04 UTC (rev 16893)
@@ -23,7 +23,6 @@
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
-	-DPython_ADDITIONAL_VERSIONS="$*-dbg;$*_d;$*" \
 	-DUSE_XVFB=true \
 	-DPYTHON_BASENAME=python$*-dbg
 
@@ -34,7 +33,6 @@
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION="$*" \
-	-DPython_ADDITIONAL_VERSIONS="$*" \
 	-DUSE_XVFB=true \
 	-DPYTHON_BASENAME=python$* \
 	-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}