From e38a0a7fe49b591a27b0e417c0736292549e4b54 Mon Sep 17 00:00:00 2001
From: Hannes Schulze <haschu0103@gmail.com>
Date: Sun, 27 Jan 2019 14:22:42 +0100
Subject: [PATCH] Simplify installation instructions

---
 README.md                                     |  11 +-
 build-aux/meson/postinstall.py                |  19 ++++
 ...com.github.gyan000.eos-connect.appdata.png | Bin 21092 -> 0 bytes
 ....github.gyan000.eos-connect.appdata.xml.in |  11 --
 ...m.github.gyan000.eos-connect.desktop.in.in |  12 --
 ...ithub.hannesschulze.conecto.appdata.xml.in |  11 ++
 ...om.github.hannesschulze.conecto.desktop.in |  12 ++
 ....github.hannesschulze.conecto.gschema.xml} |   0
 data/meson.build                              |  99 ++++++----------
 data/test/telephony-thumbnail-source.b64      |   1 -
 data/test/telephony-thumbnail-source2.b64     |   1 -
 data/test/telephony-thumbnail-source3.b64     |   1 -
 data/test/telephony-thumbnail-source4.b64     |   1 -
 meson.build                                   | 106 ++++++++----------
 meson/post_install.py                         |  10 --
 po/meson.build                                |   8 +-
 src/meson.build                               |  12 +-
 17 files changed, 134 insertions(+), 181 deletions(-)
 create mode 100644 build-aux/meson/postinstall.py
 delete mode 100644 data/com.github.gyan000.eos-connect.appdata.png
 delete mode 100644 data/com.github.gyan000.eos-connect.appdata.xml.in
 delete mode 100644 data/com.github.gyan000.eos-connect.desktop.in.in
 create mode 100644 data/com.github.hannesschulze.conecto.appdata.xml.in
 create mode 100644 data/com.github.hannesschulze.conecto.desktop.in
 rename data/{com.github.gyan000.eos-connect.gschema.xml => com.github.hannesschulze.conecto.gschema.xml} (100%)
 delete mode 100644 data/test/telephony-thumbnail-source.b64
 delete mode 100644 data/test/telephony-thumbnail-source2.b64
 delete mode 100644 data/test/telephony-thumbnail-source3.b64
 delete mode 100644 data/test/telephony-thumbnail-source4.b64
 delete mode 100644 meson/post_install.py

diff --git a/README.md b/README.md
index ed653d2..af79788 100644
--- a/README.md
+++ b/README.md
@@ -42,14 +42,15 @@ sudo apt install elementary-sdk libunity-dev libnotify-dev libghc-gnutls-dev lib
 ### Building
 ```
 git clone https://github.com/hannesschulze/conecto.git && cd conecto
-meson build
-ninja -C build
-glib-compile-schemas ./data/
+meson build --prefix=/usr
+cd build
+ninja
 ```
 
-To install, use `ninja install`:
+To install, use `ninja install`, then execute with com.github.hannesschulze.conecto:
 ```shell
-sudo ninja -C build install
+sudo ninja install
+com.github.hannesschulze.conecto
 ```
 
 ## About this project
diff --git a/build-aux/meson/postinstall.py b/build-aux/meson/postinstall.py
new file mode 100644
index 0000000..2e07613
--- /dev/null
+++ b/build-aux/meson/postinstall.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+from os import environ, path
+from subprocess import call
+
+prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local')
+datadir = path.join(prefix, 'share')
+destdir = environ.get('DESTDIR', '')
+
+# Package managers set this so we don't need to run
+if not destdir:
+    print('Updating icon cache...')
+    call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')])
+
+    print('Updating desktop database...')
+    call(['update-desktop-database', '-q', path.join(datadir, 'applications')])
+
+    print('Compiling GSettings schemas...')
+    call(['glib-compile-schemas', path.join(datadir, 'glib-2.0', 'schemas')])
diff --git a/data/com.github.gyan000.eos-connect.appdata.png b/data/com.github.gyan000.eos-connect.appdata.png
deleted file mode 100644
index 99b082956d35f4b11ab05181cb24bcb43af57585..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21092
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
CA|!qQ

