Merge branch 'master-code'

This reverts commit 67b6198b5e.

data/writeas-gtk.appdata.xml → data/com.github.writeas.writeas-gtk.appdata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <component type="desktop-application">
-  <id>writeas-gtk</id>
+  <id>com.github.writeas.writeas-gtk</id>
   <project_license>GPL-3.0+</project_license>
   <metadata_license>CC0</metadata_license>
   <name>Write.as</name>
@@ -28,7 +28,7 @@
   <update_contact>hello@write.as</update_contact>
 
   <provides>
-    <binary>writeas-gtk</binary>
+    <binary>com.github.writeas.writeas-gtk</binary>
   </provides>
 
   <screenshots>
@@ -77,6 +77,15 @@
     <content_attribute id="money-gambling">none</content_attribute>
   </content_rating>
   <releases>
+    <release version="1.0.1" date="2018-12-14">
+      <description>
+         <p>GTK updates and fixes.</p>
+         <ul>
+           <li>Fix fonts, padding, cursor color</li>
+           <li>Increase the default font size</li>
+         </ul>
+      </description>
+    </release>
     <release version="1.0.0" date="2018-10-01">
       <description>
          <p>Initial release</p>

data/writeas-gtk.desktop → data/com.github.writeas.writeas-gtk.desktop

@@ -2,8 +2,8 @@
 Type=Application
 Name=Write.as
 Comment=Publish a thought in seconds.
-Exec=writeas-gtk
-Icon=write-as
+Exec=com.github.writeas.writeas-gtk
+Icon=com.github.writeas.writeas-gtk
 Terminal=false
 MimeType=
 Categories=GTK;Office;Publishing;

data/meson.build

@@ -1,10 +1,18 @@
-install_data('icons/write-as.png',
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '128x128', 'apps')
-)
+icon_sizes = ['16', '24', '32', '48', '64', '128']
+
+foreach i : icon_sizes
+    install_data(
+        join_paths('icons', i, meson.project_name() + '.png'),
+            install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps'
+        )
+    )
+endforeach
+
 install_data('icons/writeas-bright-dark.png',
     install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '16x16', 'actions'))
 
-install_data('writeas-gtk.desktop',
+install_data('com.github.writeas.writeas-gtk.desktop',
     install_dir: join_paths(get_option('datadir'), 'applications'))
-install_data('writeas-gtk.appdata.xml',
+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'))

debian/changelog

@@ -1,3 +1,10 @@
+writeas-gtk (1.0.1-2) xenial; urgency=medium
+
+  * Fix fonts, padding, cursor color
+  * Increase the default font size
+
+ -- Write.as <hello@write.as>  Fri, 14 Dec 2018 15:22:09 -0500
+
 writeas-gtk (1.0.0-1) xenial; urgency=medium
 
   * Initial Release.

debian/control

@@ -1,4 +1,4 @@
-Source: writeas-gtk
+Source: com.github.writeas.writeas-gtk
 Section: x11
 Priority: extra
 Maintainer: Write.as <hello@write.as>
@@ -9,7 +9,7 @@ Build-Depends: meson,
                valac (>= 0.36)
 Standards-Version: 3.9.3
 
-Package: writeas-gtk
+Package: com.github.writeas.writeas-gtk
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, writeas-cli
 Recommends: fonts-lora, fonts-open-sans, fonts-hack

debian/copyright

@@ -1,5 +1,5 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: writeas-gtk
+Upstream-Name: com.github.writeas.writeas-gtk
 Source: https://code.as/writeas/writeas-gtk/
 
 Files: *

debian/rules

@@ -28,4 +28,4 @@ override_dh_auto_test:
 	cd debian/build && ninja test
 
 override_dh_auto_install:
-	cd debian/build && DESTDIR=${CURDIR}/debian/writeas-gtk ninja install
+	cd debian/build && DESTDIR=${CURDIR}/debian/com.github.writeas.writeas-gtk ninja install

meson.build

@@ -1,5 +1,5 @@
-project('writeas-gtk', ['vala', 'c'],
-    version: '1.0.0',
+project('com.github.writeas.writeas-gtk', ['vala', 'c'],
+    version: '1.0.1',
     license: 'GPL',
     meson_version: '>=0.40.1')
 

src/application.vala

@@ -22,7 +22,7 @@ public class WriteAs.Application : Gtk.Application {
         Intl.setlocale(LocaleCategory.ALL, "");
         Intl.textdomain("write.as");
 
-        application_id = "writeas-gtk.desktop";
+        application_id = "com.github.writeas.writeas-gtk.desktop";
     }
 
     public override void activate() {

src/meson.build

@@ -1,4 +1,4 @@
-executable('writeas-gtk',
+executable('com.github.writeas.writeas-gtk',
     'application.vala',
     'window.vala',
 

src/window.vala

@@ -22,7 +22,7 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
     private Gtk.ToggleButton darkmode_button;
 
     private static string data_dir = ".writeas";
-    private static string version = "1.0.0";
+    private static string version = "1.0.1";
 
     private int font_size = 16;
     private bool dark_mode = false;
@@ -79,7 +79,7 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
         stdout.printf("writeas-gtk v%s\n", version);
 
         set_application(app);
-        icon_name = "write-as";
+        icon_name = "com.github.writeas.writeas-gtk";
         init_folder();
         try {
             open_file(draft_file());