[Python-apps-commits] r13310 - in packages/eric/trunk/debian (8 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sun Jun 19 09:26:09 UTC 2016
Date: Sunday, June 19, 2016 @ 09:26:07
Author: gudjon-guest
Revision: 13310
* New upstream release (Closes: #825262)
* Rename Chinese translation (Closes: #820199)
* Remove patch 08_fix_segfault, fixed in upstream
Modified:
packages/eric/trunk/debian/changelog
packages/eric/trunk/debian/patches/01_path_fix.patch
packages/eric/trunk/debian/patches/03_disable-update-warning.patch
packages/eric/trunk/debian/patches/04_debian_chardet.patch
packages/eric/trunk/debian/patches/06_no_blacklist.patch
packages/eric/trunk/debian/patches/series
packages/eric/trunk/debian/rules
Deleted:
packages/eric/trunk/debian/patches/08_fix_segfault.patch
Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog 2016-06-18 13:51:40 UTC (rev 13309)
+++ packages/eric/trunk/debian/changelog 2016-06-19 09:26:07 UTC (rev 13310)
@@ -1,3 +1,11 @@
+eric (6.1.6-1) UNRELEASED; urgency=medium
+
+ * New upstream release (Closes: #825262)
+ * Rename Chinese translation (Closes: #820199)
+ * Remove patch 08_fix_segfault, fixed in upstream
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sun, 19 Jun 2016 11:22:20 +0200
+
eric (6.1.2-1) unstable; urgency=medium
* New upstream release
Modified: packages/eric/trunk/debian/patches/01_path_fix.patch
===================================================================
--- packages/eric/trunk/debian/patches/01_path_fix.patch 2016-06-18 13:51:40 UTC (rev 13309)
+++ packages/eric/trunk/debian/patches/01_path_fix.patch 2016-06-19 09:26:07 UTC (rev 13310)
@@ -2,9 +2,9 @@
Fixes paths and toolname extensions.
--- a/eric/Preferences/__init__.py
+++ b/eric/Preferences/__init__.py
-@@ -692,13 +692,13 @@
+@@ -809,13 +809,13 @@
+ # defaults for the help settings
helpDefaults = {
- "HelpViewerType": 1, # this corresponds with the radio button id
"CustomViewer": "",
- "PythonDocDir": "",
- "Python2DocDir": "",
Modified: packages/eric/trunk/debian/patches/03_disable-update-warning.patch
===================================================================
--- packages/eric/trunk/debian/patches/03_disable-update-warning.patch 2016-06-18 13:51:40 UTC (rev 13309)
+++ packages/eric/trunk/debian/patches/03_disable-update-warning.patch 2016-06-19 09:26:07 UTC (rev 13310)
@@ -1,7 +1,7 @@
Disables update outside Debian package system.
--- a/eric/UI/UserInterface.py
+++ b/eric/UI/UserInterface.py
-@@ -6000,8 +6000,9 @@
+@@ -6098,8 +6098,9 @@
self.tr("Update available"),
self.tr(
"""The update to <b>{0}</b> of eric6 is"""
@@ -13,7 +13,7 @@
.format(versions[2], versions[3]),
yesDefault=True)
url = res and versions[3] or ''
-@@ -6011,8 +6012,9 @@
+@@ -6109,8 +6110,9 @@
self.tr("Update available"),
self.tr(
"""The update to <b>{0}</b> of eric6 is"""
@@ -25,7 +25,7 @@
.format(versions[0], versions[1]),
yesDefault=True)
url = res and versions[1] or ''
-@@ -6032,8 +6034,9 @@
+@@ -6130,8 +6132,9 @@
self.tr("Update available"),
self.tr(
"""The update to <b>{0}</b> of eric6 is"""
@@ -37,7 +37,7 @@
.format(versions[0], versions[1]),
yesDefault=True)
url = res and versions[1] or ''
-@@ -6051,8 +6054,8 @@
+@@ -6149,8 +6152,8 @@
self.tr("Error during updates check"),
self.tr("""Could not perform updates check."""))
Modified: packages/eric/trunk/debian/patches/04_debian_chardet.patch
===================================================================
--- packages/eric/trunk/debian/patches/04_debian_chardet.patch 2016-06-18 13:51:40 UTC (rev 13309)
+++ packages/eric/trunk/debian/patches/04_debian_chardet.patch 2016-06-19 09:26:07 UTC (rev 13310)
@@ -2,7 +2,7 @@
of the upstream ThirdParty one.
--- a/eric/Utilities/__init__.py
+++ b/eric/Utilities/__init__.py
-@@ -239,8 +239,8 @@
+@@ -240,8 +240,8 @@
if Preferences.getEditor("AdvancedEncodingDetection"):
# Try the universal character encoding detector
try:
@@ -13,7 +13,7 @@
if guess and guess['confidence'] > 0.95 and \
guess['encoding'] is not None:
codec = guess['encoding'].lower()
-@@ -422,8 +422,8 @@
+@@ -423,8 +423,8 @@
# try codec detection
try:
Modified: packages/eric/trunk/debian/patches/06_no_blacklist.patch
===================================================================
--- packages/eric/trunk/debian/patches/06_no_blacklist.patch 2016-06-18 13:51:40 UTC (rev 13309)
+++ packages/eric/trunk/debian/patches/06_no_blacklist.patch 2016-06-19 09:26:07 UTC (rev 13310)
@@ -2,7 +2,7 @@
in the control file.
--- a/eric/Globals/__init__.py
+++ b/eric/Globals/__init__.py
-@@ -60,62 +60,9 @@
+@@ -64,62 +64,9 @@
Module functions to check for blacklisted versions of the prerequisites.
@return flag indicating good versions were found (boolean)
Deleted: packages/eric/trunk/debian/patches/08_fix_segfault.patch
===================================================================
--- packages/eric/trunk/debian/patches/08_fix_segfault.patch 2016-06-18 13:51:40 UTC (rev 13309)
+++ packages/eric/trunk/debian/patches/08_fix_segfault.patch 2016-06-19 09:26:07 UTC (rev 13310)
@@ -1,13 +0,0 @@
-Fix error in version 6.1.2 that causes help windows to fail.
-Fixed in version 6.1.3, patch will be removed
---- a/eric/Helpviewer/HelpWindow.py
-+++ b/eric/Helpviewer/HelpWindow.py
-@@ -2252,7 +2252,7 @@
-
- self.syncManager().close()
-
-- self.zoomManager().close()
-+ #self.zoomManager().close()
-
- self.__virusTotal.close()
-
Modified: packages/eric/trunk/debian/patches/series
===================================================================
--- packages/eric/trunk/debian/patches/series 2016-06-18 13:51:40 UTC (rev 13309)
+++ packages/eric/trunk/debian/patches/series 2016-06-19 09:26:07 UTC (rev 13310)
@@ -5,5 +5,4 @@
05_desktop.patch
06_no_blacklist.patch
07_webbrowser.patch
-08_fix_segfault.patch
09_message_filter.patch
Modified: packages/eric/trunk/debian/rules
===================================================================
--- packages/eric/trunk/debian/rules 2016-06-18 13:51:40 UTC (rev 13309)
+++ packages/eric/trunk/debian/rules 2016-06-19 09:26:07 UTC (rev 13310)
@@ -120,6 +120,6 @@
wget -q http://sourceforge.net/projects/eric-ide/files/eric6/stable/$$VER/eric6-i18n-$$L-$$VER.tar.gz/download\
-O eric_$$VER.orig-transl-$$L.tar.gz;\
done;\
- #mv eric_$$VER.orig-transl-zh_CN.GB2312.tar.gz eric_$$VER.orig-transl-zhCNGB2312.tar.gz
+ mv eric_$$VER.orig-transl-zh_CN.tar.gz eric_$$VER.orig-transl-zhCN.tar.gz
.PHONY: clean binary-indep binary-arch binary install
More information about the Python-apps-commits
mailing list