This is an automated email from the git hooks/post-receive script. pere pushed a commit to branch master in repository creepy.
commit 18cd7ae77a7f68c6c261071194a7f89fc81142a7 Author: Petter Reinholdtsen <pere@thinkpadx300> Date: Sun Jan 3 01:04:23 2016 +0100 New upstream release 1.4.1. Refresh patches. --- debian/changelog | 7 ++++ debian/patches/04-local-config.patch | 18 +++++------ debian/patches/05-project-dir.patch | 62 ++++++++++++++++++------------------ 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index cfdd55c..746e274 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +creepy (1.4.1-1) UNRELEASED; urgency=medium + + * New upstream release 1.4.1. + - Refresh 04-local-config.patch and 05-project-dir.patch. + + -- Petter Reinholdtsen <p...@debian.org> Sun, 03 Jan 2016 00:49:49 +0100 + creepy (1.3-1) unstable; urgency=low [ Ross Gammon ] diff --git a/debian/patches/04-local-config.patch b/debian/patches/04-local-config.patch index 19df8f6..6f592e9 100644 --- a/debian/patches/04-local-config.patch +++ b/debian/patches/04-local-config.patch @@ -13,9 +13,9 @@ Last-Update: 2015-06-21 Index: creepy-git/creepy/models/InputPlugin.py =================================================================== ---- creepy-git.orig/creepy/models/InputPlugin.py 2015-06-21 08:05:00.000000000 +0200 -+++ creepy-git/creepy/models/InputPlugin.py 2015-06-21 08:07:38.915870890 +0200 -@@ -4,6 +4,7 @@ +--- creepy-git.orig/creepy/models/InputPlugin.py ++++ creepy-git/creepy/models/InputPlugin.py +@@ -4,6 +4,7 @@ from yapsy.IPlugin import IPlugin from configobj import ConfigObj import logging import os @@ -23,7 +23,7 @@ Index: creepy-git/creepy/models/InputPlugin.py from utilities import GeneralUtilities #set up logging -@@ -51,6 +52,9 @@ +@@ -55,6 +56,9 @@ class InputPlugin(IPlugin): else: return os.path.join(os.getcwdu(), 'plugins') @@ -33,7 +33,7 @@ Index: creepy-git/creepy/models/InputPlugin.py def getConfigObj(self, config_filename=None): if config_filename is None: config_filename = self.name+".conf" -@@ -59,8 +63,22 @@ +@@ -63,8 +67,22 @@ class InputPlugin(IPlugin): config.create_empty = False return config @@ -57,7 +57,7 @@ Index: creepy-git/creepy/models/InputPlugin.py try: options = config[category] except Exception, err: -@@ -70,7 +88,13 @@ +@@ -74,7 +92,13 @@ class InputPlugin(IPlugin): return config,options def saveConfiguration(self, new_config): @@ -74,9 +74,9 @@ Index: creepy-git/creepy/models/InputPlugin.py config['boolean_options'] = new_config['boolean_options'] Index: creepy-git/creepy/utilities/GeneralUtilities.py =================================================================== ---- creepy-git.orig/creepy/utilities/GeneralUtilities.py 2015-06-21 08:05:00.000000000 +0200 -+++ creepy-git/creepy/utilities/GeneralUtilities.py 2015-06-21 08:05:18.419381632 +0200 -@@ -40,6 +40,14 @@ +--- creepy-git.orig/creepy/utilities/GeneralUtilities.py ++++ creepy-git/creepy/utilities/GeneralUtilities.py +@@ -40,6 +40,14 @@ def getPluginDirs(): return [os.path.join(os.getcwd(), 'plugins')] diff --git a/debian/patches/05-project-dir.patch b/debian/patches/05-project-dir.patch index 79a4049..9fb746c 100644 --- a/debian/patches/05-project-dir.patch +++ b/debian/patches/05-project-dir.patch @@ -12,20 +12,20 @@ Last-Update: 2015-06-21 Index: creepy-git/creepy/CreepyMain.py =================================================================== ---- creepy-git.orig/creepy/CreepyMain.py 2015-06-21 08:10:32.000000000 +0200 -+++ creepy-git/creepy/CreepyMain.py 2015-06-21 08:13:30.793090116 +0200 -@@ -36,6 +36,7 @@ - from components.UpdateCheckDialog import UpdateCheckDialog - from utilities import GeneralUtilities +--- creepy-git.orig/creepy/CreepyMain.py ++++ creepy-git/creepy/CreepyMain.py +@@ -40,6 +40,7 @@ from components.UpdateCheckDialog import + from utilities import GeneralUtilities, QtHandler from dominate.tags import * + from utilities import XStream +from os.path import expanduser + + # set up logging - logger = logging.getLogger(__name__) - logger.setLevel(logging.DEBUG) -@@ -112,10 +113,11 @@ +@@ -133,10 +134,11 @@ class MainWindow(QMainWindow): self.ui = Ui_CreepyMainWindow() self.ui.setupUi(self) - #Create folders for projects and temp if they do not exist + # Create folders for projects and temp if they do not exist - if not os.path.exists(os.path.join(os.getcwd(), 'projects')): - os.makedirs(os.path.join(os.getcwd(), 'projects')) - if not os.path.exists(os.path.join(os.getcwd(), 'temp')): @@ -38,15 +38,15 @@ Index: creepy-git/creepy/CreepyMain.py self.projectsList = [] self.currentProject = None self.ui.mapWebPage = QWebPage() -@@ -157,6 +159,7 @@ - #default to showing the map +@@ -185,6 +187,7 @@ class MainWindow(QMainWindow): + # default to showing the map self.changeMainWidgetPage('map') self.loadProjectsFromStorage() + logger.debug("Just loaded projects from storage") - #If option enabled check for updated version def checkForUpdatedVersion(self): -@@ -595,6 +598,7 @@ + """ +@@ -671,6 +674,7 @@ class MainWindow(QMainWindow): ''' pluginStringOptions = plugin.plugin_object.readConfiguration('string_options')[1] if pluginStringOptions != None: @@ -54,7 +54,7 @@ Index: creepy-git/creepy/CreepyMain.py for idx, item in enumerate(pluginStringOptions.keys()): itemLabel = plugin.plugin_object.getLabelForKey(item) label = QLabel() -@@ -613,6 +617,7 @@ +@@ -689,6 +693,7 @@ class MainWindow(QMainWindow): ''' pluginBooleanOptions = plugin.plugin_object.readConfiguration('boolean_options')[1] if pluginBooleanOptions != None: @@ -62,7 +62,7 @@ Index: creepy-git/creepy/CreepyMain.py for idx, item in enumerate(pluginBooleanOptions.keys()): itemLabel = plugin.plugin_object.getLabelForKey(item) cb = QCheckBox(itemLabel) -@@ -707,7 +712,7 @@ +@@ -849,7 +854,7 @@ class MainWindow(QMainWindow): Loads all the existing projects from the storage to be shown in the UI """ # Show the existing Projects @@ -73,22 +73,22 @@ Index: creepy-git/creepy/CreepyMain.py self.projectNames = [n.replace('.db', '').replace(str(projectsDir) + '/', '') for n in projectFileNames] Index: creepy-git/creepy/models/Project.py =================================================================== ---- creepy-git.orig/creepy/models/Project.py 2015-06-21 08:10:32.000000000 +0200 -+++ creepy-git/creepy/models/Project.py 2015-06-21 08:11:05.152586520 +0200 -@@ -7,7 +7,7 @@ +--- creepy-git.orig/creepy/models/Project.py ++++ creepy-git/creepy/models/Project.py +@@ -7,7 +7,7 @@ from utilities import GeneralUtilities # set up logging logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) --fh = logging.FileHandler(os.path.join(GeneralUtilities.getLogDir(),'creepy_main.log')) -+fh = logging.FileHandler(os.path.join(GeneralUtilities.getUserHome(),'creepy_main.log')) +-fh = logging.FileHandler(os.path.join(GeneralUtilities.getLogDir(), 'creepy_main.log')) ++fh = logging.FileHandler(os.path.join(GeneralUtilities.getUserHome(), 'creepy_main.log')) fh.setLevel(logging.DEBUG) formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) Index: creepy-git/creepy/models/ProjectWizardPossibleTargetsTable.py =================================================================== ---- creepy-git.orig/creepy/models/ProjectWizardPossibleTargetsTable.py 2015-06-21 08:10:32.000000000 +0200 -+++ creepy-git/creepy/models/ProjectWizardPossibleTargetsTable.py 2015-06-21 08:11:05.152586520 +0200 -@@ -41,7 +41,7 @@ +--- creepy-git.orig/creepy/models/ProjectWizardPossibleTargetsTable.py ++++ creepy-git/creepy/models/ProjectWizardPossibleTargetsTable.py +@@ -41,7 +41,7 @@ class ProjectWizardPossibleTargetsTable( column = index.column() if role == Qt.DecorationRole: if column == 1: @@ -99,20 +99,20 @@ Index: creepy-git/creepy/models/ProjectWizardPossibleTargetsTable.py 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 2015-06-21 08:10:32.000000000 +0200 -+++ creepy-git/creepy/plugins/twitter/twitter.py 2015-06-21 08:11:05.152586520 +0200 -@@ -63,7 +63,7 @@ +--- creepy-git.orig/creepy/plugins/twitter/twitter.py ++++ creepy-git/creepy/plugins/twitter/twitter.py +@@ -70,7 +70,7 @@ class Twitter(InputPlugin): target['targetFullname'] = i.name - #save the pic in the temp folder to show it later + # save the pic in the temp folder to show it later filename = 'profile_pic_%s' % i.id_str - temp_file = os.path.join(os.getcwd(), "temp", filename) + temp_file = os.path.join(expanduser("~/.creepy"), "temp", filename) - #Retieve and save the profile phot only if it does not exist + # 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) -@@ -119,6 +119,7 @@ - self.wizard.resize(800,600) - +@@ -137,6 +137,7 @@ class Twitter(InputPlugin): + self.wizard.resize(800, 600) + if self.wizard.exec_(): + logger.debug("About to try saving this new configuration") try: -- 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