This is an automated email from the git hooks/post-receive script. pere pushed a commit to branch master in repository creepy.
commit 80dcea50719a8f5cf2f5f5e0b01a131d2c4fbdb5 Author: Petter Reinholdtsen <p...@hungry.com> Date: Sun Nov 16 22:58:44 2014 +0100 Add 03-include-dir.patch to use correct include path in package. --- debian/changelog | 1 + debian/patches/03-include-dir.patch | 49 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 51 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8782d32..2ab93e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ creepy (1.2~alpha-1) UNRELEASED; urgency=medium ~/.creepy/, not ~/ or /usr/share/creepy/. * Add 02-plugin-directory.patch to make sure plugins in /usr/share/creepy/plugins/ are found. + * Add 03-include-dir.patch to use correct include path in package. -- Andreas Tille <ti...@debian.org> Sun, 16 Feb 2014 11:46:28 +0100 diff --git a/debian/patches/03-include-dir.patch b/debian/patches/03-include-dir.patch new file mode 100644 index 0000000..e9e548b --- /dev/null +++ b/debian/patches/03-include-dir.patch @@ -0,0 +1,49 @@ +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-16 + +--- creepy-1.2~alpha.orig/creepy/CreepyMain.py ++++ creepy-1.2~alpha/creepy/CreepyMain.py +@@ -102,7 +102,7 @@ class MainWindow(QMainWindow): + 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 @@ class MainWindow(QMainWindow): + 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-1.2~alpha.orig/creepy/utilities/GeneralUtilities.py ++++ creepy-1.2~alpha/creepy/utilities/GeneralUtilities.py +@@ -7,6 +7,9 @@ import webbrowser + from math import radians, cos, sin, asin, sqrt + + ++def getIncludeDir(): ++ return "/usr/share/creepy/include" ++ + def getUserHome(): + return expanduser("~") + +--- creepy-1.2~alpha.orig/creepy/models/ProjectWizardPluginListModel.py ++++ creepy-1.2~alpha/creepy/models/ProjectWizardPluginListModel.py +@@ -24,7 +24,7 @@ class ProjectWizardPluginListModel(QAbst + 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 7987d61..c3ac3d3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01-log-to-homedir.patch 02-plugin-directory.patch +03-include-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