diff --git a/.travis.yml b/.travis.yml
index 5b60f06..0bc0d69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,38 @@
-language: generic
+---
+
+language: node_js
+
+node_js:
+ - lts/*
+
+sudo: required
services:
- - docker
+ - docker
+
+addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - libstdc++-5-dev
-env:
- - DEPENDENCY_PACKAGES="appstream desktop-file-utils io.elementary.vala-lint meson libgtk-3-dev libgee-0.8-dev valac"
+cache:
+ directories:
+ - /tmp/liftoff
+
+matrix:
+ include:
+ - env: DIST=juno
+
+before_install:
+ - docker pull ubuntu:18.04
install:
- - docker pull elementary/docker:juno-unstable
- - docker run -v "$PWD":/tmp/build-dir elementary/docker:juno-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && meson build --prefix=/usr && cd build && ninja test"
+ - npm install @elementaryos/houston@1
script:
- - echo BUILDS PASSED
+ - houston ci
+ --name-human Harvey
+ --distribution $DIST
+
diff --git a/data/com.github.danrabbit.harvey.appdata.xml.in b/data/com.github.danrabbit.harvey.appdata.xml.in
index 53591bf..e20b350 100644
--- a/data/com.github.danrabbit.harvey.appdata.xml.in
+++ b/data/com.github.danrabbit.harvey.appdata.xml.in
@@ -39,6 +39,35 @@
https://raw.githubusercontent.com/danrabbit/harvey/master/data/screenshot.png
+
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+ none
+
com.github.danrabbit.harvey
Daniel Foré
http://danielfore.com
diff --git a/data/meson.build b/data/meson.build
index 2d5eaa0..3c7ec21 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -33,16 +33,3 @@ i18n.merge_file(
install_dir: join_paths(get_option('datadir'), 'metainfo')
)
-
-test (
- 'Validate desktop file',
- find_program('desktop-file-validate'),
- args: join_paths(meson.current_build_dir (), meson.project_name() + '.desktop')
-)
-
-test (
- 'Validate appdata file',
- find_program('appstreamcli'),
- args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
-)
-
diff --git a/debian/control b/debian/control
index d4627f4..8c44ef4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,11 @@ Source: com.github.danrabbit.harvey
Section: x11
Priority: extra
Maintainer: Daniel Foré
-Build-Depends: appstream,
- debhelper (>= 9),
- desktop-file-utils,
+Build-Depends: debhelper (>= 10.5.1),
libgtk-3-dev,
meson,
valac
-Standards-Version: 3.9.3
+Standards-Version: 4.1.1
Package: com.github.danrabbit.harvey
Architecture: any
diff --git a/debian/rules b/debian/rules
index 01a043c..761c3f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,18 +12,3 @@
%:
dh $@
-override_dh_auto_clean:
- rm -rf debian/build
-
-override_dh_auto_configure:
- mkdir -p debian/build
- cd debian/build && meson --prefix=/usr ../..
-
-override_dh_auto_build:
- cd debian/build && ninja -v
-
-override_dh_auto_test:
- cd debian/build && ninja test
-
-override_dh_auto_install:
- cd debian/build && DESTDIR=${CURDIR}/debian/com.github.danrabbit.harvey ninja install
diff --git a/meson.build b/meson.build
index fe13026..97c222a 100644
--- a/meson.build
+++ b/meson.build
@@ -29,9 +29,3 @@ subdir('data')
subdir('po')
meson.add_install_script('meson/post_install.py')
-
-test (
- 'Vala lint',
- find_program('io.elementary.vala-lint'),
- args: ['-d', join_paths(meson.source_root(), 'src')]
-)