From 422902c6161e5fdfed68fc37b1b4890cb86f61d2 Mon Sep 17 00:00:00 2001 From: Jussi Tiira Date: Sun, 25 Oct 2020 23:27:59 +0200 Subject: [PATCH] compatibility with new validation requirements --- img/cover_bottom.svg | 3 +-- img/cover_top.svg | 3 +-- img/icon.svg | 3 +-- python/queries.py | 1 - python/sqlalchemy/testing/runner.py | 1 - python/yrttikanta | 2 +- rpm/harbour-yrttipiha.yaml | 4 ++-- yrttipiha.pro | 6 +++--- 8 files changed, 9 insertions(+), 14 deletions(-) diff --git a/img/cover_bottom.svg b/img/cover_bottom.svg index 636c676..c951605 100644 --- a/img/cover_bottom.svg +++ b/img/cover_bottom.svg @@ -20,7 +20,6 @@ id="svg33" sodipodi:docname="cover_bottom.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)" - inkscape:export-filename="/home/jussi24/koodi/sfos-projects/harbour-yrttipiha/icons/86x86/harbour-yrttipiha.png" inkscape:export-xdpi="96.22377" inkscape:export-ydpi="96.22377"> - \ No newline at end of file + diff --git a/img/cover_top.svg b/img/cover_top.svg index 157b64b..4a71887 100644 --- a/img/cover_top.svg +++ b/img/cover_top.svg @@ -20,7 +20,6 @@ id="svg33" sodipodi:docname="cover_top.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)" - inkscape:export-filename="/home/jussi24/koodi/sfos-projects/harbour-yrttipiha/icons/86x86/harbour-yrttipiha.png" inkscape:export-xdpi="96.22377" inkscape:export-ydpi="96.22377"> - \ No newline at end of file + diff --git a/img/icon.svg b/img/icon.svg index 336bfd0..831f5da 100644 --- a/img/icon.svg +++ b/img/icon.svg @@ -20,7 +20,6 @@ id="svg33" sodipodi:docname="icon-plantago.svg" inkscape:version="0.92.3 (2405546, 2018-03-11)" - inkscape:export-filename="/home/jussi24/koodi/sfos-projects/harbour-yrttipiha/icons/86x86/harbour-yrttipiha.png" inkscape:export-xdpi="96.22377" inkscape:export-ydpi="96.22377"> - \ No newline at end of file + diff --git a/python/queries.py b/python/queries.py index 63aa6de..3e9d826 100644 --- a/python/queries.py +++ b/python/queries.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # coding: utf-8 from os import path pkg_root = path.dirname(path.dirname(path.dirname(__file__))) diff --git a/python/sqlalchemy/testing/runner.py b/python/sqlalchemy/testing/runner.py index 87be074..1f3ae1c 100644 --- a/python/sqlalchemy/testing/runner.py +++ b/python/sqlalchemy/testing/runner.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # testing/runner.py # Copyright (C) 2005-2018 the SQLAlchemy authors and contributors # diff --git a/python/yrttikanta b/python/yrttikanta index 908ed6a..1c965d3 160000 --- a/python/yrttikanta +++ b/python/yrttikanta @@ -1 +1 @@ -Subproject commit 908ed6a27c4fb02b1a8250e3e2c050e97333b1f3 +Subproject commit 1c965d329b827f508a921cea6eec45fa58dd1bac diff --git a/rpm/harbour-yrttipiha.yaml b/rpm/harbour-yrttipiha.yaml index 519d99c..5cd68d0 100644 --- a/rpm/harbour-yrttipiha.yaml +++ b/rpm/harbour-yrttipiha.yaml @@ -1,7 +1,7 @@ Name: harbour-yrttipiha Summary: Yrttipiha herb database -Version: 0.3.0 -Release: 1 +Version: 0.3.1 +Release: 2 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS Group: Qt/Qt diff --git a/yrttipiha.pro b/yrttipiha.pro index d0b3a83..21fe337 100644 --- a/yrttipiha.pro +++ b/yrttipiha.pro @@ -31,9 +31,9 @@ DISTFILES += \ DEPLOYMENT_PATH = /usr/share/$${TARGET} -python.files = python -unix:python.extra = rm -Rf /home/mersdk/share/koodi/sfos-projects/harbour-yrttipiha/python/yrttikanta/.git -python.path = $${DEPLOYMENT_PATH} +python.files = python/sqlalchemy python/queries.py +python.files += python/yrttikanta/yrttikanta +python.path = $${DEPLOYMENT_PATH}/python INSTALLS += python img.files = img