This is an automated email from the git hooks/post-receive script.
ross-guest pushed a commit to branch master
in repository creepy.
commit 03eeb000462b815860636a65cf582023af0aeec8
Author: Ross Gammon <rossgam...@mail.dk>
Date: Sun Dec 11 11:48:14 2016 +0100
Add patch to switch Qt4 imports to Qt5
Closes: #784619
Thanks: Dmitry Shachnev
---
debian/patches/05-project-dir.patch | 49 ++---
debian/patches/14-Qt5imports.patch | 417 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 430 insertions(+), 37 deletions(-)
diff --git a/debian/patches/05-project-dir.patch
b/debian/patches/05-project-dir.patch
index 9ca5aef..2c365b6 100644
--- a/debian/patches/05-project-dir.patch
+++ b/debian/patches/05-project-dir.patch
@@ -12,10 +12,8 @@ Last-Update: 2016-01-04
Forwarded: https://github.com/jkakavas/creepy/pull/24
Applied-Upstream:
https://github.com/jkakavas/creepy/commit/b21e7d33d2d8762212eb615c47c425cc33f02271
-Index: creepy-git/creepy/CreepyMain.py
-===================================================================
---- creepy-git.orig/creepy/CreepyMain.py 2016-01-05 21:33:01.172735396
+0100
-+++ creepy-git/creepy/CreepyMain.py 2016-01-05 21:33:01.168735366 +0100
+--- creepy.orig/creepy/CreepyMain.py
++++ creepy/creepy/CreepyMain.py
@@ -133,10 +133,8 @@
self.ui = Ui_CreepyMainWindow()
self.ui.setupUi(self)
@@ -38,10 +36,8 @@ Index: creepy-git/creepy/CreepyMain.py
projectFileNames = [os.path.join(projectsDir, f) for f in
os.listdir(projectsDir) if
(os.path.isfile(os.path.join(projectsDir, f)) and
f.endswith('.db'))]
self.projectNames = [n.replace('.db', '').replace(str(projectsDir) +
'/', '') for n in projectFileNames]
-Index: creepy-git/creepy/models/ProjectWizardPossibleTargetsTable.py
-===================================================================
---- creepy-git.orig/creepy/models/ProjectWizardPossibleTargetsTable.py
2016-01-05 21:33:01.172735396 +0100
-+++ creepy-git/creepy/models/ProjectWizardPossibleTargetsTable.py
2016-01-05 21:33:01.168735366 +0100
+--- creepy.orig/creepy/models/ProjectWizardPossibleTargetsTable.py
++++ creepy/creepy/models/ProjectWizardPossibleTargetsTable.py
@@ -3,6 +3,7 @@
from PyQt4.QtCore import QVariant, QAbstractTableModel, Qt
from PyQt4.Qt import QPixmap, QIcon, QMimeData, QByteArray, QDataStream,
QIODevice
@@ -60,10 +56,8 @@ Index:
creepy-git/creepy/models/ProjectWizardPossibleTargetsTable.py
if picturePath and os.path.exists(picturePath):
pixmap = QPixmap(picturePath)
return QIcon(pixmap.scaled(30, 30,
Qt.IgnoreAspectRatio, Qt.FastTransformation))
-Index: creepy-git/creepy/plugins/twitter/twitter.py
-===================================================================
---- creepy-git.orig/creepy/plugins/twitter/twitter.py 2016-01-05
21:33:01.172735396 +0100
-+++ creepy-git/creepy/plugins/twitter/twitter.py 2016-01-05
21:33:01.168735366 +0100
+--- creepy.orig/creepy/plugins/twitter/twitter.py
++++ creepy/creepy/plugins/twitter/twitter.py
@@ -70,7 +70,7 @@
target['targetFullname'] = i.name
# save the pic in the temp folder to show it later
@@ -73,10 +67,8 @@ Index: creepy-git/creepy/plugins/twitter/twitter.py
# Retieve and save the profile phot only if it does not
exist
if not os.path.exists(temp_file):
urllib.urlretrieve(i.profile_image_url, temp_file)
-Index: creepy-git/creepy/models/Project.py
-===================================================================
---- creepy-git.orig/creepy/models/Project.py 2016-01-05 21:33:01.172735396
+0100
-+++ creepy-git/creepy/models/Project.py 2016-01-05 21:33:01.168735366
+0100
+--- creepy.orig/creepy/models/Project.py
++++ creepy/creepy/models/Project.py
@@ -39,7 +39,7 @@
"""
projectName = projectNodeObject.name().encode('utf-8') + '.db'
@@ -95,23 +87,8 @@ Index: creepy-git/creepy/models/Project.py
except Exception, err:
logger.error('Error deleting the project')
logger.exception(err)
-Index: creepy-git/creepy/plugins/googleplus/googleplus.py
-===================================================================
---- creepy-git.orig/creepy/plugins/googleplus/googleplus.py 2016-01-05
21:33:01.172735396 +0100
-+++ creepy-git/creepy/plugins/googleplus/googleplus.py 2016-01-05
21:33:01.168735366 +0100
-@@ -66,7 +66,7 @@
- 'targetFullname': person['displayName']}
- #save the pic in the temp folder to show it later
- filename = 'profile_pic_%s' % person['id']
-- temp_file = os.path.join(os.getcwd(), 'temp', filename)
-+ temp_file = os.path.join(GeneralUtilities.getTempDir(),
filename)
- #Retieve and save the profile photo only if it does not
exist
- if not os.path.exists(temp_file):
- urllib.urlretrieve(person['image']['url'], temp_file)
-Index: creepy-git/creepy/plugins/instagram/instagram.py
-===================================================================
---- creepy-git.orig/creepy/plugins/instagram/instagram.py 2016-01-05
21:33:01.172735396 +0100
-+++ creepy-git/creepy/plugins/instagram/instagram.py 2016-01-05
21:33:01.168735366 +0100
+--- creepy.orig/creepy/plugins/instagram/instagram.py
++++ creepy/creepy/plugins/instagram/instagram.py
@@ -73,7 +73,7 @@
target['targetFullname'] = i.full_name
# save the pic in the temp folder to show it later
@@ -121,10 +98,8 @@ Index: creepy-git/creepy/plugins/instagram/instagram.py
if not os.path.exists(temp_file):
urllib.urlretrieve(i.profile_picture, temp_file)
possibleTargets.append(target)
-Index: creepy-git/creepy/utilities/GeneralUtilities.py
-===================================================================
---- creepy-git.orig/creepy/utilities/GeneralUtilities.py 2016-01-05
21:33:01.172735396 +0100
-+++ creepy-git/creepy/utilities/GeneralUtilities.py 2016-01-05
21:33:01.168735366 +0100
+--- creepy.orig/creepy/utilities/GeneralUtilities.py
++++ creepy/creepy/utilities/GeneralUtilities.py
@@ -32,6 +32,34 @@
return logdir
diff --git a/debian/patches/14-Qt5imports.patch
b/debian/patches/14-Qt5imports.patch
new file mode 100644
index 0000000..6ede6d1
--- /dev/null
+++ b/debian/patches/14-Qt5imports.patch
@@ -0,0 +1,417 @@
+Description: QT5 imports
+ As part of the conversion to QT5, all imports that appear to be used by
+ Creepy have been switched from Qt4 to Qt5. Thanks to Dmitry Shachnev
+ for the hint.
+Author: Ross Gammon <ros...@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784619
+Forwarded: Not yet
+Applied-Upstream: Not yet
+Last-Update: 2016-12-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- creepy.orig/creepy/CreepyMain.py
++++ creepy/creepy/CreepyMain.py
+@@ -11,12 +11,12 @@
+ import webbrowser
+ from components import creepy_resources_compiled
+ from distutils.version import StrictVersion
+-from PyQt4.QtCore import QString, QThread, SIGNAL, QUrl, QDateTime, QDate,
QRect, Qt
+-from PyQt4.QtGui import QMainWindow, QApplication, QMessageBox, QFileDialog,
QWidget, QScrollArea, QVBoxLayout, QIcon, \
++from PyQt5.QtCore import QString, QThread, SIGNAL, QUrl, QDateTime, QDate,
QRect, Qt
++from PyQt5.QtGui import QMainWindow, QApplication, QMessageBox, QFileDialog,
QWidget, QScrollArea, QVBoxLayout, QIcon, \
+ QTableWidgetItem, QAbstractItemView
+-from PyQt4.QtGui import QHBoxLayout, QLabel, QLineEdit, QCheckBox,
QPushButton, QStackedWidget, QGridLayout, QMenu, \
++from PyQt5.QtGui import QHBoxLayout, QLabel, QLineEdit, QCheckBox,
QPushButton, QStackedWidget, QGridLayout, QMenu, \
+ QPixmap
+-from PyQt4.QtWebKit import QWebPage, QWebSettings
++from PyQt5.QtWebKit import QWebPage, QWebSettings
+ from dominate import document
+ from ui.CreepyUI import Ui_CreepyMainWindow
+ from yapsy.PluginManager import PluginManagerSingleton
+--- creepy.orig/creepy/models/ProjectWizardSelectedTargetsTable.py
++++ creepy/creepy/models/ProjectWizardSelectedTargetsTable.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtCore import QVariant, QAbstractTableModel, Qt
+-from PyQt4.Qt import QDataStream, QIODevice, QModelIndex
++from PyQt5.QtCore import QVariant, QAbstractTableModel, Qt
++from PyQt5.Qt import QDataStream, QIODevice, QModelIndex
+
+
+ class ProjectWizardSelectedTargetsTable(QAbstractTableModel):
+@@ -107,4 +107,4 @@
+ droppedRows.append({'targetUsername':row[2],
'targetFullname':row[3], 'targetPicture':row[1], 'targetUserid':row[4],
'pluginName':row[0]})
+ self.insertRows(droppedRows, len(droppedRows), parent)
+
+- return True
+\ No newline at end of file
++ return True
+--- creepy.orig/creepy/models/ProjectWizardPluginListModel.py
++++ creepy/creepy/models/ProjectWizardPluginListModel.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtCore import QVariant, QAbstractListModel, Qt
+-from PyQt4.Qt import QPixmap, QFileSystemModel, QIcon
++from PyQt5.QtCore import QVariant, QAbstractListModel, Qt
++from PyQt5.Qt import QPixmap, QFileSystemModel, QIcon
+ from utilities import GeneralUtilities
+ import os
+
+--- creepy.orig/creepy/models/PluginConfigurationListModel.py
++++ creepy/creepy/models/PluginConfigurationListModel.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtCore import QVariant, QAbstractListModel, Qt
+-from PyQt4.Qt import QPixmap, QIcon
++from PyQt5.QtCore import QVariant, QAbstractListModel, Qt
++from PyQt5.Qt import QPixmap, QIcon
+ import os
+ from utilities import GeneralUtilities
+
+@@ -38,4 +38,4 @@
+ pixmap = QPixmap(':/creepy/folder')
+ return QIcon(pixmap)
+ else:
+- return QVariant()
+\ No newline at end of file
++ return QVariant()
+--- creepy.orig/creepy/models/ProjectWizardPossibleTargetsTable.py
++++ creepy/creepy/models/ProjectWizardPossibleTargetsTable.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtCore import QVariant, QAbstractTableModel, Qt
+-from PyQt4.Qt import QPixmap, QIcon, QMimeData, QByteArray, QDataStream,
QIODevice
++from PyQt5.QtCore import QVariant, QAbstractTableModel, Qt
++from PyQt5.Qt import QPixmap, QIcon, QMimeData, QByteArray, QDataStream,
QIODevice
+ import os
+ from utilities import GeneralUtilities
+ class ProjectWizardPossibleTargetsTable(QAbstractTableModel):
+@@ -86,4 +86,4 @@
+ d = QVariant(self.data(index, Qt.DisplayRole).toString())
+ stream << d
+ mimeData.setData('application/target.tableitem.creepy', encodedData)
+- return mimeData
+\ No newline at end of file
++ return mimeData
+--- creepy.orig/creepy/models/LocationsList.py
++++ creepy/creepy/models/LocationsList.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtCore import QAbstractTableModel
+-from PyQt4.QtCore import Qt, QVariant
++from PyQt5.QtCore import QAbstractTableModel
++from PyQt5.QtCore import Qt, QVariant
+
+ class LocationsTableModel(QAbstractTableModel):
+ def __init__(self, locations, parent=None):
+@@ -47,4 +47,4 @@
+ return self.locations[index.row()]
+
+ def flags(self, index):
+- return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+\ No newline at end of file
++ return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+--- creepy.orig/creepy/models/ProjectTree.py
++++ creepy/creepy/models/ProjectTree.py
+@@ -1,10 +1,10 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtCore import QAbstractItemModel
+-from PyQt4.QtCore import QModelIndex
+-from PyQt4.QtCore import Qt
+-from PyQt4.QtGui import QIcon,QPixmap
+-from PyQt4.QtCore import QVariant
++from PyQt5.QtCore import QAbstractItemModel
++from PyQt5.QtCore import QModelIndex
++from PyQt5.QtCore import Qt
++from PyQt5.QtGui import QIcon,QPixmap
++from PyQt5.QtCore import QVariant
+ from components import creepy_resources_compiled
+
+ class ProjectTreeModel(QAbstractItemModel):
+--- creepy.orig/creepy/utilities/XStream.py
++++ creepy/creepy/utilities/XStream.py
+@@ -1,6 +1,6 @@
+ import logging
+ import sys
+-from PyQt4.QtCore import QObject,\
++from PyQt5.QtCore import QObject,\
+ pyqtSignal
+
+ class XStream(QObject):
+@@ -25,4 +25,4 @@
+ if ( not XStream._stderr ):
+ XStream._stderr = XStream()
+ sys.stderr = XStream._stderr
+- return XStream._stderr
+\ No newline at end of file
++ return XStream._stderr
+--- creepy.orig/creepy/plugins/flickr/flickr.py
++++ creepy/creepy/plugins/flickr/flickr.py
+@@ -7,9 +7,9 @@
+ import logging
+ import re
+ import os
+-from PyQt4.QtGui import QWizard, QWizardPage, QLabel, QLineEdit, QVBoxLayout,
QHBoxLayout
+-from PyQt4.QtCore import QUrl
+-from PyQt4.QtWebKit import QWebView
++from PyQt5.QtGui import QWizard, QWizardPage, QLabel, QLineEdit, QVBoxLayout,
QHBoxLayout
++from PyQt5.QtCore import QUrl
++from PyQt5.QtWebKit import QWebView
+ from flickrapi.exceptions import FlickrError
+ from utilities import GeneralUtilities, QtHandler
+ # set up logging
+--- creepy.orig/creepy/plugins/twitter/twitter.py
++++ creepy/creepy/plugins/twitter/twitter.py
+@@ -7,9 +7,9 @@
+ import os
+ import urllib
+ import pytz
+-from PyQt4.QtGui import QWizard, QWizardPage, QLabel, QLineEdit, QVBoxLayout,
QHBoxLayout, QMessageBox
+-from PyQt4.QtCore import QUrl, QString
+-from PyQt4.QtWebKit import QWebView
++from PyQt5.QtGui import QWizard, QWizardPage, QLabel, QLineEdit, QVBoxLayout,
QHBoxLayout, QMessageBox
++from PyQt5.QtCore import QUrl, QString
++from PyQt5.QtWebKit import QWebView
+ from tweepy import Cursor
+ from datetime import datetime
+ from dominate.tags import *
+--- creepy.orig/creepy/plugins/instagram/instagram.py
++++ creepy/creepy/plugins/instagram/instagram.py
+@@ -6,7 +6,7 @@
+ from urlparse import urlparse, parse_qs
+
+ import pytz
+-from PyQt4.QtGui import QLabel, QLineEdit, QWizard, QWizardPage, QVBoxLayout,
QMessageBox, QTextEdit, QPushButton
++from PyQt5.QtGui import QLabel, QLineEdit, QWizard, QWizardPage, QVBoxLayout,
QMessageBox, QTextEdit, QPushButton
+ from instagram.client import InstagramAPI
+ from models.InputPlugin import InputPlugin
+ from utilities import GeneralUtilities, QtHandler
+--- creepy.orig/creepy/plugins/googleplus/googleplus.py
++++ creepy/creepy/plugins/googleplus/googleplus.py
+@@ -8,9 +8,9 @@
+ import urllib
+ import httplib2
+ import dateutil.parser
+-from PyQt4.QtGui import QWizard, QWizardPage, QLabel, QLineEdit, QVBoxLayout,
QHBoxLayout, QMessageBox
+-from PyQt4.QtCore import QUrl
+-from PyQt4.QtWebKit import QWebView
++from PyQt5.QtGui import QWizard, QWizardPage, QLabel, QLineEdit, QVBoxLayout,
QHBoxLayout, QMessageBox
++from PyQt5.QtCore import QUrl
++from PyQt5.QtWebKit import QWebView
+ from utilities import GeneralUtilities, QtHandler
+ # set up logging
+ logger = logging.getLogger(__name__)
+@@ -220,4 +220,4 @@
+ return key
+ if key not in self.labels.keys():
+ return key
+- return self.labels[key]
+\ No newline at end of file
++ return self.labels[key]
+--- creepy.orig/creepy/components/FilterLocationsCustomDialog.py
++++ creepy/creepy/components/FilterLocationsCustomDialog.py
+@@ -1,10 +1,10 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtGui import QDialog
++from PyQt5.QtGui import QDialog
+ from ui.FilterLocationsCustomDialog import Ui_FilterLocationsCustomDialog
+ class FilterLocationsCustomDialog(QDialog):
+ def __init__(self, parent=None):
+ # Load the UI from the python file
+ QDialog.__init__(self, parent)
+ self.ui = Ui_FilterLocationsCustomDialog()
+- self.ui.setupUi(self)
+\ No newline at end of file
++ self.ui.setupUi(self)
+--- creepy.orig/creepy/components/PlaceProjectWizard.py
++++ creepy/creepy/components/PlaceProjectWizard.py
+@@ -1,9 +1,9 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ import os
+-from PyQt4.QtGui import QWizard, QMessageBox, QWidget, QScrollArea,
QLineEdit, QLabel, QVBoxLayout, QCheckBox, \
++from PyQt5.QtGui import QWizard, QMessageBox, QWidget, QScrollArea,
QLineEdit, QLabel, QVBoxLayout, QCheckBox, \
+ QGridLayout
+-from PyQt4.QtCore import QObject, pyqtSlot, QString
++from PyQt5.QtCore import QObject, pyqtSlot, QString
+ from models.PluginConfigurationListModel import PluginConfigurationListModel
+ from models.InputPlugin import InputPlugin
+ from yapsy.PluginManager import PluginManagerSingleton
+@@ -185,4 +185,4 @@
+
+ enabledPlugins.append(
+ {'pluginName': plugin_name, 'searchOptions': {'string':
string_options, 'boolean': boolean_options}})
+- return enabledPlugins
+\ No newline at end of file
++ return enabledPlugins
+--- creepy.orig/creepy/components/FilterLocationsDateDialog.py
++++ creepy/creepy/components/FilterLocationsDateDialog.py
+@@ -1,10 +1,10 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtGui import QDialog
++from PyQt5.QtGui import QDialog
+ from ui.FilterLocationsDateDialog import Ui_FilterLocationsDateDialog
+ class FilterLocationsDateDialog(QDialog):
+ def __init__(self, parent=None):
+ # Load the UI from the python file
+ QDialog.__init__(self, parent)
+ self.ui = Ui_FilterLocationsDateDialog()
+- self.ui.setupUi(self)
+\ No newline at end of file
++ self.ui.setupUi(self)
+--- creepy.orig/creepy/components/PluginConfigurationCheckDialog.py
++++ creepy/creepy/components/PluginConfigurationCheckDialog.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtGui import QDialog
+-from PyQt4.QtCore import Qt
++from PyQt5.QtGui import QDialog
++from PyQt5.QtCore import Qt
+ from ui.PluginConfigCheckdialog import Ui_checkPluginConfigurationDialog
+ class PluginConfigurationCheckdialog(QDialog):
+ """
+@@ -13,4 +13,4 @@
+ QDialog.__init__(self, parent)
+ self.ui = Ui_checkPluginConfigurationDialog()
+ self.ui.setupUi(self)
+- self.setAttribute(Qt.WA_DeleteOnClose)
+\ No newline at end of file
++ self.setAttribute(Qt.WA_DeleteOnClose)
+--- creepy.orig/creepy/components/UpdateCheckDialog.py
++++ creepy/creepy/components/UpdateCheckDialog.py
+@@ -1,9 +1,9 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtGui import QDialog
++from PyQt5.QtGui import QDialog
+ from ui.UpdateCheckDialog import Ui_UpdateCheckDialog
+ class UpdateCheckDialog(QDialog):
+ def __init__(self, parent=None):
+ QDialog.__init__(self, parent)
+ self.ui = Ui_UpdateCheckDialog()
+- self.ui.setupUi(self)
+\ No newline at end of file
++ self.ui.setupUi(self)
+--- creepy.orig/creepy/components/VerifyDeleteDialog.py
++++ creepy/creepy/components/VerifyDeleteDialog.py
+@@ -1,10 +1,10 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtGui import QDialog
++from PyQt5.QtGui import QDialog
+ from ui.VerifyDeleteDialog import Ui_verifyDeleteDialog
+ class VerifyDeleteDialog(QDialog):
+ def __init__(self, parent=None):
+ QDialog.__init__(self, parent)
+ self.ui = Ui_verifyDeleteDialog()
+ self.ui.setupUi(self)
+-
+\ No newline at end of file
++
+--- creepy.orig/creepy/components/FilterLocationsPointDialog.py
++++ creepy/creepy/components/FilterLocationsPointDialog.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtGui import QDialog
+-from PyQt4.QtCore import QObject, pyqtSlot
++from PyQt5.QtGui import QDialog
++from PyQt5.QtCore import QObject, pyqtSlot
+ from ui.FilterLocationsPointDialog import Ui_FilteLocationsPointDialog
+
+
+--- creepy.orig/creepy/components/PersonProjectWizard.py
++++ creepy/creepy/components/PersonProjectWizard.py
+@@ -1,9 +1,9 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ import os
+-from PyQt4.QtGui import QWizard, QMessageBox, QWidget, QScrollArea,
QLineEdit, QLabel, QVBoxLayout, QCheckBox, \
++from PyQt5.QtGui import QWizard, QMessageBox, QWidget, QScrollArea,
QLineEdit, QLabel, QVBoxLayout, QCheckBox, \
+ QGridLayout
+-from PyQt4.QtCore import QString
++from PyQt5.QtCore import QString
+ from models.PluginConfigurationListModel import PluginConfigurationListModel
+ from models.ProjectWizardPossibleTargetsTable import
ProjectWizardPossibleTargetsTable
+ from models.InputPlugin import InputPlugin
+@@ -227,4 +227,4 @@
+
+ enabledPlugins.append(
+ {'pluginName': plugin_name, 'searchOptions': {'string':
string_options, 'boolean': boolean_options}})
+- return enabledPlugins
+\ No newline at end of file
++ return enabledPlugins
+--- creepy.orig/creepy/components/PluginRatesCheckDialog.py
++++ creepy/creepy/components/PluginRatesCheckDialog.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtGui import QDialog
+-from PyQt4.QtCore import Qt
++from PyQt5.QtGui import QDialog
++from PyQt5.QtCore import Qt
+ from ui.PluginRatesCheckDialog import Ui_checkPluginRatesDialog
+ class PluginRatesCheckDialog(QDialog):
+ """
+--- creepy.orig/creepy/components/PluginsConfigurationDialog.py
++++ creepy/creepy/components/PluginsConfigurationDialog.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ import os
+-from PyQt4.QtGui import QDialog, QLabel, QLineEdit, QScrollArea, QCheckBox
++from PyQt5.QtGui import QDialog, QLabel, QLineEdit, QScrollArea, QCheckBox
+ from yapsy.PluginManager import PluginManagerSingleton
+ from models.InputPlugin import InputPlugin
+ from ui.PluginsConfig import Ui_PluginsConfigurationDialog
+@@ -76,4 +76,4 @@
+ config_options['boolean_options'] = boolean_options
+ plugin = self.PluginManager.getPluginByName(plugin_name,
'Input')
+ if plugin:
+- plugin.plugin_object.saveConfiguration(config_options)
+\ No newline at end of file
++ plugin.plugin_object.saveConfiguration(config_options)
+--- creepy.orig/creepy/components/AboutDialog.py
++++ creepy/creepy/components/AboutDialog.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/python
+ # -*- coding: utf-8 -*-
+-from PyQt4.QtGui import QDialog
++from PyQt5.QtGui import QDialog
+ from ui.AboutDialog import Ui_aboutDialog
+
+
+@@ -8,4 +8,4 @@
+ def __init__(self, parent=None):
+ QDialog.__init__(self, parent)
+ self.ui = Ui_aboutDialog()
+- self.ui.setupUi(self)
+\ No newline at end of file
++ self.ui.setupUi(self)
+--- creepy.orig/setup.py
++++ creepy/setup.py
+@@ -3,7 +3,7 @@
+
+ includes = ["sip",
+ "distutils",
+- "PyQt4.QtNetwork",
++ "PyQt5.QtNetwork",
+ "tweepy",
+ "flickrapi",
+ "instagram",
+@@ -42,4 +42,4 @@
+ windows=[{'script': "CreepyMain.py", 'icon_resource': [(1,
"include/creepy.ico")]}],
+ zipfile=None,
+ data_files=DATA,
+-)
+\ No newline at end of file
++)
diff --git a/debian/patches/series b/debian/patches/series
index 17abb9a..d872b7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
10-unused-configobj.patch
11-QT5gui.patch
12-QT5rcc.patch
+14-Qt5imports.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/creepy.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
