Merge branch 'conflict' into 'squeekboard'

build: Apply fixes/suggestions See merge request Librem5/squeekboard!21
2019-07-03 08:48:40 +00:00
parent 5b700f7dfc a129863a4d
commit 3b0a073964
3 changed files with 9 additions and 5 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -16,8 +16,6 @@ build_meson:
  tags:
    - librem5
  script:
-    - mkdir -p build
-    - meson build/ -Ddepdatadir=/usr/share
-    - cd build
-    - ninja install
+    - meson . _build/ -Ddepdatadir=/usr/share
+    - ninja -C _build install

--- a/debian/changelog
+++ b/debian/changelog
@ -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

  * Initial release.
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.0.9',
+    version: '1.0.10',
    license: 'GPLv3',
    meson_version: '>=0.43.0',
    default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],