From ba4684d1177e04937efad000e95e112be08391c1 Mon Sep 17 00:00:00 2001 From: geigi Date: Wed, 1 Nov 2017 16:32:52 +0100 Subject: [PATCH] Another go... --- data/com.github.geigi.cozy.appdata.xml | 5 +++++ debian/changelog | 5 +++++ debian/rules | 3 ++- meson.build | 15 +++++++++------ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/data/com.github.geigi.cozy.appdata.xml b/data/com.github.geigi.cozy.appdata.xml index 250f4a75..85e5a764 100644 --- a/data/com.github.geigi.cozy.appdata.xml +++ b/data/com.github.geigi.cozy.appdata.xml @@ -57,6 +57,11 @@ https://github.com/geigi/cozy/issues cozy@geigi.de + + +

App Center build fix

+
+

App Center build fix

diff --git a/debian/changelog b/debian/changelog index 854f77fc..2e99896a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +com.github.geigi.cozy (0.3.3) UNSTABLE; urgency=low + + * App Center build fix + +-- Julian Geywitz Wed, 01 Nov 2017 16:32:14 +0200 com.github.geigi.cozy (0.3.2) UNSTABLE; urgency=low * App Center build fix diff --git a/debian/rules b/debian/rules index ba83c22a..6b9ae7a6 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,8 @@ override_dh_auto_clean: override_dh_auto_configure: mkdir -p debian/build - pip3 install --install-option="--install-purelib=${CURDIR}/peewee" peewee + mkdir -p peewee + PYTHONUSERBASE=${CURDIR}/peewee pip3 install --user peewee cd debian/build && meson --prefix=/usr ../.. override_dh_auto_build: diff --git a/meson.build b/meson.build index 793702f7..98324eea 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cozy', - version: '0.3.2', + version: '0.3.3', meson_version: '>= 0.40.0') project_name = 'cozy' @@ -64,14 +64,17 @@ install_subdir( install_dir: python_dir ) -peewee_dir = join_paths(meson.source_root(), 'peewee') +peewee_dir = join_paths(meson.source_root(), 'peewee/lib/python3.5/site-packages') +new_peewee_dir = join_paths(meson.source_root(), 'peewee/lib/python3.5/peewee') if run_command('[', '-d', peewee_dir, ']').returncode() == 0 message('Installing peewee dependency') - install_subdir( - 'peewee', - install_dir: python_dir -) + run_command('mv', peewee_dir, new_peewee_dir) + if r.returncode() == 0 + install_subdir( + 'peewee/lib/python3.5/peewee', + install_dir: python_dir) + endif endif