diff --git a/data/com.github.gyan000.eos-connect.appdata.xml.in b/data/com.github.gyan000.eos-connect.appdata.xml.in
deleted file mode 100644
index e2c972f..0000000
--- a/data/com.github.gyan000.eos-connect.appdata.xml.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2018 gyan000 <gyan000@ijaz.fr> -->
-<component type="desktop">
-  <id>com.github.gyan000.eos-connect.desktop</id>
-  <metadata_license>CC0</metadata_license>
-  <name>EOS Connect</name>
-  <summary>KDE Connect client for Elementary OS.</summary>
-  <description>
-    <p>KDE Connect client for Elementary OS, based on MConnect.</p>
-  </description>
-</component>
diff --git a/data/com.github.gyan000.eos-connect.desktop.in.in b/data/com.github.gyan000.eos-connect.desktop.in.in
deleted file mode 100644
index 9f8d59d..0000000
--- a/data/com.github.gyan000.eos-connect.desktop.in.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=EOS Connect
-GenericName=EOS Connect
-Comment=KDE Connect client for Elementary OS.
-Categories=Utility;
-Exec=com.github.gyan000.eos-connect
-Icon=phone
-Terminal=false
-Type=Application
-X-GNOME-Gettext-Domain=eos-connect
-X-GNOME-UsesNotifications=true
-Keywords=KDE;connect;
diff --git a/data/com.github.hannesschulze.conecto.appdata.xml.in b/data/com.github.hannesschulze.conecto.appdata.xml.in
new file mode 100644
index 0000000..4491307
--- /dev/null
+++ b/data/com.github.hannesschulze.conecto.appdata.xml.in
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018 gyan000 <gyan000@ijaz.fr> -->
+<component type="desktop">
+  <id>com.github.hannesschulze.conecto.desktop</id>
+  <metadata_license>CC0</metadata_license>
+  <name>Conecto</name>
+  <summary>Integrate your Android-phone with your PC</summary>
+  <description>
+    <p>Integrate your Android-phone with your PC - a GTK client for KDEConnect. </p>
+  </description>
+</component>
diff --git a/data/com.github.hannesschulze.conecto.desktop.in b/data/com.github.hannesschulze.conecto.desktop.in
new file mode 100644
index 0000000..ed9f4e8
--- /dev/null
+++ b/data/com.github.hannesschulze.conecto.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Conecto
+GenericName=Conecto
+Comment=Integrate your Android-phone with your PC - a GTK client for KDEConnect.
+Categories=Utility;
+Exec=com.github.hannesschulze.conecto
+Icon=phone
+Terminal=false
+Type=Application
+X-GNOME-Gettext-Domain=conecto
+X-GNOME-UsesNotifications=true
+Keywords=KDE;connect;
diff --git a/data/com.github.gyan000.eos-connect.gschema.xml b/data/com.github.hannesschulze.conecto.gschema.xml
similarity index 100%
rename from data/com.github.gyan000.eos-connect.gschema.xml
rename to data/com.github.hannesschulze.conecto.gschema.xml
diff --git a/data/meson.build b/data/meson.build
index 0a00498..ba0f39d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,73 +1,42 @@
-# Daemon Desktop file (for GNOME Session autostart)
-#configure_file(
-#    input: meson.project_name() + '-daemon.desktop.in',
-#    output: '@BASENAME@',
-#    configuration: conf_data,
-#    install_dir: join_paths(get_option('datadir'), 'applications')
-#)
-
-# D-Bus Service
-#configure_file(
-#    input: meson.project_name() + '.service.in',
-#    output: '@BASENAME@',
-#    configuration: conf_data,
-#    install_dir: dbus.get_pkgconfig_variable('session_bus_services_dir')
-#)
-
-# GNOME Shell Search Provider
-#configure_file(
-#    input: meson.project_name() + '.search-provider.ini.in',
-#    output: '@BASENAME@',
-#    configuration: conf_data,
-#    install_dir: join_paths(get_option('datadir'), 'gnome-shell', 'search-providers')
-#)
-
-# AppData file
-i18n.merge_file(
-    input: meson.project_name() + '.appdata.xml.in',
-    output: '@BASENAME@',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
-    type: 'xml',
-    install_dir: join_paths(get_option('datadir'), 'metainfo'),
-    install: true
+desktop_file = i18n.merge_file(
+  input: 'com.github.hannesschulze.conecto.desktop.in',
+  output: 'com.github.hannesschulze.conecto.desktop',
+  type: 'desktop',
+  po_dir: '../po',
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'applications')
 )
 
