[Python-apps-commits] r12026 - in packages/eric/trunk/debian (7 files)

gudjon-guest at users.alioth.debian.org gudjon-guest at users.alioth.debian.org
Thu Jun 18 08:11:00 UTC 2015 

    Date: Thursday, June 18, 2015 @ 08:10:59
  Author: gudjon-guest
Revision: 12026

* Fix exec field in desktop file
* Update gen_qt_apis script to PyQt5

Modified:
  packages/eric/trunk/debian/changelog
  packages/eric/trunk/debian/control
  packages/eric/trunk/debian/copyright
  packages/eric/trunk/debian/eric.desktop
  packages/eric/trunk/debian/gen_qt_apis.py
  packages/eric/trunk/debian/manpages
  packages/eric/trunk/debian/patches/series

Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog	2015-06-17 10:36:35 UTC (rev 12025)
+++ packages/eric/trunk/debian/changelog	2015-06-18 08:10:59 UTC (rev 12026)
@@ -6,6 +6,8 @@
   * Update other patches
   * Bump standards version to 3.9.6, no changes needed
   * Change dependencies to python3, pyqt5
+  * Fix exec field in desktop file
+  * Update gen_qt_apis script to PyQt5
 
  -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 03 Jan 2015 10:52:27 +0000
 

Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control	2015-06-17 10:36:35 UTC (rev 12025)
+++ packages/eric/trunk/debian/control	2015-06-18 08:10:59 UTC (rev 12026)
@@ -4,9 +4,11 @@
 Maintainer: Gudjon I. Gudjonsson <gudjon at gudjon.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: python3-all, python3-pyqt5, python3-pyqt5.qsci,
- python3-sip-dev, dh-python
-#, python-kde4
+Build-Depends-Indep: dh-python,
+                     python3-all,
+                     python3-pyqt5,
+                     python3-pyqt5.qsci,
+                     python3-sip-dev
 X-Python3-Version: >=3.0
 Standards-Version: 3.9.6
 Homepage: http://eric-ide.python-projects.org/
@@ -15,12 +17,24 @@
 
 Package: eric
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python3-pyqt4, bicyclerepair (>= 0.9-4.1), 
- python3-pygments, python-chardet, python3-pyqt4.qsci, python3-pyqt4.qtsql
+Depends: bicyclerepair (>= 0.9-4.1),
+         python-chardet,
+         python3-pygments,
+         python3-pyqt5,
+         python3-pyqt5.qsci,
+         python3-pyqt5.qtsql,
+         ${misc:Depends}
 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,
- pyqt5-doc, qt5-doc
+Suggests: pyqt5-dev-tools,
+          python-qt4-doc,
+          pyqt5-doc,
+          python-doc,
+          python-profiler,
+          python3-doc,
+          qt4-doc-html,
+          qt5-doc-html,
+          qttools5-dev,
+          ruby
 Description: full featured Python IDE
  eric is a full featured Python IDE written in PyQt using the QScintilla
  editor widget. Some highlights
@@ -46,7 +60,7 @@
 
 Package: eric-api-files
 Architecture: all
-Depends: ${misc:Depends}, eric
+Depends: eric, ${misc:Depends}
 Description: API description files for use with eric
  This package contains code completion API files of
  Python standard modules & builtins, PyQt and PyKDE.

Modified: packages/eric/trunk/debian/copyright
===================================================================
--- packages/eric/trunk/debian/copyright	2015-06-17 10:36:35 UTC (rev 12025)
+++ packages/eric/trunk/debian/copyright	2015-06-18 08:10:59 UTC (rev 12026)
@@ -10,7 +10,7 @@
    Copyright (c) 2002 - 2009 Detlev Offenbach <detlev at die-offenbachs.de>
 
    eric5 (and the others) is released under the conditions of the GPL
-   (version 3). See separate license file for more details. Third party 
+   (version 3). See separate license file for more details. Third party
    software included in eric5 is released under their respective license
    and contained in the eric5 distribution (as LICENSE.GPL) for convenience.
 
@@ -19,8 +19,8 @@
 
 
 Two third party libraries exist in the code called pygments and chardet.
-They are not used but the debian versions python-pygments and 
-python-chardet are used instead. 
+They are not used but the debian versions python-pygments and
+python-chardet are used instead.
 
 Pygments has the following license. The AUTHORS file can be found below.
 

Modified: packages/eric/trunk/debian/eric.desktop
===================================================================
--- packages/eric/trunk/debian/eric.desktop	2015-06-17 10:36:35 UTC (rev 12025)
+++ packages/eric/trunk/debian/eric.desktop	2015-06-18 08:10:59 UTC (rev 12026)
@@ -7,7 +7,7 @@
 GenericName=Integrated Development Environment for Python
 GenericName[de]=Integrierte Entwicklungsumgebung für Python
 Keywords=programming;code;python;ruby
