Skip to content

Commit

Permalink
Another go...
Browse files Browse the repository at this point in the history
  • Loading branch information
geigi committed Nov 1, 2017
1 parent 805ef63 commit ba4684d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 7 deletions.
5 changes: 5 additions & 0 deletions data/com.github.geigi.cozy.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
<url type="help">https://github.com/geigi/cozy/issues</url>
<update_contact>[email protected]</update_contact>
<releases>
<release version="0.3.3" timestamp="1509550360">
<description>
<p>App Center build fix</p>
</description>
</release>
<release version="0.3.2" timestamp="1509548540">
<description>
<p>App Center build fix</p>
Expand Down
5 changes: 5 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
com.github.geigi.cozy (0.3.3) UNSTABLE; urgency=low

* App Center build fix

-- Julian Geywitz <[email protected]> Wed, 01 Nov 2017 16:32:14 +0200
com.github.geigi.cozy (0.3.2) UNSTABLE; urgency=low

* App Center build fix
Expand Down
3 changes: 2 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 9 additions & 6 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('cozy',
version: '0.3.2',
version: '0.3.3',
meson_version: '>= 0.40.0')

project_name = 'cozy'
Expand Down Expand Up @@ -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


0 comments on commit ba4684d

Please sign in to comment.