-# Desktop File
-desktop_in = configure_file(
-    input: meson.project_name() + '.desktop.in.in',
-    output: '@BASENAME@',
-    configuration: conf_data
+desktop_utils = find_program('desktop-file-validate', required: false)
+if desktop_utils.found()
+  test('Validate desktop file', desktop_utils,
+    args: [desktop_file]
+  )
+endif
+
+appstream_file = i18n.merge_file(
+  input: 'com.github.hannesschulze.conecto.appdata.xml.in',
+  output: 'com.github.hannesschulze.conecto.appdata.xml',
+  po_dir: '../po',
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'appdata')
 )
 
-i18n.merge_file(
-    input: desktop_in,
-    output: meson.project_name() + '.desktop',
-    po_dir: join_paths(meson.source_root (), 'po'),
-    type: 'desktop',
-    install_dir: join_paths(get_option('datadir'), 'applications'),
-    install: true
-)
+appstream_util = find_program('appstream-util', required: false)
+if appstream_util.found()
+  test('Validate appstream file', appstream_util,
+    args: ['validate', appstream_file]
+  )
+endif
 
-# Blacklist file
-#install_data(
-#    'appcenter.blacklist',
-#    install_dir: config_dir,
-#)
 
-# Install GSettings schemas
-install_data(
-    meson.project_name() + '.gschema.xml',
-    install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
+install_data('com.github.hannesschulze.conecto.gschema.xml',
+  install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
 )
 
-# Use GResource
-#css_gresource = gnome.compile_resources(
-#    'gresource_css',
-#    meson.project_name() + '.gresource.xml'
-#)
-
-#icons_gresource = gnome.compile_resources(
-#    'gresource_icons',
-#    'icons/categories.gresource.xml',
-#    source_dir: 'icons'
-#)
+compile_schemas = find_program('glib-compile-schemas', required: false)
+if compile_schemas.found()
+  test('Validate schema file', compile_schemas,
+    args: ['--strict', '--dry-run', meson.current_source_dir()]
+  )
+endif
diff --git a/data/test/telephony-thumbnail-source.b64 b/data/test/telephony-thumbnail-source.b64
deleted file mode 100644
index 8639f77..0000000
--- a/data/test/telephony-thumbnail-source.b64
+++ /dev/null
@@ -1 +0,0 @@
-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
diff --git a/data/test/telephony-thumbnail-source2.b64 b/data/test/telephony-thumbnail-source2.b64
deleted file mode 100644
index c4d1095..0000000
--- a/data/test/telephony-thumbnail-source2.b64
+++ /dev/null
@@ -1 +0,0 @@
-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\n9PluT96VKlSB6Y//
diff --git a/data/test/telephony-thumbnail-source3.b64 b/data/test/telephony-thumbnail-source3.b64
deleted file mode 100644
index 3ff074a..0000000
--- a/data/test/telephony-thumbnail-source3.b64
+++ /dev/null
@@ -1 +0,0 @@
-/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a\nHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy\nMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCACIAJYDASIA\nAhEBAxEB/8QAHAAAAQUBAQEAAAAAAAAAAAAABgACAwQFAQcI/8QAORAAAgEDAwIDBgMGBgMAAAAA\nAQIDAAQRBRIhMUEGE1EUImFxgaGRscEVIzJCUmJDcpLR4fAkgvH/xAAaAQACAwEBAAAAAAAAAAAA\nAAACAwABBQQG/8QAIxEAAgICAwACAwEBAAAAAAAAAAECEQMhBBIxIlEFMkETsf/aAAwDAQACEQMR\nAD8A8iijLE5yB6gVathn+IDFMFxbjoRn5VOk0ZZRuGWGRS2MSHlQrcCuMSc+lSAccV0A5xmqCooT\nDkGuRcOD8atXMPGR2qsowy0SAYUAUtvJqRRwK7t5NUEAOvjGs3HzH5VmVs+IY2OtTYB6L+VZfkuO\nqmjQtrZHSp+w1zaasoZSp2DXCDUIcrlOwa5UIKijRBnT/rQwAT2op0EZ08/OqkFH0ulaVSEc0qAM\nx2WGPLFR04GKiEkLtkxbfQ1cFuhGDlh8TXfYYzgj3flUtFUyMMXwd3X+7pU0ac580KMZPOTTvZto\nwjEfHFde2kRDtO8Y6EYqgtlWedyR7w29R8aQIYF8fAUp45OFMePl0FNGUGzHvZwAKIB7CwOkcW92\nCqBkk06BZro+4pRT0yPeI/SodPsZr2RJZjnA91Oy/wC5+NGmm6VtUEAD51yZc9aiavF4Pf5TMC28\nK280nmSoWc9Wbk1pHwvaeWU8lSMd1oshsggB71Z9nGelcryye7NSODHFVR5Rq/gu2kDGJTC/YryP\nwoG1HRrrTnPmplM4DryDX0JdWSNkbeaGtW0SKaNg0YKnqDTsXJktM5eR+PxzVw0zw4rzTSKI9f8A\nDz6c5liBMJPTutD5FaEZKStGDkxyxy6yI9tcxTzTaIWdUcUU6AM6e3zoWHSivw9zp7/5v96GQUfT\nQI5pVIRSoRpmKz8K+wZ7inM6CLmRd+CeCQMU7y1PYUvJ3oVydvpQ6JszWmnJyX4xwQactwwQ87sj\nHLdKnNoVJG7A9aRsX4/efTFFoC2QG7aLO8546elaWhWrXMvtEnU/wj0FYOqI0UqRZBOMnFGfhyFV\ngPc4HP0oMjqI7jrtkVhdo1iMKccUXWttwOKy9IiQW0bHuKIoR8MYFZr2z0MXUdHUtTkYIA9Km8jH\npmpUbI4qQjgGi6qhMskr2UntwRnjNZl3aKyMMDkVtSMBkVTlTcD8qBqh2OT/AKAOsaakkbI65Rsg\n8V49qtkbDUJYD0B4r6A1mEeQSOua8f8AHMSpfRP0JyMV18WW6M78lBOPb6A/v0rj9KecCmMw7V3m\nKcXpRh4cy2nOT6j8zQcKNPDaEaU7EHBPHHxoZeBQ9NEjmlTiOaVLHUYUkpxuB90+lNS8dcdx3qtk\n4A3cdqeUEajcCT3q6Atl5bxWAG3BPHNTeacVmqhkkVwdqpjr+VXhzULTMPU3LXrZPQACjTwu2+3Y\nnp6fSg7UIJJb5hFG7nYGIVScD1ot8MlhaMNpBDc59cUOX9BvH1kPTtI5t0wMkCiW2gZl5oV0hmZF\niGVyorantLxIsrq0MA6BZDj75rgUNmy8lRpG6kIDc9e1StakjIPHpQrb3F9ZyDzrxJ0yPeWiWC4M\nsW4Gji4+CpKXqZx4FAAHWqcyxopLSqv1qlqk0s8phSYx5HJHWs2O10qzP/masWk/pYHA+1VSl4H2\ncPTmrDdA2whh1BFeO+Pl/e2rgfxZ5r2C+W0kQPaXUcqnglDxXmXjHRrvULm3trdVMyI8m1mxkDrR\n4EoytieY3kx0ls83J4puOKeylSQwwQcEVwnjFaJhjaNvDcryaQUZ2KoeATkDJ/4oJzRj4XOdNk/z\nD9aGXgUPTYPWlSPWlSx4KqjJcGKWNldW2lT1Bq+IUA3Mx2jsahufMurgTNKM4Ayq4AA4FTxlEIMk\nwc9O3FWxaO+ZjA2gGpJ8QwO46KMmuuochsjA54702Rg0bxll5GMZqiy74JuVutVvQSFf2cOhPfae\nQfUc1b0C9hs9Yura8whSUhs9Bjp9qC9Lvm0vWIbgMNqNtceqng/ajq506xuPFtxIcyRuysPewGBU\nHmgyR2dmCXaCX0/+m9NfT6g0k+lXLpYh/LRk4aTH8TeoGeAO+K000G41Foczv5KLuxJJ727IyQRz\nk471Wt7VNHBWOF3sGJdNgyYyeoI9M96JdP1izSAvyxVclVQkjt6VzxnT0aDwScdmPfX0nhdT7TK8\nul3JMR34d4WPT3j1XP4VPY67rc9m8mnJaG2QAqZiSzjvUes2reIXVby1eOwjO4JL7rSntkdlH3qf\nTEEcDRRKFjA2gDpignta9H4cDbfbwr2fihdTvXsLZvJvpgfO3DJjA64/EVNc+Hnk9+O5dEIXzVaU\nkyYPqenyqiulKuorqVnHGL+JiGycCZD1Un8MH1FEia3E0ISe1uonA5V4SfuMg1cZKHgueCTbUvv+\nAn+yok1K5ukc2mxSyspJTI/qXuDWDc+IrG91oXZVkENvKXRhwGC5P3GKPLpZJp3hig2r0aZwNv8A\n6j+Y/avO/GsNnpmnXItLdIjKgiJA5IJGcmix/KVMXnX+cOx5hI5kdnbqxJPzNNHPbNdJ5rgH4ZrR\nPPHQoIJx0ov8McafKP7h+tCjELHtA+tFXhjiwl/zChl4HD02j1pVwnFKljgaX2UqAVPHxp2+1j4W\nPd8TVMClRULs0BdgYVcbcYApzyRsBJ5QYiqIUFcg8jtU0TlF5xj0qiWZl+FNyXCKoYdBRlptyrDT\nLnerPJCEkx/KynHP0xQnqEQKh1PAqbQWAu2Vv6cgZ71clcQ8M+sq+z2+wlzEBntRDbNhQRjOKCdE\nu/Ot4tx98AAiiu1kVV3s21R3NcEtM9Din2jsZr8witAx6udufSq+irvhwo3Eg9BTtVuIby2MRYHu\nNp6YrJ0a/ktrhxBIFUqeWbGOxx8KtUNU1BV9l+aQW18uQAGOD+Nbwfam3PFChube41ACYv5u4ZA6\nY9P+a2jfJgDeOeM56UuWg21PaGXsxUHHfigPWVtNRa5huYxIVddo9Ouf0on1u+S3j3FwODQTAzTK\n8zFsu5PSnYF/TM52XVFT9iaaOlnFS/ZNgOlpD/pq+VP9RphX4n8a6zIKf7Ps16WsP+inLCkKkRRo\ngPJCrjNTlR6n8ajZV/6aohH3pVwrzxSqFgkDxXd3QVbFqnx+tOWzTHOSfnRWhdMgSNigcEfKk3Gc\n+narYtE5yeKkjtUZR7jMue2SM1LRdMzGgaW1kxngZNVtNl8m/jbt0Nbd7KtmnlNGckHC4xkUOmFg\nwLEDnoKtbRT+LTPTdDuV83BIbcexxRc0rz7Yt42nr6CvKNH1R4pFiCgORtJz969J0y8E8Ct737sc\n4H51x5YtM1uPlUo0TeTbQyfvrsbv6Aalt4LUxqqzqCFIyy/lSltPa1DKVJz09KiGmQLxJ7snfDYo\nEk0amOGOS2xxtIC3vXyhuhJ7/wDcUvJ8pHZJY5AcYwc8io/2dAGHkgt6lmzUszpbQ+W2OnO0fahk\ngc0Yw/Vg54gvRNCsTNh+mPh1oOfXbq3OyHyjFk7WIJJ+9XNf1GSe5ZkJCICoyOtDycK0fp7w/Wuz\nDComDysvaVF8+Ir8/wA8Q+SUxte1A/4y/SMVQwx6KfoKeILhsEQSEH0Q03RzbLB1nUD/AI5+iD/a\nmNqmoN1uJPoAKb7BfN/Dazn5RmkNL1Q9LOY/NcVNEGG/vCebib/VSqcaNqhGfZiPmRSqwSyJUH82\nakVxnhh+NVPa9pIA9005rsDjAJpfUZ2L8W2R1XdjPUjtTLzWI7SIxWajcDjcecVmyXTuMA7R8Kqz\nL+6P40SiC5ksk8kz+ZNIzse7HNV5OZfmKfkMme1MYbkDDqvBoxZIjEOkithuhxRx4d1gtbG3aTKE\n5OBj/wC0BK3J+P51as7g210syZx0YA9KCceyG4snSVnsVnIogAYMCeihvXtWgdFtLmAOZZUIPVWz\nQTZa7beWg3lZBnIY859K37HxFbJHtNwvB457da4pQaNvFlg0ar6XbWEKvFuYHuWrG1i5jhiMiuCu\nOmaguPEIluGi81WHAGD8eaz5DHqTwpGC8S8yc9x+lSMd2DmyRqo+mBqVnjSJZ9hVnbzAD2GelD+Q\nHQ/Q0d+IYQuhzscDC/qOKA1XdIo+NdeJ2mZXIilJUWIdQvLI/uJ3UD+XOR+BrYs/FpIC3kJP98R/\nQ0PMcuagztJFNOc9AttY0+7IWO5G7+lztP3q0wX0rzYj3at22rX1qu2K4bYP5W94feqoJNBywX0F\nKsjTdaivYiJtkcq9QTwfiKVUXoGZmiZiE4PqDTOAMUqVWCcBzwadjjB6GlSqyiup8typ6VKoxyME\ndxSpVChrx5GV/CkmT04Yevf4UqVQhv6RrNkZVh1azWZenmDh1+P9350Sppvhy9t/Mt7tIgx2gSgg\ng+hzSpUjIq8O7i/N1L6Zct/C8ULhvdI6g9c1oexpbRBUHvHjjtSpUhtnUopeAz41v4yINKgbc6kN\nLt557L8/+KEAUhGXPvZ6elKlXTi/VGdmk3N2RHBGQc1Wf+OlSpoljx0xSApUqhBK7RtlT1FKlSqF\nH//Z
diff --git a/data/test/telephony-thumbnail-source4.b64 b/data/test/telephony-thumbnail-source4.b64
deleted file mode 100644
index 972044a..0000000
--- a/data/test/telephony-thumbnail-source4.b64
+++ /dev/null
@@ -1 +0,0 @@
-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
diff --git a/meson.build b/meson.build
index d791fb1..5fe4ce5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,72 +1,56 @@
-project(
-    'com.github.gyan000.eos-connect',
-    'vala', 'c',
-    version: '0.4.9')
+project('com.github.hannesschulze.conecto', ['c', 'vala'], version: '0.1.0',
+  meson_version: '>= 0.40.0',
+)
 
-gettext_name = meson.project_name()
-gnome = import('gnome')
 i18n = import('i18n')
 
-add_project_arguments(
-    '-DGETTEXT_PACKAGE="@0@"'.format(gettext_name),
-    '-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE',
-    language:'c'
-)
+conf = configuration_data()
+conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+configure_file(output: 'config.h', configuration: conf)
+config_h_dir = include_directories('.')
+c_args = [
+  '-include', 'config.h'
+]
 
-dep_atspi = dependency('atspi-2')
-dep_gdk = dependency('gdk-3.0')
-dep_gee = dependency ('gee-0.8')
-dep_gio = dependency ('gio-2.0')
-dep_gio_unix = dependency('gio-unix-2.0')
-dep_glib = dependency('glib-2.0')
-dep_granite = dependency ('granite', version: '>=0.4.2')
-dep_gtk = dependency ('gtk+-3.0', version: '>=3.18')
-dep_gnutls = dependency('gnutls')
-dep_gobject = dependency('gobject-2.0')
-dep_json_glib = dependency('json-glib-1.0')
-dep_libebook = dependency('libebook-1.2')
-dep_libedataserver = dependency('libedataserver-1.2')
-dep_libnotify = dependency('libnotify')
-dep_posix = meson.get_compiler('vala').find_library('posix')
-#dep_libsoup = dependency ('libsoup-2.4')
-dep_unity = dependency('unity', version: '>=4.0.0')
-dep_sqlite = dependency('sqlite3')
 
-add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'src/MConnect/vapi')], language: 'vala')
+gnome = import('gnome')
 
