[Python-apps-commits] r760 - in packages/eric/trunk/debian/patches (1 file)

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

    Date: Tuesday, March 4, 2008 @ 02:49:49
  Author: gudjon-guest
Revision: 760

Added the -qt4 extension to qt-designer

Modified:
  packages/eric/trunk/debian/patches/04_documentation_paths.dpatch

Modified: packages/eric/trunk/debian/patches/04_documentation_paths.dpatch
===================================================================
--- packages/eric/trunk/debian/patches/04_documentation_paths.dpatch	2008-03-03 18:36:21 UTC (rev 759)
+++ packages/eric/trunk/debian/patches/04_documentation_paths.dpatch	2008-03-04 02:49:49 UTC (rev 760)
@@ -6,9 +6,27 @@
 ## DP: Fixes documentation paths. Should be unnecessary if patch 01 works.
 
 @DPATCH@
-
---- eric-4.1.0.orig/eric/UI/UserInterface.py
-+++ eric-4.1.0/eric/UI/UserInterface.py
+diff -urNad eric-4.1.1~/eric/UI/UserInterface.py eric-4.1.1/eric/UI/UserInterface.py
+--- eric-4.1.1~/eric/UI/UserInterface.py	2008-03-04 02:32:46.000000000 +0000
++++ eric-4.1.1/eric/UI/UserInterface.py	2008-03-04 02:34:31.000000000 +0000
+@@ -2741,7 +2741,7 @@
+                         Utilities.generateQtToolName("designer", True))
+                 else:
+                     if uiLine.split('"')[1].startswith("4."):
+-                        designer = Utilities.generateQtToolName("designer")
++                        designer = "designer-qt4"
+                     else:
+                         designer = os.path.join(self.qtdir, 'bin', 
+                             Utilities.generateQtToolName("designer", True))
+@@ -2750,7 +2750,7 @@
+         if not designer:
+             # determine from requested version
+             if version == 4:
+-                designer = Utilities.generateQtToolName("designer")
++                designer = "designer-qt4"
+             else:
+                 designer = os.path.join(self.qtdir, 'bin', 
+                     Utilities.generateQtToolName("designer", True))
 @@ -3163,7 +3163,8 @@
              else:
                  pythonDocDir = Utilities.getEnvironmentEntry("PYTHONDOCDIR",