[gnome-calculator] Rename the desktop and appdata files
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] Rename the desktop and appdata files
- Date: Thu, 24 Nov 2016 23:44:27 +0000 (UTC)
commit 655f64b4325c4af8a3dcb0f3bc9b22f009317742
Author: Mathieu Bridon <bochecha daitauha fr>
Date: Thu Nov 24 23:10:08 2016 +0100
Rename the desktop and appdata files
This makes them follow the reverse-DNS-like convention.
This makes Calculator work better with Flatpak which requires exported
resources to all be named according to this convention.
https://bugzilla.gnome.org/show_bug.cgi?id=775056
data/Makefile.am | 4 ++--
....xml.in => org.gnome.Calculator.appdata.xml.in} | 2 +-
....desktop.in => org.gnome.Calculator.desktop.in} | 0
po/POTFILES.in | 4 ++--
.../org.gnome.Calculator-search-provider.ini | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index d44122e..d8cb99d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,14 +2,14 @@ gsettings_SCHEMAS = org.gnome.calculator.gschema.xml
@GSETTINGS_RULES@
desktopdir = $(datadir)/applications
-desktop_in_files = gnome-calculator.desktop.in
+desktop_in_files = org.gnome.Calculator.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_XML_RULE@
appdatadir = $(datadir)/appdata
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = gnome-calculator.appdata.xml.in
+appdata_in_files = org.gnome.Calculator.appdata.xml.in
man1_MANS = gnome-calculator.1 gcalccmd.1
diff --git a/data/gnome-calculator.appdata.xml.in b/data/org.gnome.Calculator.appdata.xml.in
similarity index 98%
rename from data/gnome-calculator.appdata.xml.in
rename to data/org.gnome.Calculator.appdata.xml.in
index cc381cb..896b430 100644
--- a/data/gnome-calculator.appdata.xml.in
+++ b/data/org.gnome.Calculator.appdata.xml.in
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2013, 2016 Michael Catanzaro and contributors -->
<component type="desktop">
- <id>gnome-calculator.desktop</id>
+ <id>org.gnome.Calculator.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<_name>GNOME Calculator</_name>
diff --git a/data/gnome-calculator.desktop.in b/data/org.gnome.Calculator.desktop.in
similarity index 100%
rename from data/gnome-calculator.desktop.in
rename to data/org.gnome.Calculator.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b58dc51..86d52bf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,8 +5,8 @@
[type: gettext/glade]data/buttons-basic.ui
[type: gettext/glade]data/buttons-financial.ui
[type: gettext/glade]data/buttons-programming.ui
-data/gnome-calculator.appdata.xml.in
-data/gnome-calculator.desktop.in
+data/org.gnome.Calculator.appdata.xml.in
+data/org.gnome.Calculator.desktop.in
[type: gettext/glade]data/math-converter.ui
[type: gettext/glade]data/math-function-popover.ui
[type: gettext/glade]data/math-variable-popover.ui
diff --git a/search-provider/org.gnome.Calculator-search-provider.ini
b/search-provider/org.gnome.Calculator-search-provider.ini
index d9c65ee..97778ff 100644
--- a/search-provider/org.gnome.Calculator-search-provider.ini
+++ b/search-provider/org.gnome.Calculator-search-provider.ini
@@ -1,5 +1,5 @@
[Shell Search Provider]
-DesktopId=gnome-calculator.desktop
+DesktopId=org.gnome.Calculator.desktop
BusName=org.gnome.Calculator.SearchProvider
ObjectPath=/org/gnome/Calculator/SearchProvider
Version=2
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]