This is an automated email from the git hooks/post-receive script. pere pushed a commit to branch master in repository creepy.
commit cf949ad81961064331c84b6d8c201448f1599411 Author: Petter Reinholdtsen <[email protected]> Date: Mon Nov 17 22:58:06 2014 +0100 Fix patches further to get new project button limping along. --- debian/patches/02-plugin-directory.patch | 48 +++++++++++++++++++------------- debian/patches/03-include-dir.patch | 10 ++++++- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/debian/patches/02-plugin-directory.patch b/debian/patches/02-plugin-directory.patch index c560aaa..9fb3df9 100644 --- a/debian/patches/02-plugin-directory.patch +++ b/debian/patches/02-plugin-directory.patch @@ -8,8 +8,8 @@ Last-Update: 2014-11-17 Index: creepy/creepy/CreepyMain.py =================================================================== ---- 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 +--- creepy.orig/creepy/CreepyMain.py 2014-11-17 22:44:37.402337163 +0100 ++++ creepy/creepy/CreepyMain.py 2014-11-17 22:44:37.390337161 +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-17 20:43:25.128336142 +0100 -+++ creepy/creepy/utilities/GeneralUtilities.py 2014-11-17 20:43:25.116336144 +0100 +--- creepy.orig/creepy/utilities/GeneralUtilities.py 2014-11-17 22:44:37.402337163 +0100 ++++ creepy/creepy/utilities/GeneralUtilities.py 2014-11-17 22:44:37.390337161 +0100 @@ -21,6 +21,9 @@ def reportProblem(): webbrowser.open_new_tab('https://github.com/ilektrojohn/creepy/issues') @@ -35,8 +35,8 @@ 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-17 20:43:25.128336142 +0100 -+++ creepy/creepy/components/PluginsConfigurationDialog.py 2014-11-17 20:43:25.116336144 +0100 +--- creepy.orig/creepy/components/PluginsConfigurationDialog.py 2014-11-17 22:44:37.402337163 +0100 ++++ creepy/creepy/components/PluginsConfigurationDialog.py 2014-11-17 22:44:37.390337161 +0100 @@ -6,13 +6,14 @@ from models.InputPlugin import InputPlugin from ui.PluginsConfig import Ui_PluginsConfigurationDialog @@ -55,9 +55,17 @@ Index: creepy/creepy/components/PluginsConfigurationDialog.py Index: creepy/creepy/components/PersonProjectWizard.py =================================================================== ---- 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 @@ +--- creepy.orig/creepy/components/PersonProjectWizard.py 2014-11-17 22:44:37.402337163 +0100 ++++ creepy/creepy/components/PersonProjectWizard.py 2014-11-17 22:45:06.818342867 +0100 +@@ -6,6 +6,7 @@ + from models.PluginConfigurationListModel import PluginConfigurationListModel + from models.ProjectWizardPossibleTargetsTable import ProjectWizardPossibleTargetsTable + from models.InputPlugin import InputPlugin ++from utilities import GeneralUtilities + from yapsy.PluginManager import PluginManagerSingleton + from ui.PersonProjectWizard import Ui_personProjectWizard + +@@ -102,7 +103,7 @@ ''' self.PluginManager = PluginManagerSingleton.get() self.PluginManager.setCategoriesFilter({ 'Input': InputPlugin}) @@ -68,8 +76,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-17 20:43:25.128336142 +0100 -+++ creepy/creepy/models/InputPlugin.py 2014-11-17 20:43:25.116336144 +0100 +--- creepy.orig/creepy/models/InputPlugin.py 2014-11-17 22:44:37.402337163 +0100 ++++ creepy/creepy/models/InputPlugin.py 2014-11-17 22:44:37.390337161 +0100 @@ -39,17 +39,21 @@ def returnPersonalInformation(self, search_params): @@ -126,9 +134,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-17 20:43:25.128336142 +0100 -+++ creepy/creepy/plugins/flickr/flickr.py 2014-11-17 20:44:12.392330140 +0100 -@@ -24,10 +25,7 @@ +--- creepy.orig/creepy/plugins/flickr/flickr.py 2014-11-17 22:44:37.402337163 +0100 ++++ creepy/creepy/plugins/flickr/flickr.py 2014-11-17 22:44:37.390337161 +0100 +@@ -25,10 +25,7 @@ def __init__(self): #Try and read the labels file @@ -142,9 +150,9 @@ 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-17 20:43:25.128336142 +0100 -+++ creepy/creepy/plugins/instagram/instagram.py 2014-11-17 20:43:25.116336144 +0100 -@@ -24,10 +24,7 @@ +--- creepy.orig/creepy/plugins/instagram/instagram.py 2014-11-17 22:44:37.402337163 +0100 ++++ creepy/creepy/plugins/instagram/instagram.py 2014-11-17 22:44:37.390337161 +0100 +@@ -25,10 +25,7 @@ def __init__(self): #Try and read the labels file @@ -158,9 +166,9 @@ 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-17 20:43:25.128336142 +0100 -+++ creepy/creepy/plugins/twitter/twitter.py 2014-11-17 20:43:25.116336144 +0100 -@@ -26,10 +26,7 @@ +--- creepy.orig/creepy/plugins/twitter/twitter.py 2014-11-17 22:44:37.402337163 +0100 ++++ creepy/creepy/plugins/twitter/twitter.py 2014-11-17 22:44:37.390337161 +0100 +@@ -27,10 +27,7 @@ def __init__(self): #Try and read the labels file diff --git a/debian/patches/03-include-dir.patch b/debian/patches/03-include-dir.patch index e9e548b..84c3e2b 100644 --- a/debian/patches/03-include-dir.patch +++ b/debian/patches/03-include-dir.patch @@ -2,7 +2,7 @@ Description: Use correct path to include directory Author: Petter Reinholdtsen <[email protected]> Forwarded: no Reviewed-By: Petter Reinholdtsen <[email protected]> -Last-Update: 2014-11-16 +Last-Update: 2014-11-17 --- creepy-1.2~alpha.orig/creepy/CreepyMain.py +++ creepy-1.2~alpha/creepy/CreepyMain.py @@ -38,6 +38,14 @@ Last-Update: 2014-11-16 --- creepy-1.2~alpha.orig/creepy/models/ProjectWizardPluginListModel.py +++ creepy-1.2~alpha/creepy/models/ProjectWizardPluginListModel.py +@@ -3,6 +3,7 @@ + from PyQt4.QtCore import QVariant, QAbstractListModel, Qt + from PyQt4.Qt import QPixmap, QFileSystemModel, QIcon + import os ++from utilities import GeneralUtilities + + class ProjectWizardPluginListModel(QAbstractListModel): + def __init__(self, plugins, parent=None): @@ -24,7 +24,7 @@ class ProjectWizardPluginListModel(QAbst pixmap = QPixmap(picturePath) return QIcon(pixmap.scaled(30, 30, Qt.IgnoreAspectRatio, Qt.FastTransformation)) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/creepy.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
