Merge pull request #2 from writeas/master

Sync

Author: cassidyjames

.gitignore

@@ -4,3 +4,4 @@
 build
 .ninja_*
 build.ninja
+data/writeas

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "src/github.com/writeas/writeas-cli"]
+	path = src/github.com/writeas/writeas-cli
+	url = https://github.com/writeas/writeas-cli.git
+[submodule "fonts/lora"]
+	path = fonts/lora
+	url = https://code.as/writeas/fonts-lora.git
+	branch = include

build-cli.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+exec_name=writeas
+
+echo "Building $exec_name CLI..."
+gb build github.com/writeas/writeas-cli/cmd/writeas
+echo "Success."

data/icons/writeas-bright-dark.png

@@ -8,11 +8,7 @@ foreach i : icon_sizes
     )
 endforeach
 
-install_data('icons/writeas-bright-dark.png',
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '16x16', 'actions'))
-
 install_data('com.github.writeas.writeas-gtk.desktop',
     install_dir: join_paths(get_option('datadir'), 'applications'))
 install_data('com.github.writeas.writeas-gtk.appdata.xml',
     install_dir: join_paths(get_option('datadir'), 'metainfo'))
-install_data('writeas', install_dir: get_option('bindir'))

data/icons/writeas-bright-dark@2x.png

@@ -6,11 +6,13 @@ Build-Depends: meson,
                debhelper (>= 9),
                libgtk-3-dev,
                libgtksourceview-3.0-dev,
-               valac (>= 0.36)
+               valac (>= 0.36),
+               golang-go,
+               gb
 Standards-Version: 3.9.3
 
 Package: com.github.writeas.writeas-gtk
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, writeas-cli
-Recommends: fonts-lora, fonts-open-sans, fonts-hack
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: fonts-open-sans, fonts-hack-ttf
 Description: A distraction free and private writing tool, with built-in publishing.

data/meson.build

@@ -22,10 +22,12 @@ override_dh_auto_configure:
 	cd debian/build && meson --prefix=/usr ../..
 
 override_dh_auto_build:
-	cd debian/build && ninja -v
+	cd debian/build && ninja -v && ninja build
 
 override_dh_auto_test:
 	cd debian/build && ninja test
 
 override_dh_auto_install:
 	cd debian/build && DESTDIR=${CURDIR}/debian/com.github.writeas.writeas-gtk ninja install
+	mkdir -p debian/com.github.writeas.writeas-gtk/usr/bin
+	cp bin/writeas debian/com.github.writeas.writeas-gtk/usr/bin/