[Python-apps-commits] r668 - in packages/eric/trunk/debian/patches (3 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Wed Feb 20 22:59:53 UTC 2008
Date: Wednesday, February 20, 2008 @ 22:59:51
Author: gudjon-guest
Revision: 668
Deleted 01_brm_paths.dpatch and added 05_fix-api-path.dpatch
Added:
packages/eric/trunk/debian/patches/05_fix-api-path.dpatch
Modified:
packages/eric/trunk/debian/patches/00list
Deleted:
packages/eric/trunk/debian/patches/01_brm_paths.dpatch
Modified: packages/eric/trunk/debian/patches/00list
===================================================================
--- packages/eric/trunk/debian/patches/00list 2008-02-20 22:28:39 UTC (rev 667)
+++ packages/eric/trunk/debian/patches/00list 2008-02-20 22:59:51 UTC (rev 668)
@@ -2,3 +2,4 @@
02_missing-profile
03_installer_fix
04_documentation_paths
+05_fix-api-path
\ No newline at end of file
Deleted: packages/eric/trunk/debian/patches/01_brm_paths.dpatch
===================================================================
--- packages/eric/trunk/debian/patches/01_brm_paths.dpatch 2008-02-20 22:28:39 UTC (rev 667)
+++ packages/eric/trunk/debian/patches/01_brm_paths.dpatch 2008-02-20 22:59:51 UTC (rev 668)
@@ -1,76 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_brm_paths.dpatch by <gudjon at gudjon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from eric 4.0.4-1 diff.gz
-## DP: Fixed versions of qt-designer, changed brm to Debian version,
-## DP: changed document paths.
-
- at DPATCH@
-
---- eric-4.0.4.orig/eric/UI/UserInterface.py
-+++ eric-4.0.4/eric/UI/UserInterface.py
-@@ -3002,7 +3000,7 @@
- else:
- pythonDocDir = Utilities.getEnvironmentEntry("PYTHONDOCDIR",
- '/usr/share/doc/packages/python/html')
-- home = Utilities.normjoinpath(pythonDocDir, 'index.html')
-+ home = '/usr/share/doc/python2.4-doc/html/index.html'
-
- if sys.platform == "win32" and not os.path.exists(home):
- pyversion = sys.hexversion >> 16
-@@ -3068,7 +3066,7 @@
- qt4DocDir = unicode(Preferences.getHelp("Qt4DocDir"))
- if not qt4DocDir:
- qt4DocDir = Utilities.getEnvironmentEntry("QT4DOCDIR", "")
-- home = Utilities.normjoinpath(qt4DocDir, 'index.html')
-+ home = '/usr/share/doc/qt4-doc/html/index.html'
-
- if not os.path.exists(home):
- KQMessageBox.warning(None,
-@@ -3092,7 +3090,7 @@
- """
- Private slot to show the PyQt4 documentation.
- """
-- pyqt4DocDir = unicode(Preferences.getHelp("PyQt4DocDir"))
-+ pyqt4DocDir = "/usr/share/doc/python-qt4-doc/html/"
- if not pyqt4DocDir:
- pyqt4DocDir = Utilities.getEnvironmentEntry("PYQT4DOCDIR", None)
-
---- eric-4.0.4.orig/eric/Refactoring/Refactoring.py
-+++ eric-4.0.4/eric/Refactoring/Refactoring.py
-@@ -12,9 +12,7 @@
-
- from eric4config import getConfig
-
--sys.path.insert(1, os.path.join(getConfig('ericDir'),
-- "ThirdParty", "brm"))
--import ThirdParty.brm.bike as bike
-+import bike
-
- from PyQt4.QtCore import *
- from PyQt4.QtGui import *
---- eric-4.0.4.orig/eric/Preferences/__init__.py
-+++ eric-4.0.4/eric/Preferences/__init__.py
-@@ -368,16 +368,16 @@
-
- # defaults for Qt related stuff
- qtDefaults = {
-- "QtDir" : "",
-+ "QtDir" : "/usr/share/qt3",
- "ExportQtDir" : 0,
- "DisableQt3" : 0,
-- "Qt4Dir" : "",
-+ "Qt4Dir" : "/usr/share/qt4",
- "ExportQt4Dir" : 0,
- "Qt4TranslationsDir" : "",
- "QtToolsPrefix3" : "",
-- "QtToolsPostfix3" : "",
-+ "QtToolsPostfix3" : "-qt3",
- "QtToolsPrefix4" : "",
-- "QtToolsPostfix4" : "",
-+ "QtToolsPostfix4" : "-qt4",
- }
-
- # defaults for corba related stuff
-
Added: packages/eric/trunk/debian/patches/05_fix-api-path.dpatch
===================================================================
--- packages/eric/trunk/debian/patches/05_fix-api-path.dpatch (rev 0)
+++ packages/eric/trunk/debian/patches/05_fix-api-path.dpatch 2008-02-20 22:59:51 UTC (rev 668)
@@ -0,0 +1,103 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix-api-path.dpatch by <martin.hoefling at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad eric-4.1.0~/eric/install.py eric-4.1.0/eric/install.py
+--- eric-4.1.0~/eric/install.py 2008-02-05 12:59:40.000000000 +0100
++++ eric-4.1.0/eric/install.py 2008-02-05 13:01:40.000000000 +0100
+@@ -212,20 +212,22 @@
+ """
+ global cfg
+
+- try:
+- from PyQt4 import pyqtconfig
+- qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
+- except (AttributeError, ImportError):
+- print
+- print "Please enter the name of the Qt data directory."
+- print "(That is the one containing the 'qsci' subdirectory.)"
+- qtDataDir = raw_input(">>> ")
+- if qtDataDir:
+- scidir = os.path.join(qtDataDir, "qsci")
+- apidir = os.path.join(scidir, "api", "python")
+- else:
+- apidir = cfg['ericOthersDir']
++# try:
++# from PyQt4 import pyqtconfig
++# qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
++# except (AttributeError, ImportError):
++# print
++# print "Please enter the name of the Qt data directory."
++# print "(That is the one containing the 'qsci' subdirectory.)"
++# qtDataDir = raw_input(">>> ")
++# if qtDataDir:
++# scidir = os.path.join(qtDataDir, "qsci")
++# apidir = os.path.join(scidir, "api", "python")
++# else:
++# apidir = cfg['ericOthersDir']
+
++ apidir="/usr/share/eric/APIs"
++
+ return apidir
+
+
+@@ -485,7 +487,7 @@
+ global cfg
+
+ apis = []
+- for apiName in glob.glob(os.path.join("eric", "APIs", "*.api")):
++ for apiName in glob.glob(os.path.join("debian/eric-api-files/usr/share/eric/APIs", "*.api")):
+ apis.append(os.path.basename(apiName))
+
+ fn = 'eric4config.py'
+diff -urNad eric-4.1.0~/install.py eric-4.1.0/install.py
+--- eric-4.1.0~/install.py 2008-02-05 12:59:40.000000000 +0100
++++ eric-4.1.0/install.py 2008-02-05 13:00:58.000000000 +0100
+@@ -212,20 +212,21 @@
+ """
+ global cfg
+
+- try:
+- from PyQt4 import pyqtconfig
+- qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
+- except (AttributeError, ImportError):
+- print
+- print "Please enter the name of the Qt data directory."
+- print "(That is the one containing the 'qsci' subdirectory.)"
+- qtDataDir = raw_input(">>> ")
+- if qtDataDir:
+- scidir = os.path.join(qtDataDir, "qsci")
+- apidir = os.path.join(scidir, "api", "python")
+- else:
+- apidir = cfg['ericOthersDir']
+-
++# try:
++# from PyQt4 import pyqtconfig
++# qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
++# except (AttributeError, ImportError):
++# print
++# print "Please enter the name of the Qt data directory."
++# print "(That is the one containing the 'qsci' subdirectory.)"
++# qtDataDir = raw_input(">>> ")
++# if qtDataDir:
++# scidir = os.path.join(qtDataDir, "qsci")
++# apidir = os.path.join(scidir, "api", "python")
++# else:
++# apidir = cfg['ericOthersDir']
++
++ apidir="/usr/share/eric/APIs"
+ return apidir
+
+
+@@ -485,7 +486,7 @@
+ global cfg
+
+ apis = []
+- for apiName in glob.glob(os.path.join("eric", "APIs", "*.api")):
++ for apiName in glob.glob(os.path.join("debian/eric-api-files/usr/share/eric/APIs", "*.api")):
+ apis.append(os.path.basename(apiName))
+
+ fn = 'eric4config.py'
Property changes on: packages/eric/trunk/debian/patches/05_fix-api-path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Python-apps-commits
mailing list