s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'conflict' into 'squeekboard'

Browse Source 
build: Apply fixes/suggestions

See merge request Librem5/squeekboard!21
This commit is contained in:
Guido Gunther
2019-07-03 08:48:40 +00:00
parent 5b700f7dfc a129863a4d
commit 3b0a073964
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -16,8 +16,6 @@ build_meson:
tags: tags:
- librem5 - librem5
script: script:
- mkdir -p build - meson . _build/ -Ddepdatadir=/usr/share
- meson build/ -Ddepdatadir=/usr/share - ninja -C _build install
- cd build
- ninja install

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
squeekboard (1.0.10) unstable; urgency=medium
* Use a shared DBus definition
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Tue, 02 Jul 2019 20:12:02 +0000
squeekboard (1.0.9) unstable; urgency=medium squeekboard (1.0.9) unstable; urgency=medium
* Initial release. * Initial release.

2
meson.build
View File

@ -1,7 +1,7 @@
project( project(
'squeekboard', 'squeekboard',
'c', 'rust', 'c', 'rust',
version: '1.0.9', version: '1.0.10',
license: 'GPLv3', license: 'GPLv3',
meson_version: '>=0.43.0', meson_version: '>=0.43.0',
default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ], default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],