-dependencies = [
-    dep_atspi,
-    dep_gdk,
-    dep_gee,
-    dep_gio,
-    dep_gio_unix,
-    dep_glib,
-    dep_gnutls,
-    dep_gobject,
-    dep_granite,
-    dep_gtk,
-    dep_json_glib,
-    dep_libebook,
-    dep_libedataserver,
-    dep_libnotify,
-    #dep_libsoup,
-    dep_posix,
-    dep_sqlite,
-    dep_unity
+conecto_deps = [
+  dependency('atspi-2'),
+  dependency('gdk-3.0'),
+  dependency('gee-0.8'),
+  dependency('gio-2.0'),
+  dependency('gio-unix-2.0'),
+  dependency('glib-2.0'),
+  dependency('granite', version: '>=0.4.2'),
+  dependency('gtk+-3.0', version: '>=3.18'),
+  dependency('gnutls'),
+  dependency('gobject-2.0'),
+  dependency('json-glib-1.0'),
+  dependency('libebook-1.2'),
+  dependency('libedataserver-1.2'),
+  dependency('libnotify'),
+  dependency('unity', version: '>=4.0.0'),
+  dependency('sqlite3'),
+  meson.get_compiler('vala').find_library('posix'),
 ]
 
-conf_data = configuration_data()
-conf_data.set('PROJECT_NAME', meson.project_name())
-#conf_data.set('DESKTOP_ICON', get_option('icon'))
-conf_data.set('EXEC_NAME', meson.project_name())
-conf_data.set('GETTEXT_PACKAGE', meson.project_name())
-#conf_data.set('APP_NAME', get_option('name'))
-conf_data.set('VERSION', meson.project_version())
-#conf_data.set('CONFIGDIR', config_dir)
-conf_data.set('EXEC_PATH', join_paths (get_option('prefix'), get_option('bindir'), meson.project_name()))
-
-meson.add_install_script('meson/post_install.py')
+add_project_arguments(
+  [ '--vapidir', join_paths(meson.current_source_dir(), 'src/MConnect/vapi') ],
+  language: 'vala'
+)
 
-subdir('data')
 subdir('src')
 subdir('po')
+subdir('data')
+
+
+executable('com.github.hannesschulze.conecto',
+  conecto_sources,
+  vala_args: '--target-glib=2.50',
+  dependencies: conecto_deps,
+  install: true,
+  c_args: c_args
+)
+
+meson.add_install_script('build-aux/meson/postinstall.py')
diff --git a/meson/post_install.py b/meson/post_install.py
deleted file mode 100644
index 76ed255..0000000
--- a/meson/post_install.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-
-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
-
-if not os.environ.get('DESTDIR'):
-	print('Compiling gsettings schemas...')
-	subprocess.call(['glib-compile-schemas', schemadir])
diff --git a/po/meson.build b/po/meson.build
index 0f431a3..9d54560 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,3 +1,7 @@
-i18n.gettext(meson.project_name(),
-   args: ['--directory='+meson.source_root(), '--from-code=UTF-8']
+i18n.gettext(
+  meson.project_name(),
+  args: [
+    '--directory=' + meson.source_root(),
+    '--from-code=UTF-8'
+  ]
 )
diff --git a/src/meson.build b/src/meson.build
index 466b4e7..94055be 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,4 @@
-all_files = files(
+conecto_sources = files(
     'EOSConnect/Config.vala',
     'EOSConnect/Contact.vala',
     'EOSConnect/ContactsInterface.vala',
@@ -72,13 +72,3 @@ all_files = files(
     'MConnect/UploadTransfer.vala',
     'MConnect/Utils.vala',
 )
-
-executable(
-    meson.project_name(),
-    all_files,
-    #css_gresource,
-    #icons_gresource,
-    dependencies: dependencies,
-    #vala_args: args,
-    install: true
-)
-- 
GitLab