diff --git a/data/writeas-gtk.appdata.xml b/data/com.github.writeas.writeas-gtk.appdata.xml similarity index 100% rename from data/writeas-gtk.appdata.xml rename to data/com.github.writeas.writeas-gtk.appdata.xml diff --git a/data/writeas-gtk.desktop b/data/com.github.writeas.writeas-gtk.desktop similarity index 100% rename from data/writeas-gtk.desktop rename to data/com.github.writeas.writeas-gtk.desktop diff --git a/data/meson.build b/data/meson.build index 55dce34..552cd06 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,10 +1,10 @@ install_data('icons/write-as.png', install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '128x128', 'apps') ) 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')) diff --git a/debian/control b/debian/control index 8f620fd..6c37d07 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ -Source: writeas-gtk +Source: com.github.writeas.writeas-gtk Section: x11 Priority: extra Maintainer: Write.as Build-Depends: meson, debhelper (>= 9), libgtk-3-dev, libgtksourceview-3.0-dev, 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 Description: A distraction free and private writing tool, with built-in publishing. diff --git a/debian/copyright b/debian/copyright index 936746e..92fd4bc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,25 +1,25 @@ 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: * Copyright: 2018 A Bunch Tell LLC License: GPL-3.0+ License: GPL-3.0+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/rules b/debian/rules index a7d9c96..8847451 100755 --- a/debian/rules +++ b/debian/rules @@ -1,31 +1,31 @@ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # This file was extended to incorporate a Meson/Ninja build system. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: dh $@ override_dh_auto_clean: rm -rf debian/build override_dh_auto_configure: mkdir -p debian/build cd debian/build && meson --prefix=/usr ../.. override_dh_auto_build: cd debian/build && ninja -v 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 diff --git a/meson.build b/meson.build index 52a9fc3..ad8aa67 100644 --- a/meson.build +++ b/meson.build @@ -1,13 +1,13 @@ -project('writeas-gtk', ['vala', 'c'], +project('com.github.writeas.writeas-gtk', ['vala', 'c'], version: '1.0.0-beta', license: 'GPL', meson_version: '>=0.40.1') i18n = import('i18n') conf = configuration_data() conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) configure_file(output: 'config.h', configuration: conf) config_h_dir = include_directories('.') subdir('data') subdir('src') diff --git a/src/application.vala b/src/application.vala index 7ca83ef..b5968ea 100644 --- a/src/application.vala +++ b/src/application.vala @@ -1,40 +1,40 @@ /* Copyright © 2018 Write.as This file is part of the Write.as GTK desktop app. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ public class WriteAs.Application : Gtk.Application { construct { this.flags |= ApplicationFlags.HANDLES_OPEN; 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() { if (get_windows().length() == 0) new WriteAs.MainWindow(this).show_all(); } public override void open(File[] files, string hint) { activate(); // ensure we have a window open. } public static int main(string[] args) { return new WriteAs.Application().run(args); } }