This is an automated email from the git hooks/post-receive script. ross-guest pushed a commit to branch master in repository creepy.
commit b3840159f4842b5cfa9a1ac602cbfe8517a5fa2c Author: Ross Gammon <rossgam...@mail.dk> Date: Sun Feb 15 23:35:42 2015 +0100 Drop patches that were applied upstream --- debian/patches/01-log-to-homedir.patch | 130 ------------------------ debian/patches/02-plugin-directory.patch | 166 ------------------------------- debian/patches/03-include-dir.patch | 57 ----------- debian/patches/series | 3 - 4 files changed, 356 deletions(-) diff --git a/debian/patches/01-log-to-homedir.patch b/debian/patches/01-log-to-homedir.patch deleted file mode 100644 index 16e48b2..0000000 --- a/debian/patches/01-log-to-homedir.patch +++ /dev/null @@ -1,130 +0,0 @@ -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-17 - ---- creepy.orig/creepy/CreepyMain.py -+++ creepy/creepy/CreepyMain.py -@@ -35,14 +35,14 @@ - # set up logging - logger = logging.getLogger(__name__) - logger.setLevel(logging.DEBUG) --fh = logging.FileHandler(os.path.join(os.getcwd(),'creepy_main.log')) -+fh = logging.FileHandler(os.path.join(GeneralUtilities.getLogDir(),'creepy_main.log')) - fh.setLevel(logging.DEBUG) - formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') - fh.setFormatter(formatter) - logger.addHandler(fh) - #Capture stderr and stdout to a file --sys.stdout = open(os.path.join(os.getcwd(),'creepy_stdout.log'), 'w') --sys.stderr = open(os.path.join(os.getcwd(),'creepy_stderr.log'), 'w') -+sys.stdout = open(os.path.join(GeneralUtilities.getLogDir(),'creepy_stdout.log'), 'w') -+sys.stderr = open(os.path.join(GeneralUtilities.getLogDir(),'creepy_stderr.log'), 'w') - try: - _fromUtf8 = QString.fromUtf8 - except AttributeError: ---- creepy.orig/creepy/models/InputPlugin.py -+++ creepy/creepy/models/InputPlugin.py -@@ -9,7 +9,7 @@ - #set up logging - logger = logging.getLogger(__name__) - logger.setLevel(logging.DEBUG) --fh = logging.FileHandler(os.path.join(GeneralUtilities.getUserHome(),'creepy_main.log')) -+fh = logging.FileHandler(os.path.join(GeneralUtilities.getLogDir(),'creepy_main.log')) - fh.setLevel(logging.DEBUG) - formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') - fh.setFormatter(formatter) ---- creepy.orig/creepy/models/Project.py -+++ creepy/creepy/models/Project.py -@@ -7,7 +7,7 @@ - # set up logging - logger = logging.getLogger(__name__) - logger.setLevel(logging.DEBUG) --fh = logging.FileHandler(os.path.join(GeneralUtilities.getUserHome(),'creepy_main.log')) -+fh = logging.FileHandler(os.path.join(GeneralUtilities.getLogDir(),'creepy_main.log')) - fh.setLevel(logging.DEBUG) - formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') - fh.setFormatter(formatter) ---- creepy.orig/creepy/plugins/flickr/flickr.py -+++ creepy/creepy/plugins/flickr/flickr.py -@@ -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) --fh = logging.FileHandler(os.path.join(os.getcwdu(),'creepy_main.log')) -+fh = logging.FileHandler(os.path.join(GeneralUtilities.getLogDir(),'creepy_main.log')) - fh.setLevel(logging.DEBUG) - formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') - fh.setFormatter(formatter) ---- creepy.orig/creepy/plugins/instagram/instagram.py -+++ creepy/creepy/plugins/instagram/instagram.py -@@ -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) --fh = logging.FileHandler(os.path.join(os.getcwdu(),'creepy_main.log')) -+fh = logging.FileHandler(os.path.join(GeneralUtilities.getLogDir(),'creepy_main.log')) - fh.setLevel(logging.DEBUG) - formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') - fh.setFormatter(formatter) ---- creepy.orig/creepy/plugins/twitter/twitter.py -+++ creepy/creepy/plugins/twitter/twitter.py -@@ -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) --fh = logging.FileHandler(os.path.join(os.getcwd(),'creepy_main.log')) -+fh = logging.FileHandler(os.path.join(GeneralUtilities.getLogDir(),'creepy_main.log')) - fh.setLevel(logging.DEBUG) - formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') - fh.setFormatter(formatter) ---- creepy.orig/creepy/utilities/GeneralUtilities.py -+++ creepy/creepy/utilities/GeneralUtilities.py -@@ -1,6 +1,8 @@ - #!/usr/bin/python - # -*- coding: utf-8 -*- - from os.path import expanduser -+import os -+import errno - import webbrowser - from math import radians, cos, sin, asin, sqrt - -@@ -8,6 +10,14 @@ - def getUserHome(): - return expanduser("~") - -+def getLogDir(): -+ logdir = expanduser("~/.creepy") -+ try: os.makedirs(logdir) -+ except OSError as e: -+ if e.errno == errno.EEXIST and os.path.isdir(logdir): pass -+ else: raise -+ return logdir -+ - def reportProblem(): - webbrowser.open_new_tab('https://github.com/ilektrojohn/creepy/issues') - diff --git a/debian/patches/02-plugin-directory.patch b/debian/patches/02-plugin-directory.patch deleted file mode 100644 index 6914192..0000000 --- a/debian/patches/02-plugin-directory.patch +++ /dev/null @@ -1,166 +0,0 @@ -Description: Make sure plugins are found in /usr/share/creepy/plugins/ - Look for plugins in /usr/share/creepy/plugins/ as well as - the original directory $CWD/plugins/. -Author: Petter Reinholdtsen <p...@hungry.com> -Forwarded: no -Reviewed-By: Petter Reinholdtsen <p...@hungry.com> -Last-Update: 2014-11-17 - ---- creepy.orig/creepy/CreepyMain.py -+++ creepy/creepy/CreepyMain.py -@@ -58,7 +58,7 @@ - def run(self): - pluginManager = PluginManagerSingleton.get() - pluginManager.setCategoriesFilter({ 'Input': InputPlugin}) -- pluginManager.setPluginPlaces([os.path.join(os.getcwd(), 'plugins')]) -+ pluginManager.setPluginPlaces(GeneralUtilities.getPluginDirs()) - pluginManager.locatePlugins() - pluginManager.loadPlugins() - locationsList = [] ---- creepy.orig/creepy/utilities/GeneralUtilities.py -+++ creepy/creepy/utilities/GeneralUtilities.py -@@ -21,6 +21,9 @@ - def reportProblem(): - webbrowser.open_new_tab('https://github.com/ilektrojohn/creepy/issues') - -+def getPluginDirs(): -+ return ["/usr/share/creepy/plugins", os.path.join(os.getcwd(), 'plugins')] -+ - def calcDistance(lat1, lng1, lat2, lng2): - """ - Calculate the great circle distance between two points ---- creepy.orig/creepy/components/PluginsConfigurationDialog.py -+++ creepy/creepy/components/PluginsConfigurationDialog.py -@@ -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}) -- self.PluginManager.setPluginPlaces([os.path.join(os.getcwdu(), 'plugins')]) -+ self.PluginManager.setPluginPlaces(GeneralUtilities.getPluginDirs()) - self.PluginManager.locatePlugins() - self.PluginManager.loadPlugins() - ---- creepy.orig/creepy/components/PersonProjectWizard.py -+++ creepy/creepy/components/PersonProjectWizard.py -@@ -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}) -- self.PluginManager.setPluginPlaces([os.path.join(os.getcwdu(), 'plugins')]) -+ self.PluginManager.setPluginPlaces(GeneralUtilities.getPluginDirs()) - self.PluginManager.locatePlugins() - self.PluginManager.loadPlugins() - pluginList = sorted(self.PluginManager.getAllPlugins(), key=lambda x: x.name) ---- creepy.orig/creepy/models/InputPlugin.py -+++ creepy/creepy/models/InputPlugin.py -@@ -39,17 +39,21 @@ - - def returnPersonalInformation(self, search_params): - pass -- def getConfigObj(self): -- config_filename = self.name+".conf" -- config_file = os.path.join(os.getcwdu(),'plugins', self.name, config_filename) -+ -+ def getPluginDir(self): -+ """FIXME Figure out way to always set it to the directory where the plugin code was found""" -+ return os.path.join('/usr/share/creepy/plugins', self.name) -+ -+ def getConfigObj(self, config_filename = None): -+ if config_filename is None: -+ config_filename = self.name+".conf" -+ config_file = os.path.join(self.getPluginDir(), config_filename) - config = ConfigObj(infile=config_file) - config.create_empty=False -- -+ return config -+ - def readConfiguration(self, category): -- config_filename = self.name+'.conf' -- config_file = os.path.join(os.getcwdu(),'plugins', self.name, config_filename) -- config = ConfigObj(infile=config_file) -- config.create_empty=False -+ config = self.getConfigObj() - try: - options = config[category] - except Exception,err: -@@ -59,10 +63,7 @@ - return config,options - - def saveConfiguration(self, new_config): -- config_filename = self.name+'.conf' -- config_file = os.path.join(os.getcwdu(),'plugins',self.name, config_filename) -- config = ConfigObj(infile=config_file) -- config.create_empty=False -+ config = self.getConfigObj() - try: - config['string_options'] = new_config['string_options'] - config['boolean_options'] = new_config['boolean_options'] -@@ -72,10 +73,7 @@ - logger.exception(err) - - def loadSearchConfigurationParameters(self): -- config_filename = self.name+'.conf' -- config_file = os.path.join(os.getcwdu(), 'plugins', self.name, config_filename) -- config = ConfigObj(infile=config_file) -- config.create_empty = False -+ config = self.getConfigObj() - try: - params = config['search_options'] - except Exception, err: ---- creepy.orig/creepy/plugins/flickr/flickr.py -+++ creepy/creepy/plugins/flickr/flickr.py -@@ -25,10 +25,7 @@ - - def __init__(self): - #Try and read the labels file -- labels_filename = self.name+".labels" -- labels_file = os.path.join(os.getcwdu(),'plugins', self.name, labels_filename) -- labels_config = ConfigObj(infile=labels_file) -- labels_config.create_empty=False -+ labels_config = self.getConfigObj(self.name+".labels") - try: - logger.debug("Trying to load the labels file for the "+self.name+" plugin .") - self.labels = labels_config['labels'] ---- creepy.orig/creepy/plugins/instagram/instagram.py -+++ creepy/creepy/plugins/instagram/instagram.py -@@ -25,10 +25,7 @@ - - def __init__(self): - #Try and read the labels file -- labels_filename = self.name+".labels" -- labels_file = os.path.join(os.getcwdu(),'plugins', self.name, labels_filename) -- labels_config = ConfigObj(infile=labels_file) -- labels_config.create_empty=False -+ labels_config = self.getConfigObj(self.name+".labels") - try: - logger.debug("Trying to load the labels file for the "+self.name+" plugin .") - self.labels = labels_config['labels'] ---- creepy.orig/creepy/plugins/twitter/twitter.py -+++ creepy/creepy/plugins/twitter/twitter.py -@@ -27,10 +27,7 @@ - - def __init__(self): - #Try and read the labels file -- labels_filename = self.name+".labels" -- labels_file = os.path.join(os.getcwd(),'plugins', self.name, labels_filename) -- labels_config = ConfigObj(infile=labels_file) -- labels_config.create_empty=False -+ labels_config = self.getConfigObj(self.name+".labels") - try: - logger.debug("Trying to load the labels file for the "+self.name+" plugin .") - self.labels = labels_config['labels'] diff --git a/debian/patches/03-include-dir.patch b/debian/patches/03-include-dir.patch deleted file mode 100644 index 8084a54..0000000 --- a/debian/patches/03-include-dir.patch +++ /dev/null @@ -1,57 +0,0 @@ -Description: Use correct path to include directory -Author: Petter Reinholdtsen <p...@hungry.com> -Forwarded: no -Reviewed-By: Petter Reinholdtsen <p...@hungry.com> -Last-Update: 2014-11-17 - ---- creepy.orig/creepy/CreepyMain.py -+++ creepy/creepy/CreepyMain.py -@@ -102,7 +102,7 @@ - self.projectsList = [] - self.currentProject = None - self.ui.webPage = QWebPage() -- self.ui.webPage.mainFrame().setUrl(QUrl(os.path.join(os.getcwd(), 'include', 'map.html'))) -+ self.ui.webPage.mainFrame().setUrl(QUrl(os.path.join(GeneralUtilities.getIncludeDir(), 'map.html'))) - self.ui.mapWebView.setPage(self.ui.webPage) - self.ui.menuView.addAction(self.ui.dockWProjects.toggleViewAction()) - self.ui.menuView.addAction(self.ui.dockWLocationsList.toggleViewAction()) -@@ -165,7 +165,7 @@ - filterLocationsPointDialog.ui.mapPage = QWebPage() - myPyObj = filterLocationsPointDialog.pyObj() - filterLocationsPointDialog.ui.mapPage.mainFrame().addToJavaScriptWindowObject('myPyObj', myPyObj) -- filterLocationsPointDialog.ui.mapPage.mainFrame().setUrl(QUrl(os.path.join(os.getcwd(), 'include', 'mapSetPoint.html'))) -+ filterLocationsPointDialog.ui.mapPage.mainFrame().setUrl(QUrl(os.path.join(GeneralUtilities.getIncludeDir(), 'mapSetPoint.html'))) - filterLocationsPointDialog.ui.radiusUnitComboBox.insertItem(0, QString('km')) - filterLocationsPointDialog.ui.radiusUnitComboBox.insertItem(1, QString('m')) - filterLocationsPointDialog.ui.radiusUnitComboBox.activated[str].connect(filterLocationsPointDialog.onUnitChanged) ---- creepy.orig/creepy/utilities/GeneralUtilities.py -+++ creepy/creepy/utilities/GeneralUtilities.py -@@ -7,6 +7,9 @@ - from math import radians, cos, sin, asin, sqrt - - -+def getIncludeDir(): -+ return "/usr/share/creepy/include" -+ - def getUserHome(): - return expanduser("~") - ---- creepy.orig/creepy/models/ProjectWizardPluginListModel.py -+++ creepy/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 +25,7 @@ - pixmap = QPixmap(picturePath) - return QIcon(pixmap.scaled(30, 30, Qt.IgnoreAspectRatio, Qt.FastTransformation)) - else: -- pixmap = QPixmap(os.path.join(os.getcwdu(), 'include', 'generic_plugin.png')) -+ pixmap = QPixmap(os.path.join(GeneralUtilities.getIncludeDir(), 'generic_plugin.png')) - pixmap.scaled(30, 30, Qt.IgnoreAspectRatio) - return QIcon(pixmap) - if role == Qt.CheckStateRole: diff --git a/debian/patches/series b/debian/patches/series index 56b8e11..ff7c69b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ -01-log-to-homedir.patch -02-plugin-directory.patch -03-include-dir.patch 04-local-config.patch 05-project-dir.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