[Python-apps-commits] r14477 - in packages/eric/trunk/debian (6 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sat Nov 18 16:31:03 UTC 2017
Date: Saturday, November 18, 2017 @ 16:31:02
Author: gudjon-guest
Revision: 14477
* New upstream release
* Bump standards version to 4.1.1. No changes needed.
* Comment out dh_python3. Fixes a lintian error
* Change 03_disable-update-warnings. Don't check for new version
(Closes: #881953)
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/09_message_filter.patch
packages/eric/trunk/debian/rules
Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog 2017-11-14 11:45:56 UTC (rev 14476)
+++ packages/eric/trunk/debian/changelog 2017-11-18 16:31:02 UTC (rev 14477)
@@ -1,3 +1,13 @@
+eric (17.11-1) unstable; urgency=medium
+
+ * New upstream release
+ * Bump standards version to 4.1.1. No changes needed.
+ * Comment out dh_python3. Fixes a lintian error
+ * Change 03_disable-update-warnings. Don't check for new version
+ (Closes: #881953)
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sat, 18 Nov 2017 17:29:02 +0100
+
eric (17.08-1) unstable; urgency=medium
* New upstream release (Closes: #865896, #858150)
Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control 2017-11-14 11:45:56 UTC (rev 14476)
+++ packages/eric/trunk/debian/control 2017-11-18 16:31:02 UTC (rev 14477)
@@ -13,7 +13,7 @@
python3-sip-dev,
qttools5-dev-tools
X-Python3-Version: >=3.0
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
Homepage: http://eric-ide.python-projects.org/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/eric/trunk/
Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/eric/trunk/
Modified: packages/eric/trunk/debian/patches/01_path_fix.patch
===================================================================
--- packages/eric/trunk/debian/patches/01_path_fix.patch 2017-11-14 11:45:56 UTC (rev 14476)
+++ packages/eric/trunk/debian/patches/01_path_fix.patch 2017-11-18 16:31:02 UTC (rev 14477)
@@ -1,8 +1,10 @@
New patch generated from eric 4.1.0-1 diff.gz
Fixes paths and toolname extensions.
---- a/eric/Preferences/__init__.py
-+++ b/eric/Preferences/__init__.py
-@@ -822,13 +822,13 @@
+Index: eric-17.11/eric/Preferences/__init__.py
+===================================================================
+--- eric-17.11.orig/eric/Preferences/__init__.py
++++ eric-17.11/eric/Preferences/__init__.py
+@@ -844,13 +844,13 @@ class Prefs(object):
# defaults for the help settings
helpDefaults = {
"CustomViewer": "",
Modified: packages/eric/trunk/debian/patches/03_disable-update-warning.patch
===================================================================
--- packages/eric/trunk/debian/patches/03_disable-update-warning.patch 2017-11-14 11:45:56 UTC (rev 14476)
+++ packages/eric/trunk/debian/patches/03_disable-update-warning.patch 2017-11-18 16:31:02 UTC (rev 14477)
@@ -1,50 +1,15 @@
Disables update outside Debian package system.
---- a/eric/UI/UserInterface.py
-+++ b/eric/UI/UserInterface.py
-@@ -6315,8 +6315,9 @@
- self.tr("Update available"),
- self.tr(
- """The update to <b>{0}</b> of eric6 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[2], versions[3]),
- yesDefault=True)
- url = res and versions[3] or ''
-@@ -6326,8 +6327,9 @@
- self.tr("Update available"),
- self.tr(
- """The update to <b>{0}</b> of eric6 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 ''
-@@ -6347,8 +6349,9 @@
- self.tr("Update available"),
- self.tr(
- """The update to <b>{0}</b> of eric6 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 ''
-@@ -6366,8 +6369,8 @@
- self.tr("Error during updates check"),
- self.tr("""Could not perform updates check."""))
+Index: eric-17.11/eric/UI/UserInterface.py
+===================================================================
+--- eric-17.11.orig/eric/UI/UserInterface.py
++++ eric-17.11/eric/UI/UserInterface.py
+@@ -6391,7 +6391,8 @@ class UserInterface(E5MainWindow):
+ """
+ Public method to show the eric6 versions available for download.
+ """
+- self.performVersionCheck(manual=True, showVersions=True)
++ pass # Don't check for new versions.
++ #self.performVersionCheck(manual=True, showVersions=True)
-- if url:
-- QDesktopServices.openUrl(QUrl(url))
-+ #if url:
-+ #QDesktopServices.openUrl(QUrl(url))
-
@pyqtSlot()
- def __versionsDownloadCanceled(self):
+ def performVersionCheck(self, manual=True, alternative=0,
Modified: packages/eric/trunk/debian/patches/09_message_filter.patch
===================================================================
--- packages/eric/trunk/debian/patches/09_message_filter.patch 2017-11-14 11:45:56 UTC (rev 14476)
+++ packages/eric/trunk/debian/patches/09_message_filter.patch 2017-11-18 16:31:02 UTC (rev 14477)
@@ -1,8 +1,10 @@
Avoids popups when an QXcbConnection error occurs. The error message
is unimportant.
---- a/eric/E5Gui/E5ErrorMessage.py
-+++ b/eric/E5Gui/E5ErrorMessage.py
-@@ -41,6 +41,7 @@
+Index: eric-17.11/eric/E5Gui/E5ErrorMessage.py
+===================================================================
+--- eric-17.11.orig/eric/E5Gui/E5ErrorMessage.py
++++ eric-17.11/eric/E5Gui/E5ErrorMessage.py
+@@ -40,6 +40,7 @@ class E5ErrorMessage(QErrorMessage):
"eric6messagefilters")
self.__defaultFilters = [
Modified: packages/eric/trunk/debian/rules
===================================================================
--- packages/eric/trunk/debian/rules 2017-11-14 11:45:56 UTC (rev 14476)
+++ packages/eric/trunk/debian/rules 2017-11-18 16:31:02 UTC (rev 14477)
@@ -94,7 +94,7 @@
dh_link -i
dh_lintian -i
dh_compress -i
- dh_python3 -X.*/DebugClients/Python/.* -X.*/UtilitiesPython2/.*
+ #dh_python3 -X.*/DebugClients/Python/.* -X.*/UtilitiesPython2/.*
dh_fixperms -i
dh_installdeb -i
dh_gencontrol -i
More information about the Python-apps-commits
mailing list