[Python-apps-commits] r14297 - in packages/eric/trunk/debian (29 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sat Aug 5 12:05:08 UTC 2017
Date: Saturday, August 5, 2017 @ 12:05:06
Author: gudjon-guest
Revision: 14297
* New upstream release
* Fix patches for new release, no changes.
* Move binary-arch below binary-indep
* Add manpage for eric6_shell
* Bump standards version to 4.0.0, no changes needed
* Use pkg-info.mk for version parsing
Added:
packages/eric/trunk/debian/debian-manpages/eric6_shell.1
Modified:
packages/eric/trunk/debian/changelog
packages/eric/trunk/debian/control
packages/eric/trunk/debian/debian-manpages/eric6.1
packages/eric/trunk/debian/debian-manpages/eric6_api.1
packages/eric/trunk/debian/debian-manpages/eric6_compare.1
packages/eric/trunk/debian/debian-manpages/eric6_configure.1
packages/eric/trunk/debian/debian-manpages/eric6_diff.1
packages/eric/trunk/debian/debian-manpages/eric6_doc.1
packages/eric/trunk/debian/debian-manpages/eric6_editor.1
packages/eric/trunk/debian/debian-manpages/eric6_helpviewer.1
packages/eric/trunk/debian/debian-manpages/eric6_hexeditor.1
packages/eric/trunk/debian/debian-manpages/eric6_iconeditor.1
packages/eric/trunk/debian/debian-manpages/eric6_plugininstall.1
packages/eric/trunk/debian/debian-manpages/eric6_pluginrepository.1
packages/eric/trunk/debian/debian-manpages/eric6_qregexp.1
packages/eric/trunk/debian/debian-manpages/eric6_qregularexpression.1
packages/eric/trunk/debian/debian-manpages/eric6_re.1
packages/eric/trunk/debian/debian-manpages/eric6_snap.1
packages/eric/trunk/debian/debian-manpages/eric6_sqlbrowser.1
packages/eric/trunk/debian/debian-manpages/eric6_tray.1
packages/eric/trunk/debian/debian-manpages/eric6_trpreviewer.1
packages/eric/trunk/debian/debian-manpages/eric6_uipreviewer.1
packages/eric/trunk/debian/debian-manpages/eric6_unittest.1
packages/eric/trunk/debian/debian-manpages/eric6_webbrowser.1
packages/eric/trunk/debian/manpages
packages/eric/trunk/debian/patches/06_no_blacklist.patch
packages/eric/trunk/debian/patches/07_webbrowser.patch
packages/eric/trunk/debian/rules
Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/changelog 2017-08-05 12:05:06 UTC (rev 14297)
@@ -1,3 +1,14 @@
+eric (17.08-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Fix patches for new release, no changes.
+ * Move binary-arch below binary-indep
+ * Add manpage for eric6_shell
+ * Bump standards version to 4.0.0, no changes needed
+ * Use pkg-info.mk for version parsing
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Thu, 03 Aug 2017 11:39:54 +0200
+
eric (17.01-1) unstable; urgency=medium
* New upstream release
Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/control 2017-08-05 12:05:06 UTC (rev 14297)
@@ -5,6 +5,7 @@
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 7)
Build-Depends-Indep: dh-python,
+ python3,
python3-all,
python3-pyqt5,
python3-pyqt5.qsci,
@@ -12,7 +13,7 @@
python3-sip-dev,
qttools5-dev-tools
X-Python3-Version: >=3.0
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
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/debian-manpages/eric6.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -46,18 +46,19 @@
.BR eric6_api (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
-.BR eric6_diff (1),
+.BR eric6_diff (1),
.BR eric6_doc (1),
-.BR eric6_editor (1),
+.BR eric6_editor (1),
.BR eric6_helpviewer (1),
.BR eric6_iconeditor (1),
-.BR eric6_plugininstall (1),
+.BR eric6_plugininstall (1),
.BR eric6_pluginrepository (1),
-.BR eric6_pluginuninstall (1),
+.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
-.BR eric6_sqlbrowser (1),
-.BR eric6_tray (1),
+.BR eric6_shell (1),
+.BR eric6_sqlbrowser (1),
+.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
.BR eric6_uipreviewer (1),
.BR eric6_unittest (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_api.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_api.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_api.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -99,6 +99,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_compare.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_compare.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_compare.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -38,6 +38,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_configure.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_configure.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_configure.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -39,6 +39,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_diff.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_diff.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_diff.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -38,6 +38,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_doc.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_doc.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_doc.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -78,6 +78,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_editor.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_editor.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_editor.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -38,6 +38,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_helpviewer.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_helpviewer.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_helpviewer.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -56,6 +56,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_hexeditor.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_hexeditor.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_hexeditor.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -61,6 +61,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_iconeditor.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_iconeditor.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_iconeditor.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -42,6 +42,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_plugininstall.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_plugininstall.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_plugininstall.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -39,6 +39,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_pluginrepository.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_pluginrepository.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_pluginrepository.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -38,6 +38,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_qregexp.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_qregexp.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_qregexp.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -56,6 +56,7 @@
.BR eric6_pluginrepository (1),
.BR eric6_pluginuninstall (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_qregularexpression.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_qregularexpression.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_qregularexpression.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -56,6 +56,7 @@
.BR eric6_pluginrepository (1),
.BR eric6_pluginuninstall (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_re.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_re.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_re.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -56,6 +56,7 @@
.BR eric6_pluginrepository (1),
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Added: packages/eric/trunk/debian/debian-manpages/eric6_shell.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_shell.1 (rev 0)
+++ packages/eric/trunk/debian/debian-manpages/eric6_shell.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -0,0 +1,74 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ERIC6_SHELL 1 "August 05, 2017"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+eric6_shell \- Eric6 python shell.
+.SH SYNOPSIS
+.B eric6_shell
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B eric6_shell
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBeric6_shell\fP is a stand alone version of the eric6 interpreter shell.
+Supports both Python 2 and 3.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-\-config\=configDir use the given directory as the one containing the config files
+.TP
+.B \-h or \-\-help
+Show this help and exit.
+.TP
+.B \-\-settings\=settingsDir use the given directory to store the settings files
+.TP
+.B \-\-version show the program's version number and exit
+
+
+.SH SEE ALSO
+.BR eric6 (1),
+.BR eric6_compare (1),
+.BR eric6_configure (1),
+.BR eric6_diff (1),
+.BR eric6_doc (1),
+.BR eric6_editor (1),
+.BR eric6_helpviewer (1),
+.BR eric6_iconeditor (1),
+.BR eric6_plugininstall (1),
+.BR eric6_pluginrepository (1),
+.BR eric6_pluginuninstall (1),
+.BR eric6_qregexp (1),
+.BR eric6_re (1),
+.BR eric6_sqlbrowser (1),
+.BR eric6_tray (1),
+.BR eric6_trpreviewer (1),
+.BR eric6_uipreviewer (1),
+.BR eric6_unittest (1),
+.BR eric6_webbrowser (1)
+.br
+.SH AUTHOR
+This manual page was written by Gudjon I. Gudjonsson <gudjon at gudjon.org>,
+for the Debian project (but may be used by others).
Modified: packages/eric/trunk/debian/debian-manpages/eric6_snap.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_snap.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_snap.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -61,6 +61,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_sqlbrowser.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_sqlbrowser.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_sqlbrowser.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -61,6 +61,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_tray.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_tray.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_tray.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -39,6 +39,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_trpreviewer (1),
.BR eric6_uipreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_trpreviewer.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_trpreviewer.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_trpreviewer.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -57,6 +57,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_uipreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_uipreviewer.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_uipreviewer.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_uipreviewer.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -57,6 +57,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_unittest.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_unittest.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_unittest.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -57,6 +57,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/debian-manpages/eric6_webbrowser.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric6_webbrowser.1 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/debian-manpages/eric6_webbrowser.1 2017-08-05 12:05:06 UTC (rev 14297)
@@ -63,6 +63,7 @@
.BR eric6_pluginuninstall (1),
.BR eric6_qregexp (1),
.BR eric6_re (1),
+.BR eric6_shell (1),
.BR eric6_sqlbrowser (1),
.BR eric6_tray (1),
.BR eric6_trpreviewer (1),
Modified: packages/eric/trunk/debian/manpages
===================================================================
--- packages/eric/trunk/debian/manpages 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/manpages 2017-08-05 12:05:06 UTC (rev 14297)
@@ -15,6 +15,7 @@
debian/debian-manpages/eric6_qregularexpression.1
debian/debian-manpages/eric6_re.1
debian/debian-manpages/eric6_snap.1
+debian/debian-manpages/eric6_shell.1
debian/debian-manpages/eric6_sqlbrowser.1
debian/debian-manpages/eric6_tray.1
debian/debian-manpages/eric6_trpreviewer.1
Modified: packages/eric/trunk/debian/patches/06_no_blacklist.patch
===================================================================
--- packages/eric/trunk/debian/patches/06_no_blacklist.patch 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/patches/06_no_blacklist.patch 2017-08-05 12:05:06 UTC (rev 14297)
@@ -2,12 +2,12 @@
in the control file.
--- a/eric/Globals/__init__.py
+++ b/eric/Globals/__init__.py
-@@ -66,62 +66,9 @@
+@@ -65,65 +65,7 @@
+ def checkBlacklistedVersions():
+ """
Module functions to check for blacklisted versions of the prerequisites.
-
- @return flag indicating good versions were found (boolean)
-+
-+ Not used in Debian, always return True
+-
+- @return flag indicating good versions were found (boolean)
"""
- from install import BlackLists, PlatformsBlackLists
-
@@ -21,8 +21,8 @@
-
- # check version of sip
- try:
-- import sipconfig
-- sipVersion = sipconfig.Configuration().sip_version_str
+- import sip
+- sipVersion = sip.SIP_VERSION_STR
- # always assume, that snapshots are good
- if "snapshot" not in sipVersion:
- # check for blacklisted versions
@@ -33,7 +33,7 @@
- .format(vers))
- print('Please install another version.')
- return False
-- except ImportError:
+- except (ImportError, AttributeError):
- pass
-
- # check version of PyQt
@@ -64,6 +64,7 @@
- ' with eric6.'.format(vers))
- print('Please install another version.')
- return False
-
+-
return True
+
Modified: packages/eric/trunk/debian/patches/07_webbrowser.patch
===================================================================
--- packages/eric/trunk/debian/patches/07_webbrowser.patch 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/patches/07_webbrowser.patch 2017-08-05 12:05:06 UTC (rev 14297)
@@ -14,7 +14,7 @@
Comment[de]=Web Browser für PyQt basierend auf QtWebKit
GenericName=Web Browser
GenericName[de]=Web Browser
--Categories=Qt;Python;Network;WebBrowser;QtWebKit
+-Categories=Qt;X-Python;Network;WebBrowser;X-QtWebKit;
+Categories=Development;IDE;
+Keywords=programming;code;python;ruby
StartupNotify=true
@@ -29,11 +29,3 @@
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-mimearchive;
Icon=ericWeb at MARKER@
Terminal=false
-@@ -11,5 +11,6 @@
- Comment[de]=Web Browser für PyQt5 basierend auf QtWebEngine
- GenericName=Web Browser
- GenericName[de]=Web Browser
--Categories=Qt;Python;Network;WebBrowser;QtWebEngine
-+Categories=Development;IDE;
-+Keywords=programming;code;python;ruby
- StartupNotify=true
Modified: packages/eric/trunk/debian/rules
===================================================================
--- packages/eric/trunk/debian/rules 2017-07-31 22:55:51 UTC (rev 14296)
+++ packages/eric/trunk/debian/rules 2017-08-05 12:05:06 UTC (rev 14297)
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
+include /usr/share/dpkg/pkg-info.mk
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -13,6 +15,11 @@
# $(KDEAPIFILE)
LAN=cs de en es fr it pt ru tr zh_CN
+test:
+ set -e;\
+ VER=$(DEB_VERSION_UPSTREAM);\
+ echo $$VER
+
clean:
dh_testdir
dh_testroot
@@ -79,9 +86,6 @@
rm -f debian/eric/usr/bin/eric6_browser
-binary: binary-indep binary-arch
-binary-arch:
-
# Build architecture-independent files here.
binary-indep: install
dh_testdir -i
@@ -101,9 +105,14 @@
dh_md5sums -i
dh_builddeb -i
+binary-arch:
+# Nothing to do
+
+
+
get-orig-source:
- VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+~]+).*,\1,p');\
set -e;\
+ VER=$(DEB_VERSION_UPSTREAM);\
wget -q http://sourceforge.net/projects/eric-ide/files/eric6/stable/$$VER/eric6-$$VER.tar.gz/download\
-O eric_$$VER.orig.tar.gz; \
tar -xz --exclude=eric/DebugClients/Python/coverage/htmlfiles/jquery.tablesorter.min.js \
@@ -130,4 +139,7 @@
done;\
mv eric_$$VER.orig-transl-zh_CN.tar.gz eric_$$VER.orig-transl-zhCN.tar.gz
+binary: binary-indep binary-arch
.PHONY: clean binary-indep binary-arch binary install
+
+
More information about the Python-apps-commits
mailing list