Merge pull request #18 from writeas/include-fonts

thebaer · web-flow · commit 61ead7422c15 · 2018-12-17T22:40:11.000-05:00
Include fonts
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +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
diff --git a/debian/control b/debian/control
@@ -14,5 +14,5 @@ Standards-Version: 3.9.3
 Package: com.github.writeas.writeas-gtk
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: fonts-lora, fonts-open-sans, fonts-hack
+Recommends: fonts-open-sans, fonts-hack-ttf
 Description: A distraction free and private writing tool, with built-in publishing.
diff --git a/fonts/lora b/fonts/lora
@@ -0,0 +1 @@
+Subproject commit 4145c5b1880287fa82b04b63a7ebc4748982be0e
diff --git a/meson.build b/meson.build
@@ -13,3 +13,4 @@ run_target('build', command: 'build-cli.sh')
 
 subdir('data')
 subdir('src')
+subdir('fonts/lora')

Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,4 @@ run_target('build', command: 'build-cli.sh')`
`13`	`13`
`14`	`14`	`subdir('data')`
`15`	`15`	`subdir('src')`
	`16`	`+subdir('fonts/lora')`