diff --git a/data/com.github.alcinnz.odysseus-web.appdata.xml b/data/com.github.alcinnz.odysseus.appdata.xml similarity index 97% rename from data/com.github.alcinnz.odysseus-web.appdata.xml rename to data/com.github.alcinnz.odysseus.appdata.xml index 1dac699..155945d 100644 --- a/data/com.github.alcinnz.odysseus-web.appdata.xml +++ b/data/com.github.alcinnz.odysseus.appdata.xml @@ -1,6 +1,6 @@ - com.github.alcinnz.odysseus-web.desktop + com.github.alcinnz.odysseus.desktop CC0 GPL-3.0+ Odysseus @@ -56,7 +56,7 @@ - com.github.alcinnz.odysseus-web + com.github.alcinnz.odysseus diff --git a/data/com.github.alcinnz.odysseus-web.desktop b/data/com.github.alcinnz.odysseus.desktop similarity index 73% rename from data/com.github.alcinnz.odysseus-web.desktop rename to data/com.github.alcinnz.odysseus.desktop index 1056291..1c96dbf 100644 --- a/data/com.github.alcinnz.odysseus-web.desktop +++ b/data/com.github.alcinnz.odysseus.desktop @@ -2,8 +2,8 @@ Type=Application Name=Odysseus Comment=Surf knowledge, entertainment, and services on The Web -Exec=com.github.alcinnz.odysseus-web %U -Icon=com.github.alcinnz.odysseus-web +Exec=com.github.alcinnz.odysseus %U +Icon=com.github.alcinnz.odysseus Terminal=false Categories=Network;WebBrowser;GTK;GNOME; # TRANSLATORS This is a semicolon list of keywords for this application @@ -15,8 +15,8 @@ X-GNOME-UsesNotifications=true [Desktop Action NewWindow] Name=New Window -Exec=com.github.alcinnz.odysseus-web odysseus:NewWindow +Exec=com.github.alcinnz.odysseus odysseus:NewWindow [Desktop Action NewTab] Name=New Tab -Exec=com.github.alcinnz.odysseus-web odysseus:home +Exec=com.github.alcinnz.odysseus odysseus:home diff --git a/data/icons/128/com.github.alcinnz.odysseus-web.svg b/data/icons/128/com.github.alcinnz.odysseus.svg similarity index 100% rename from data/icons/128/com.github.alcinnz.odysseus-web.svg rename to data/icons/128/com.github.alcinnz.odysseus.svg diff --git a/data/icons/16/com.github.alcinnz.odysseus-web.svg b/data/icons/16/com.github.alcinnz.odysseus.svg similarity index 100% rename from data/icons/16/com.github.alcinnz.odysseus-web.svg rename to data/icons/16/com.github.alcinnz.odysseus.svg diff --git a/data/icons/24/com.github.alcinnz.odysseus-web.svg b/data/icons/24/com.github.alcinnz.odysseus.svg similarity index 100% rename from data/icons/24/com.github.alcinnz.odysseus-web.svg rename to data/icons/24/com.github.alcinnz.odysseus.svg diff --git a/data/icons/256/com.github.alcinnz.odysseus-web.svg b/data/icons/256/com.github.alcinnz.odysseus.svg similarity index 100% rename from data/icons/256/com.github.alcinnz.odysseus-web.svg rename to data/icons/256/com.github.alcinnz.odysseus.svg diff --git a/data/icons/32/com.github.alcinnz.odysseus-web.svg b/data/icons/32/com.github.alcinnz.odysseus.svg similarity index 100% rename from data/icons/32/com.github.alcinnz.odysseus-web.svg rename to data/icons/32/com.github.alcinnz.odysseus.svg diff --git a/data/icons/48/com.github.alcinnz.odysseus-web.svg b/data/icons/48/com.github.alcinnz.odysseus.svg similarity index 100% rename from data/icons/48/com.github.alcinnz.odysseus-web.svg rename to data/icons/48/com.github.alcinnz.odysseus.svg diff --git a/data/icons/64/com.github.alcinnz.odysseus-web.svg b/data/icons/64/com.github.alcinnz.odysseus.svg similarity index 100% rename from data/icons/64/com.github.alcinnz.odysseus-web.svg rename to data/icons/64/com.github.alcinnz.odysseus.svg diff --git a/data/meson.build b/data/meson.build index e65e64c..f3d8a0e 100644 --- a/data/meson.build +++ b/data/meson.build @@ -2,7 +2,7 @@ icon_sizes = ['16', '24', '32', '48', '64', '128', '256'] foreach i : icon_sizes install_data( - join_paths('icons', i, 'com.github.alcinnz.odysseus-web.svg'), + join_paths('icons', i, 'com.github.alcinnz.odysseus.svg'), install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps') ) endforeach @@ -18,11 +18,11 @@ endforeach TODO = 'Apply internationalization to these' install_data( - 'com.github.alcinnz.odysseus-web.desktop', + 'com.github.alcinnz.odysseus.desktop', install_dir: join_paths(get_option('datadir'), 'applications') ) install_data( - 'com.github.alcinnz.odysseus-web.appdata.xml', + 'com.github.alcinnz.odysseus.appdata.xml', install_dir: join_paths(get_option('datadir'), 'metainfo') ) diff --git a/debian/changelog b/debian/changelog index b10ac9d..ae4507f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -com.github.alcinnz.odysseus-web (1.0.0) precise; urgency=low +com.github.alcinnz.odysseus (1.0.0) precise; urgency=low * Initial Release. diff --git a/debian/control b/debian/control index 2cfcb22..3f660f7 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: com.github.alcinnz.odysseus-web +Source: com.github.alcinnz.odysseus Section: x11 Priority: extra Maintainer: Adrian Cochrane @@ -14,7 +14,7 @@ Build-Depends: meson, libunity-dev (>= 7.1.4) Standards-Version: 3.9.3 -Package: com.github.alcinnz.odysseus-web +Package: com.github.alcinnz.odysseus Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: The Web Browser designed specifically for elementary OS! diff --git a/debian/rules b/debian/rules index 0d94cb7..70a5cc5 100755 --- a/debian/rules +++ b/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/com.github.alcinnz.odysseus-web ninja install + cd debian/build && DESTDIR=${CURDIR}/debian/com.github.alcinnz.odysseus ninja install diff --git a/meson.build b/meson.build index e6e7bf0..9937d17 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('com.github.alcinnz.odysseus-web', ['vala', 'c'], +project('com.github.alcinnz.odysseus', ['vala', 'c'], version: '1.0.0', license: 'GNU', meson_version: '>=0.40.1') diff --git a/src/Odysseus.vala b/src/Odysseus.vala index effcce6..ae32b72 100644 --- a/src/Odysseus.vala +++ b/src/Odysseus.vala @@ -17,14 +17,13 @@ public class Odysseus.Application : Granite.Application { construct { this.flags |= ApplicationFlags.HANDLES_OPEN; - application_id = "io.github.alcinnz.Odysseus"; Intl.setlocale (LocaleCategory.ALL, ""); Intl.textdomain ("odysseus"); - app_launcher = "com.github.alcinnz.odysseus-web.desktop"; + app_launcher = "com.github.alcinnz.odysseus.desktop"; program_name = "Odysseus"; build_version = "0.3"; - exec_name = application_id = "com.github.alcinnz.odysseus-web"; + exec_name = application_id = "com.github.alcinnz.odysseus"; } private static Odysseus.Application _instance = null; diff --git a/src/Traits/download-progress.vala b/src/Traits/download-progress.vala index 556f82f..84b8fe5 100644 --- a/src/Traits/download-progress.vala +++ b/src/Traits/download-progress.vala @@ -22,7 +22,7 @@ Specifially it renders download progress onto the app icon namespace Odysseus.Traits { public void show_download_progress_on_icon(Download dl) { var launcher = Unity.LauncherEntry.get_for_desktop_file( - "com.github.alcinnz.odysseus-web.desktop"); + "com.github.alcinnz.odysseus.desktop"); dl.received_data.connect(() => { Idle.add(() => { var downloads = DownloadSet.get_downloads().downloads; diff --git a/src/meson.build b/src/meson.build index 8fbdf56..1265aad 100644 --- a/src/meson.build +++ b/src/meson.build @@ -58,7 +58,7 @@ endforeach c_args = ['-include', 'config.h'] posix_dep = meson.get_compiler('vala').find_library('posix') -executable('com.github.alcinnz.odysseus-web', +executable('com.github.alcinnz.odysseus', source_files, c_args: c_args,