[Python-apps-commits] r10742 - in packages/eric/trunk/debian (5 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sat Apr 5 19:25:42 UTC 2014
Date: Saturday, April 5, 2014 @ 19:25:41
Author: gudjon-guest
Revision: 10742
* Add qt5-doc and pyqt5-doc to Suggest
* Add path to qt5-doc and pyqt5-doc to 01_fix_path patch
* Add dependency on dh-python
Modified:
packages/eric/trunk/debian/changelog
packages/eric/trunk/debian/control
packages/eric/trunk/debian/patches/01_path_fix.patch
packages/eric/trunk/debian/patches/03_disable-update-warning.patch
packages/eric/trunk/debian/patches/05_minor_docfix.patch
Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog 2014-04-05 14:42:50 UTC (rev 10741)
+++ packages/eric/trunk/debian/changelog 2014-04-05 19:25:41 UTC (rev 10742)
@@ -1,4 +1,4 @@
-eric (5.4.2-1) UNRELEASED; urgency=medium
+eric (5.4.3-1) unstable; urgency=medium
* New upstream relase (Closes: #685140)
* Add dependencies on all needed Python3 related packages
@@ -11,6 +11,9 @@
* Disable 02_missing-profile.patch
* Disable language zh_CN.GB2312, it doesn't work
* Update watch file
+ * Add qt5-doc and pyqt5-doc to Suggest
+ * Add path to qt5-doc and pyqt5-doc to 01_fix_path patch
+ * Add dependency on dh-python
-- Gudjon I. Gudjonsson <gudjon at gudjon.org> Wed, 02 Apr 2014 22:10:31 +0200
Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control 2014-04-05 14:42:50 UTC (rev 10741)
+++ packages/eric/trunk/debian/control 2014-04-05 19:25:41 UTC (rev 10742)
@@ -19,7 +19,8 @@
python3-pygments, python-chardet, python3-pyqt4.qsci, python3-pyqt4.qtsql
Recommends: eric-api-files
Suggests: qt4-designer, qt4-doc-html, pyqt4-dev-tools,
- qt4-dev-tools, ruby, python-doc, python-qt4-doc, python-kde4-doc, python-profiler
+ qt4-dev-tools, ruby, python-doc, python-qt4-doc, python-kde4-doc, python-profiler,
+ pyqt5-doc, qt5-doc
Description: full featured Python IDE
eric is a full featured Python IDE written in PyQt using the QScintilla
editor widget. Some highlights
Modified: packages/eric/trunk/debian/patches/01_path_fix.patch
===================================================================
--- packages/eric/trunk/debian/patches/01_path_fix.patch 2014-04-05 14:42:50 UTC (rev 10741)
+++ packages/eric/trunk/debian/patches/01_path_fix.patch 2014-04-05 19:25:41 UTC (rev 10742)
@@ -2,7 +2,7 @@
Fixes paths and toolname extensions.
--- a/eric/Preferences/__init__.py
+++ b/eric/Preferences/__init__.py
-@@ -704,12 +704,12 @@
+@@ -704,13 +704,13 @@
helpDefaults = {
"HelpViewerType": 1, # this corresponds with the radio button id
"CustomViewer": "",
@@ -12,10 +12,13 @@
+ "Python2DocDir": "/usr/share/doc/python-doc/html/index.html",
"QtDocDir": "",
- "Qt4DocDir": "",
+- "Qt5DocDir": "",
+- "PyQt4DocDir": "",
+- "PyQt5DocDir": "",
+ "Qt4DocDir": "/usr/share/doc/qt4-doc-html/html/index.html",
- "Qt5DocDir": "",
-- "PyQt4DocDir": "",
-+ "PyQt4DocDir": "/usr/share/doc/python-qt4-doc/html/",
- "PyQt5DocDir": "",
++ "Qt5DocDir": "/usr/share/doc/qt5-doc-html/html/index.html",
++ "PyQt4DocDir": "/usr/share/doc/python-qt4-doc/html/index.html",
++ "PyQt5DocDir": "/usr/share/doc/pyqt5-doc/html/index.html",
"PySideDocDir": "",
"SingleHelpWindow": True,
+ "SaveGeometry": True,
Modified: packages/eric/trunk/debian/patches/03_disable-update-warning.patch
===================================================================
--- packages/eric/trunk/debian/patches/03_disable-update-warning.patch 2014-04-05 14:42:50 UTC (rev 10741)
+++ packages/eric/trunk/debian/patches/03_disable-update-warning.patch 2014-04-05 19:25:41 UTC (rev 10742)
@@ -1,31 +1,43 @@
Disables update outside Debian package system.
--- a/eric/UI/UserInterface.py
+++ b/eric/UI/UserInterface.py
-@@ -5928,8 +5928,9 @@
+@@ -5929,8 +5929,9 @@
self.trUtf8("Update available"),
self.trUtf8(
"""The update to <b>{0}</b> of eric5 is"""
- """ available at <b>{1}</b>. Would you like to"""
- """ get it?""")
+ """ available at <b>{1}</b>."""
-+ """Please ask the Debian maintainer to"""
-+ """upgrade the package.""")
++ """Please ask the Debian maintainer"""
++ """to upgrade the package.""")
.format(versions[2], versions[3]),
yesDefault=True)
url = res and versions[3] or ''
-@@ -5939,8 +5940,9 @@
+@@ -5940,8 +5941,9 @@
self.trUtf8("Update available"),
self.trUtf8(
"""The update to <b>{0}</b> of eric5 is"""
- """ available at <b>{1}</b>. Would you like to"""
- """ get it?""")
+ """ available at <b>{1}</b>."""
-+ """Please ask the Debian maintainer to"""
-+ """upgrade the package.""")
++ """Please ask the Debian maintainer"""
++ """to upgrade the package.""")
.format(versions[0], versions[1]),
yesDefault=True)
url = res and versions[1] or ''
-@@ -5979,8 +5981,8 @@
+@@ -5961,8 +5963,9 @@
+ self.trUtf8("Update available"),
+ self.trUtf8(
+ """The update to <b>{0}</b> of eric5 is"""
+- """ available at <b>{1}</b>. Would you like"""
+- """ to get it?""")
++ """ available at <b>{1}</b>."""
++ """Please ask the Debian maintainer"""
++ """to upgrade the package.""")
+ .format(versions[0], versions[1]),
+ yesDefault=True)
+ url = res and versions[1] or ''
+@@ -5980,8 +5983,8 @@
self.trUtf8("Error during updates check"),
self.trUtf8("""Could not perform updates check."""))
Modified: packages/eric/trunk/debian/patches/05_minor_docfix.patch
===================================================================
--- packages/eric/trunk/debian/patches/05_minor_docfix.patch 2014-04-05 14:42:50 UTC (rev 10741)
+++ packages/eric/trunk/debian/patches/05_minor_docfix.patch 2014-04-05 19:25:41 UTC (rev 10742)
@@ -1,7 +1,7 @@
Minor changes to documentation
--- a/eric/Documentation/Source/eric5.QScintilla.QsciScintillaCompat.html
+++ b/eric/Documentation/Source/eric5.QScintilla.QsciScintillaCompat.html
-@@ -308,7 +308,7 @@
+@@ -317,7 +317,7 @@
<td>Public method to set the current indicator.</td>
</tr><tr>
<td><a href="#QsciScintillaCompat.setCursorFlashTime">setCursorFlashTime</a></td>
@@ -10,7 +10,7 @@
</tr><tr>
<td><a href="#QsciScintillaCompat.setEolModeByEolString">setEolModeByEolString</a></td>
<td>Public method to set the eol mode given the eol string.</td>
-@@ -1292,7 +1292,7 @@
+@@ -1342,7 +1342,7 @@
<h4>QsciScintillaCompat.setCursorFlashTime</h4>
<b>setCursorFlashTime</b>(<i>time</i>)
<p>
@@ -19,7 +19,7 @@
milliseconds.
</p><p>
The flash time is the time required to display, invert and restore the
-@@ -1560,4 +1560,4 @@
+@@ -1620,4 +1620,4 @@
</dl>
<div align="right"><a href="#top">Up</a></div>
<hr />
More information about the Python-apps-commits
mailing list