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

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

    Date: Tuesday, December 7, 2010 @ 11:30:44
  Author: odyx-guest
Revision: 15041

Update patches for 0.2.3.

Modified:
  packages/pyside-tools/trunk/debian/patches/fix_tests.patch
  packages/pyside-tools/trunk/debian/patches/series
Deleted:
  packages/pyside-tools/trunk/debian/patches/use_python_elementtree.patch

Modified: packages/pyside-tools/trunk/debian/patches/fix_tests.patch
===================================================================
--- packages/pyside-tools/trunk/debian/patches/fix_tests.patch	2010-12-06 21:41:24 UTC (rev 15040)
+++ packages/pyside-tools/trunk/debian/patches/fix_tests.patch	2010-12-07 11:30:44 UTC (rev 15041)
@@ -1,10 +1,8 @@
 Description: Ensure pyside-rcc is in the path.
 Author: Didier Raboud <didier at raboud.com>
-Last-Update: 2010-09-15
-Index: pyside-tools.git/tests/rcc/run_test.sh
-===================================================================
---- pyside-tools.git.orig/tests/rcc/run_test.sh	2010-10-15 16:30:05.000000000 +0200
-+++ pyside-tools.git/tests/rcc/run_test.sh	2010-10-15 16:31:45.000000000 +0200
+Last-Update: 2010-12-03
+--- a/tests/rcc/run_test.sh
++++ b/tests/rcc/run_test.sh
 @@ -6,8 +6,9 @@
  # $1: python executable
  # $2: python test
@@ -16,10 +14,8 @@
 +$5/pyside-rcc -o `basename $3 .qrc`_rc.py $3
  cd $4
  $1 $2
-Index: pyside-tools.git/tests/rcc/CMakeLists.txt
-===================================================================
---- pyside-tools.git.orig/tests/rcc/CMakeLists.txt	2010-10-15 16:30:05.000000000 +0200
-+++ pyside-tools.git/tests/rcc/CMakeLists.txt	2010-10-15 16:30:07.000000000 +0200
+--- a/tests/rcc/CMakeLists.txt
++++ b/tests/rcc/CMakeLists.txt
 @@ -3,4 +3,5 @@
                   ${PYTHON_EXECUTABLE}
                   ${CMAKE_CURRENT_SOURCE_DIR}/rcc_test.py

Modified: packages/pyside-tools/trunk/debian/patches/series
===================================================================
--- packages/pyside-tools/trunk/debian/patches/series	2010-12-06 21:41:24 UTC (rev 15040)
+++ packages/pyside-tools/trunk/debian/patches/series	2010-12-07 11:30:44 UTC (rev 15041)
@@ -1,2 +1 @@
 fix_tests.patch
-use_python_elementtree.patch

Deleted: packages/pyside-tools/trunk/debian/patches/use_python_elementtree.patch
===================================================================
--- packages/pyside-tools/trunk/debian/patches/use_python_elementtree.patch	2010-12-06 21:41:24 UTC (rev 15040)
+++ packages/pyside-tools/trunk/debian/patches/use_python_elementtree.patch	2010-12-07 11:30:44 UTC (rev 15041)
@@ -1,39 +0,0 @@
-Description: Don't install nor use the embedded elementtree copy: python >=2.5
- ships both cElementTree and ElementTree; use them.
-Origin: vendor
-Forwarded: http://bugs.openbossa.org/494
-Author: Didier Raboud <didier at raboud.com>
-Last-Update: 2010-11-18
-Index: pyside-tools.git/CMakeLists.txt
-===================================================================
---- pyside-tools.git.orig/CMakeLists.txt	2010-11-18 10:54:12.000000000 +0100
-+++ pyside-tools.git/CMakeLists.txt	2010-11-18 11:10:55.000000000 +0100
-@@ -34,7 +34,8 @@
- 
- 
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pysideuic
--        DESTINATION ${SITE_PACKAGE})
-+        DESTINATION ${SITE_PACKAGE}
-+        PATTERN elementtree* EXCLUDE)
- 
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
-                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-Index: pyside-tools.git/pysideuic/uiparser.py
-===================================================================
---- pyside-tools.git.orig/pysideuic/uiparser.py	2010-11-18 10:50:23.000000000 +0100
-+++ pyside-tools.git/pysideuic/uiparser.py	2010-11-18 11:05:52.000000000 +0100
-@@ -29,13 +29,7 @@
- try:
-     from xml.etree.cElementTree import parse, SubElement
- except ImportError:
--    try:
--        from cElementTree import parse, SubElement
--    except ImportError:
--        try:
--            from elementtree.ElementTree import parse, SubElement
--        except ImportError:
--            from pysideuic.elementtree.ElementTree import parse, SubElement
-+    from xml.etree.ElementTree import parse, SubElement
- 
- 
- from exceptions import NoSuchWidgetError