-Exec=eric
+Exec=eric %F
 Terminal=false
 Type=Application
 MimeType=text/x-python;

Modified: packages/eric/trunk/debian/gen_qt_apis.py
===================================================================
--- packages/eric/trunk/debian/gen_qt_apis.py	2015-06-17 10:36:35 UTC (rev 12025)
+++ packages/eric/trunk/debian/gen_qt_apis.py	2015-06-18 08:10:59 UTC (rev 12026)
@@ -5,7 +5,8 @@
 # Changed by Gudjon, only to create qt apis
 import os
 import sys
-import PyQt4.pyqtconfig as pyqtconfig
+#import PyQt4.pyqtconfig as pyqtconfig
+import PyQt5.QtCore
 
 apidir = sys.argv[1]
 if not os.path.isdir(apidir):
@@ -34,14 +35,23 @@
 
 
 
-qtsipdir = os.path.abspath(pyqtconfig._pkg_config['pyqt_sip_dir'])
-modules = pyqtconfig._pkg_config['pyqt_modules'].split()
+#qtsipdir = os.path.abspath(pyqtconfig._pkg_config['pyqt_sip_dir'])
+# I don't like to have these hardcoded but I found no other way.
+qtsipdir = "/usr/share/sip/PyQt5/"
+modules = ['QtSql', 'QtWidgets', 'QtSvg', 'QtNetwork', 'QtWebKitWidgets', 'QtXml', 'QtPrintSupport',\
+'QtOpenGL', 'QtHelp', 'QtWebEngineWidgets', 'QtQuick', 'QtMultimediaWidgets', 'QtDBus',\
+'QtWebChannel', 'QtWebKit', 'QtMultimedia', 'QtQuickWidgets', 'QtSensors',\
+'QtDesigner', 'QtX11Extras', 'QtCore', 'QtWebSockets', 'QtBluetooth', 'QtMacExtras', 'QtWinExtras',\
+'QtSerialPort', 'QtGui', 'QtQml', 'QtTest', 'QtXmlPatterns', 'QtPositioning', 'Enginio']
+#pyqtconfig._pkg_config['pyqt_modules'].split()
 
 #createAPIFiles(qtsipdir, modules, [],
 #               lambda x: pyqtconfig._pkg_config["pyqt_%s_sip_flags" % (x,)].split())
+#createAPIFiles(qtsipdir, modules, [],
+#               lambda x: pyqtconfig._pkg_config["pyqt_sip_flags"].split())
+pyqt_sip_flags = PyQt5.QtCore.PYQT_CONFIGURATION        
 createAPIFiles(qtsipdir, modules, [],
-               lambda x: pyqtconfig._pkg_config["pyqt_sip_flags"].split())
-               
+               lambda x: pyqt_sip_flags["sip_flags"].split())
 
 #try:
     #import PyKDE4.pykdeconfig as pykdeconfig

Modified: packages/eric/trunk/debian/manpages
===================================================================
--- packages/eric/trunk/debian/manpages	2015-06-17 10:36:35 UTC (rev 12025)
+++ packages/eric/trunk/debian/manpages	2015-06-18 08:10:59 UTC (rev 12026)
@@ -11,12 +11,12 @@
 debian/debian-manpages/eric6_pluginrepository.1
 debian/debian-manpages/eric6_pluginuninstall.1
 debian/debian-manpages/eric6_qregexp.1
+debian/debian-manpages/eric6_qregularexpression.1
 debian/debian-manpages/eric6_re.1
+debian/debian-manpages/eric6_snap.1
 debian/debian-manpages/eric6_sqlbrowser.1
 debian/debian-manpages/eric6_tray.1
 debian/debian-manpages/eric6_trpreviewer.1
 debian/debian-manpages/eric6_uipreviewer.1
 debian/debian-manpages/eric6_unittest.1
 debian/debian-manpages/eric6_webbrowser.1
-debian/debian-manpages/eric6_qregularexpression.1
-debian/debian-manpages/eric6_snap.1

Modified: packages/eric/trunk/debian/patches/series
===================================================================
--- packages/eric/trunk/debian/patches/series	2015-06-17 10:36:35 UTC (rev 12025)
+++ packages/eric/trunk/debian/patches/series	2015-06-18 08:10:59 UTC (rev 12026)
@@ -2,5 +2,6 @@
 #02_missing-profile.patch
 03_disable-update-warning.patch
 04_debian_chardet.patch
+05_desktop.patch
 06_no_blacklist.patch
 07_webbrowser.patch

More information about the Python-apps-commits mailing list