[Python-apps-commits] r11030 - in packages/eric/trunk/debian (4 files)

[gudjon-guest at users.alioth.debian.org]

    Date: Wednesday, July 2, 2014 @ 18:49:08
  Author: gudjon-guest
Revision: 11030

* Update patch 06_no_blacklist, fixes eric5_webbrowser
* Add patch 07_webbrowser to fix desktop file. Change the
  Category to Development;IDE; even if it is a webbrowser

Added:
  packages/eric/trunk/debian/patches/07_webbrowser.patch
Modified:
  packages/eric/trunk/debian/changelog
  packages/eric/trunk/debian/patches/06_no_blacklist.patch
  packages/eric/trunk/debian/patches/series

Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog	2014-07-02 17:57:34 UTC (rev 11029)
+++ packages/eric/trunk/debian/changelog	2014-07-02 18:49:08 UTC (rev 11030)
@@ -1,8 +1,11 @@
-eric (5.4.4-1) unstable; urgency=medium
+eric (5.4.5-1) unstable; urgency=medium
 
   * New upstream release
+  * Update patch 06_no_blacklist, fixes eric5_webbrowser
+  * Add patch 07_webbrowser to fix desktop file. Change the
+    Category to Development;IDE; even if it is a webbrowser
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 01 Jul 2014 10:52:36 +0000
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 02 Jul 2014 18:31:35 +0000
 
 eric (5.4.3-1) unstable; urgency=medium
 

Modified: packages/eric/trunk/debian/patches/06_no_blacklist.patch
===================================================================
--- packages/eric/trunk/debian/patches/06_no_blacklist.patch	2014-07-02 17:57:34 UTC (rev 11029)
+++ packages/eric/trunk/debian/patches/06_no_blacklist.patch	2014-07-02 18:49:08 UTC (rev 11030)
@@ -13,3 +13,70 @@
      
      app = E5Application(sys.argv)
      
+--- a/eric/Globals/__init__.py
++++ b/eric/Globals/__init__.py
+@@ -58,62 +58,9 @@
+     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
+     """
+-    from install import BlackLists, PlatformsBlackLists
+-    
+-    # determine the platform dependent black list
+-    if isWindowsPlatform():
+-        PlatformBlackLists = PlatformsBlackLists["windows"]
+-    elif isLinuxPlatform():
+-        PlatformBlackLists = PlatformsBlackLists["linux"]
+-    else:
+-        PlatformBlackLists = PlatformsBlackLists["mac"]
+-    
+-    # check version of sip
+-    try:
+-        import sipconfig
+-        sipVersion = sipconfig.Configuration().sip_version_str
+-        # always assume, that snapshots are good
+-        if "snapshot" not in sipVersion:
+-            # check for blacklisted versions
+-            for vers in BlackLists["sip"] + PlatformBlackLists["sip"]:
+-                if vers == sipVersion:
+-                    print(
+-                        'Sorry, sip version {0} is not compatible with eric5.'
+-                        .format(vers))
+-                    print('Please install another version.')
+-                    return False
+-    except ImportError:
+-        pass
+-    
+-    # check version of PyQt
+-    from PyQt4.QtCore import PYQT_VERSION_STR
+-    pyqtVersion = PYQT_VERSION_STR
+-    # always assume, that snapshots are good
+-    if "snapshot" not in pyqtVersion:
+-        # check for blacklisted versions
+-        for vers in BlackLists["PyQt4"] + PlatformBlackLists["PyQt4"]:
+-            if vers == pyqtVersion:
+-                print('Sorry, PyQt4 version {0} is not compatible with eric5.'
+-                      .format(vers))
+-                print('Please install another version.')
+-                return False
+-    
+-    # check version of QScintilla
+-    from PyQt4.Qsci import QSCINTILLA_VERSION_STR
+-    scintillaVersion = QSCINTILLA_VERSION_STR
+-    # always assume, that snapshots are new enough
+-    if "snapshot" not in scintillaVersion:
+-        # check for blacklisted versions
+-        for vers in BlackLists["QScintilla2"] + \
+-                PlatformBlackLists["QScintilla2"]:
+-            if vers == scintillaVersion:
+-                print(
+-                    'Sorry, QScintilla2 version {0} is not compatible'
+-                    ' with eric5.'.format(vers))
+-                print('Please install another version.')
+-                return False
+-    
+     return True
+ 
+ 

Added: packages/eric/trunk/debian/patches/07_webbrowser.patch
===================================================================
--- packages/eric/trunk/debian/patches/07_webbrowser.patch	                        (rev 0)
+++ packages/eric/trunk/debian/patches/07_webbrowser.patch	2014-07-02 18:49:08 UTC (rev 11030)
@@ -0,0 +1,11 @@
+Move desktop file into the same category as the IDE
+--- a/eric/eric5_webbrowser.desktop
++++ b/eric/eric5_webbrowser.desktop
+@@ -11,5 +11,6 @@
+ Comment[de]=Web Browser für PyQt4
+ GenericName=Web Browser
+ GenericName[de]=Web Browser
+-Categories=Qt;Python;Network;WebBrowser;
++Categories=Development;IDE;
++Keywords=programming;code;python;ruby
+ StartupNotify=true

Modified: packages/eric/trunk/debian/patches/series
===================================================================
--- packages/eric/trunk/debian/patches/series	2014-07-02 17:57:34 UTC (rev 11029)
+++ packages/eric/trunk/debian/patches/series	2014-07-02 18:49:08 UTC (rev 11030)
@@ -4,3 +4,4 @@
 04_debian_chardet.patch
 05_minor_docfix.patch
 06_no_blacklist.patch
+07_webbrowser.patch