Rename my RDNN again since Houston's database has been corrected.

data/com.github.alcinnz.odysseus-web.appdata.xml → data/com.github.alcinnz.odysseus.appdata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <component type="desktop-application">
-  <id>com.github.alcinnz.odysseus-web.desktop</id>
+  <id>com.github.alcinnz.odysseus.desktop</id>
   <metadata_license>CC0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Odysseus</name>
@@ -56,7 +56,7 @@
   </custom>
 
   <provides>
-    <binary>com.github.alcinnz.odysseus-web</binary>
+    <binary>com.github.alcinnz.odysseus</binary>
   </provides>
 
   <releases>

data/com.github.alcinnz.odysseus-web.desktop → 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

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')
 )

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.
 

debian/control

@@ -1,4 +1,4 @@
-Source: com.github.alcinnz.odysseus-web
+Source: com.github.alcinnz.odysseus
 Section: x11
 Priority: extra
 Maintainer: Adrian Cochrane <[email protected]>
@@ -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!

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

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')

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;

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;

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,