This is an automated email from the git hooks/post-receive script. pere pushed a commit to branch master in repository creepy.
commit 243aa6c88f3713716e2683bedd9a9f06850bc866 Author: Petter Reinholdtsen <p...@hungry.com> Date: Mon Nov 17 21:37:51 2014 +0100 Correct patches to get plugin loading working. --- debian/patches/01-log-to-homedir.patch | 96 ++++++++++++++++++++------------ debian/patches/02-plugin-directory.patch | 45 ++++++++------- 2 files changed, 86 insertions(+), 55 deletions(-) diff --git a/debian/patches/01-log-to-homedir.patch b/debian/patches/01-log-to-homedir.patch index b7f0af1..948ccda 100644 --- a/debian/patches/01-log-to-homedir.patch +++ b/debian/patches/01-log-to-homedir.patch @@ -1,13 +1,13 @@ Description: Log to created ~/.creepy/ directory, not /usr/share/ Author: Petter Reinholdtsen <p...@hungry.com> Reviewed-By: Petter Reinholdtsen <p...@hungry.com> -Last-Update: 2014-11-16 +Last-Update: 2014-11-17 -diff --git a/creepy/CreepyMain.py b/creepy/CreepyMain.py -index 63121e7..11ad4cc 100644 ---- a/creepy/CreepyMain.py -+++ b/creepy/CreepyMain.py -@@ -35,14 +35,14 @@ from utilities import GeneralUtilities +Index: creepy/creepy/CreepyMain.py +=================================================================== +--- creepy.orig/creepy/CreepyMain.py 2014-11-17 20:47:18.420285745 +0100 ++++ creepy/creepy/CreepyMain.py 2014-11-17 20:47:18.408285748 +0100 +@@ -35,14 +35,14 @@ # set up logging logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) @@ -25,11 +25,11 @@ index 63121e7..11ad4cc 100644 try: _fromUtf8 = QString.fromUtf8 except AttributeError: -diff --git a/creepy/models/InputPlugin.py b/creepy/models/InputPlugin.py -index 99cd990..0e1badf 100644 ---- a/creepy/models/InputPlugin.py -+++ b/creepy/models/InputPlugin.py -@@ -9,7 +9,7 @@ from utilities import GeneralUtilities +Index: creepy/creepy/models/InputPlugin.py +=================================================================== +--- creepy.orig/creepy/models/InputPlugin.py 2014-11-17 20:47:18.420285745 +0100 ++++ creepy/creepy/models/InputPlugin.py 2014-11-17 20:47:18.408285748 +0100 +@@ -9,7 +9,7 @@ #set up logging logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) @@ -38,11 +38,11 @@ index 99cd990..0e1badf 100644 fh.setLevel(logging.DEBUG) formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) -diff --git a/creepy/models/Project.py b/creepy/models/Project.py -index 7305777..2b6bf26 100644 ---- a/creepy/models/Project.py -+++ b/creepy/models/Project.py -@@ -7,7 +7,7 @@ from utilities import GeneralUtilities +Index: creepy/creepy/models/Project.py +=================================================================== +--- creepy.orig/creepy/models/Project.py 2014-11-17 20:47:18.420285745 +0100 ++++ creepy/creepy/models/Project.py 2014-11-17 20:47:18.408285748 +0100 +@@ -7,7 +7,7 @@ # set up logging logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) @@ -51,11 +51,19 @@ index 7305777..2b6bf26 100644 fh.setLevel(logging.DEBUG) formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) -diff --git a/creepy/plugins/flickr/flickr.py b/creepy/plugins/flickr/flickr.py -index 252391d..287e4c5 100644 ---- a/creepy/plugins/flickr/flickr.py -+++ b/creepy/plugins/flickr/flickr.py -@@ -11,7 +11,7 @@ from flickrapi.exceptions import FlickrError +Index: creepy/creepy/plugins/flickr/flickr.py +=================================================================== +--- creepy.orig/creepy/plugins/flickr/flickr.py 2014-11-17 20:47:18.420285745 +0100 ++++ creepy/creepy/plugins/flickr/flickr.py 2014-11-17 20:47:49.104279309 +0100 +@@ -1,6 +1,7 @@ + #!/usr/bin/python + # -*- coding: utf-8 -*- + from models.InputPlugin import InputPlugin ++from utilities import GeneralUtilities + import flickrapi + import datetime + import logging +@@ -11,7 +12,7 @@ #set up logging logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) @@ -64,11 +72,19 @@ index 252391d..287e4c5 100644 fh.setLevel(logging.DEBUG) formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) -diff --git a/creepy/plugins/instagram/instagram.py b/creepy/plugins/instagram/instagram.py -index 673ae42..a623de0 100644 ---- a/creepy/plugins/instagram/instagram.py -+++ b/creepy/plugins/instagram/instagram.py -@@ -11,7 +11,7 @@ from configobj import ConfigObj +Index: creepy/creepy/plugins/instagram/instagram.py +=================================================================== +--- creepy.orig/creepy/plugins/instagram/instagram.py 2014-11-17 20:47:18.420285745 +0100 ++++ creepy/creepy/plugins/instagram/instagram.py 2014-11-17 20:48:03.040276528 +0100 +@@ -1,6 +1,7 @@ + #!/usr/bin/python + # -*- coding: utf-8 -*- + from models.InputPlugin import InputPlugin ++from utilities import GeneralUtilities + import os + from PyQt4.QtGui import QLabel, QLineEdit, QWizard, QWizardPage, QVBoxLayout, QTextEdit, QMessageBox + from instagram.client import InstagramAPI +@@ -11,7 +12,7 @@ #set up logging logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) @@ -77,11 +93,19 @@ index 673ae42..a623de0 100644 fh.setLevel(logging.DEBUG) formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) -diff --git a/creepy/plugins/twitter/twitter.py b/creepy/plugins/twitter/twitter.py -index 4cea3da..b4cd9b6 100644 ---- a/creepy/plugins/twitter/twitter.py -+++ b/creepy/plugins/twitter/twitter.py -@@ -14,7 +14,7 @@ from configobj import ConfigObj +Index: creepy/creepy/plugins/twitter/twitter.py +=================================================================== +--- creepy.orig/creepy/plugins/twitter/twitter.py 2014-11-17 20:47:18.420285745 +0100 ++++ creepy/creepy/plugins/twitter/twitter.py 2014-11-17 20:47:38.632280824 +0100 +@@ -1,6 +1,7 @@ + #!/usr/bin/python + # -*- coding: utf-8 -*- + from models.InputPlugin import InputPlugin ++from utilities import GeneralUtilities + import tweepy + import logging + import os +@@ -14,7 +15,7 @@ #set up logging logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) @@ -90,10 +114,10 @@ index 4cea3da..b4cd9b6 100644 fh.setLevel(logging.DEBUG) formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) -diff --git a/creepy/utilities/GeneralUtilities.py b/creepy/utilities/GeneralUtilities.py -index 5244232..0221507 100644 ---- a/creepy/utilities/GeneralUtilities.py -+++ b/creepy/utilities/GeneralUtilities.py +Index: creepy/creepy/utilities/GeneralUtilities.py +=================================================================== +--- creepy.orig/creepy/utilities/GeneralUtilities.py 2014-11-17 20:47:18.420285745 +0100 ++++ creepy/creepy/utilities/GeneralUtilities.py 2014-11-17 20:47:18.408285748 +0100 @@ -1,6 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 -*- @@ -103,7 +127,7 @@ index 5244232..0221507 100644 import webbrowser from math import radians, cos, sin, asin, sqrt -@@ -8,6 +10,14 @@ from math import radians, cos, sin, asin, sqrt +@@ -8,6 +10,14 @@ def getUserHome(): return expanduser("~") diff --git a/debian/patches/02-plugin-directory.patch b/debian/patches/02-plugin-directory.patch index 32da116..c560aaa 100644 --- a/debian/patches/02-plugin-directory.patch +++ b/debian/patches/02-plugin-directory.patch @@ -4,12 +4,12 @@ Description: Make sure plugins are found in /usr/share/creepy/plugins/ Author: Petter Reinholdtsen <p...@hungry.com> Forwarded: no Reviewed-By: Petter Reinholdtsen <p...@hungry.com> -Last-Update: 2014-11-16 +Last-Update: 2014-11-17 Index: creepy/creepy/CreepyMain.py =================================================================== ---- creepy.orig/creepy/CreepyMain.py 2014-11-16 23:41:54.717658874 +0100 -+++ creepy/creepy/CreepyMain.py 2014-11-16 23:46:40.944542917 +0100 +--- creepy.orig/creepy/CreepyMain.py 2014-11-17 20:43:25.128336142 +0100 ++++ creepy/creepy/CreepyMain.py 2014-11-17 20:43:25.116336144 +0100 @@ -58,7 +58,7 @@ def run(self): pluginManager = PluginManagerSingleton.get() @@ -21,8 +21,8 @@ Index: creepy/creepy/CreepyMain.py locationsList = [] Index: creepy/creepy/utilities/GeneralUtilities.py =================================================================== ---- creepy.orig/creepy/utilities/GeneralUtilities.py 2014-11-16 23:41:54.721658923 +0100 -+++ creepy/creepy/utilities/GeneralUtilities.py 2014-11-16 23:46:40.944542917 +0100 +--- creepy.orig/creepy/utilities/GeneralUtilities.py 2014-11-17 20:43:25.128336142 +0100 ++++ creepy/creepy/utilities/GeneralUtilities.py 2014-11-17 20:43:25.116336144 +0100 @@ -21,6 +21,9 @@ def reportProblem(): webbrowser.open_new_tab('https://github.com/ilektrojohn/creepy/issues') @@ -35,9 +35,16 @@ Index: creepy/creepy/utilities/GeneralUtilities.py Calculate the great circle distance between two points Index: creepy/creepy/components/PluginsConfigurationDialog.py =================================================================== ---- creepy.orig/creepy/components/PluginsConfigurationDialog.py 2014-11-16 23:28:14.148459890 +0100 -+++ creepy/creepy/components/PluginsConfigurationDialog.py 2014-11-16 23:41:54.737659090 +0100 -@@ -12,7 +12,7 @@ +--- creepy.orig/creepy/components/PluginsConfigurationDialog.py 2014-11-17 20:43:25.128336142 +0100 ++++ creepy/creepy/components/PluginsConfigurationDialog.py 2014-11-17 20:43:25.116336144 +0100 +@@ -6,13 +6,14 @@ + from models.InputPlugin import InputPlugin + from ui.PluginsConfig import Ui_PluginsConfigurationDialog + from components.PluginConfigurationCheckDialog import PluginConfigurationCheckdialog ++from utilities import GeneralUtilities + class PluginsConfigurationDialog(QDialog): + def __init__(self, parent=None): + # Load the installed plugins and read their metadata self.PluginManager = PluginManagerSingleton.get() self.PluginManager.setCategoriesFilter({'Input': InputPlugin}) @@ -48,8 +55,8 @@ Index: creepy/creepy/components/PluginsConfigurationDialog.py Index: creepy/creepy/components/PersonProjectWizard.py =================================================================== ---- creepy.orig/creepy/components/PersonProjectWizard.py 2014-11-16 23:28:14.148459890 +0100 -+++ creepy/creepy/components/PersonProjectWizard.py 2014-11-16 23:41:54.737659090 +0100 +--- creepy.orig/creepy/components/PersonProjectWizard.py 2014-11-17 20:43:25.128336142 +0100 ++++ creepy/creepy/components/PersonProjectWizard.py 2014-11-17 20:43:25.116336144 +0100 @@ -102,7 +102,7 @@ ''' self.PluginManager = PluginManagerSingleton.get() @@ -61,8 +68,8 @@ Index: creepy/creepy/components/PersonProjectWizard.py pluginList = sorted(self.PluginManager.getAllPlugins(), key=lambda x: x.name) Index: creepy/creepy/models/InputPlugin.py =================================================================== ---- creepy.orig/creepy/models/InputPlugin.py 2014-11-16 23:41:54.717658874 +0100 -+++ creepy/creepy/models/InputPlugin.py 2014-11-16 23:48:10.809427974 +0100 +--- creepy.orig/creepy/models/InputPlugin.py 2014-11-17 20:43:25.128336142 +0100 ++++ creepy/creepy/models/InputPlugin.py 2014-11-17 20:43:25.116336144 +0100 @@ -39,17 +39,21 @@ def returnPersonalInformation(self, search_params): @@ -119,9 +126,9 @@ Index: creepy/creepy/models/InputPlugin.py except Exception, err: Index: creepy/creepy/plugins/flickr/flickr.py =================================================================== ---- creepy.orig/creepy/plugins/flickr/flickr.py 2014-11-16 23:41:54.717658874 +0100 -+++ creepy/creepy/plugins/flickr/flickr.py 2014-11-16 23:41:54.737659090 +0100 -@@ -24,10 +24,7 @@ +--- creepy.orig/creepy/plugins/flickr/flickr.py 2014-11-17 20:43:25.128336142 +0100 ++++ creepy/creepy/plugins/flickr/flickr.py 2014-11-17 20:44:12.392330140 +0100 +@@ -24,10 +25,7 @@ def __init__(self): #Try and read the labels file @@ -135,8 +142,8 @@ Index: creepy/creepy/plugins/flickr/flickr.py self.labels = labels_config['labels'] Index: creepy/creepy/plugins/instagram/instagram.py =================================================================== ---- creepy.orig/creepy/plugins/instagram/instagram.py 2014-11-16 23:41:54.717658874 +0100 -+++ creepy/creepy/plugins/instagram/instagram.py 2014-11-16 23:41:54.737659090 +0100 +--- creepy.orig/creepy/plugins/instagram/instagram.py 2014-11-17 20:43:25.128336142 +0100 ++++ creepy/creepy/plugins/instagram/instagram.py 2014-11-17 20:43:25.116336144 +0100 @@ -24,10 +24,7 @@ def __init__(self): @@ -151,8 +158,8 @@ Index: creepy/creepy/plugins/instagram/instagram.py self.labels = labels_config['labels'] Index: creepy/creepy/plugins/twitter/twitter.py =================================================================== ---- creepy.orig/creepy/plugins/twitter/twitter.py 2014-11-16 23:41:54.717658874 +0100 -+++ creepy/creepy/plugins/twitter/twitter.py 2014-11-16 23:41:54.737659090 +0100 +--- creepy.orig/creepy/plugins/twitter/twitter.py 2014-11-17 20:43:25.128336142 +0100 ++++ creepy/creepy/plugins/twitter/twitter.py 2014-11-17 20:43:25.116336144 +0100 @@ -26,10 +26,7 @@ def __init__(self): -- 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