Merge branch 'master' into deb-packaging

Author: thebaer

.travis.yml

@@ -35,4 +35,4 @@ script:
 
 branches:
   only:
-    - master
+    - deb-packaging

data/meson.build

@@ -11,7 +11,7 @@ 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_data('writeas-gtk.desktop',
     install_dir: join_paths(get_option('datadir'), 'applications'))
-install_data('com.github.writeas.writeas-gtk.appdata.xml',
+install_data('writeas-gtk.appdata.xml',
     install_dir: join_paths(get_option('datadir'), 'metainfo'))

…m.github.writeas.writeas-gtk.appdata.xml data/writeas-gtk.appdata.xmldata/com.github.writeas.writeas-gtk.appdata.xml renamed to data/writeas-gtk.appdata.xml data/com.github.writeas.writeas-gtk.appdata.xml renamed to data/writeas-gtk.appdata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <component type="desktop-application">
-  <id>com.github.writeas.writeas-gtk</id>
+  <id>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>com.github.writeas.writeas-gtk</binary>
+    <binary>writeas-gtk</binary>
   </provides>
 
   <screenshots>

…a/com.github.writeas.writeas-gtk.desktop data/writeas-gtk.desktopdata/com.github.writeas.writeas-gtk.desktop renamed to data/writeas-gtk.desktop data/com.github.writeas.writeas-gtk.desktop renamed to data/writeas-gtk.desktop

@@ -1,4 +1,4 @@
-Source: com.github.writeas.writeas-gtk
+Source: 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: com.github.writeas.writeas-gtk
+Package: writeas-gtk
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, writeas-cli
 Recommends: fonts-lora, fonts-open-sans, fonts-hack

debian/control

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

debian/copyright

@@ -28,4 +28,4 @@ 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
+	cd debian/build && DESTDIR=${CURDIR}/debian/writeas-gtk ninja install

debian/rules

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

meson.build

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

src/application.vala

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