[creepy] 01/02: Update to add a plugin directory, not replace it. Avoid useless newline change.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository creepy.

commit 110740b52de186b487afbe5dfb226c482a81d72f
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Nov 16 22:52:36 2014 +0100

    Update to add a plugin directory, not replace it.  Avoid useless newline change.
---
 debian/patches/02-plugin-directory.patch | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/patches/02-plugin-directory.patch b/debian/patches/02-plugin-directory.patch
index eb3dafd..e027bcf 100644
--- a/debian/patches/02-plugin-directory.patch
+++ b/debian/patches/02-plugin-directory.patch
@@ -1,4 +1,6 @@
 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 <pere at hungry.com>
 Forwarded: no
 Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
@@ -22,7 +24,7 @@ Last-Update: 2014-11-16
      webbrowser.open_new_tab('https://github.com/ilektrojohn/creepy/issues')
      
 +def getPluginDirs():
-+    return ["/usr/share/creepy/plugins"]
++    return ["/usr/share/creepy/plugins", os.path.join(os.getcwd(), 'plugins')]
 +
  def calcDistance(lat1, lng1, lat2, lng2):
      """
@@ -38,13 +40,6 @@ Last-Update: 2014-11-16
          self.PluginManager.locatePlugins()
          self.PluginManager.loadPlugins()
          
-@@ -57,4 +57,4 @@ class PluginsConfigurationDialog(QDialog
-                     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-1.2~alpha.orig/creepy/components/PersonProjectWizard.py
 +++ creepy-1.2~alpha/creepy/components/PersonProjectWizard.py
 @@ -102,7 +102,7 @@ class PersonProjectWizard(QWizard):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/creepy.git