GNOME.org
 

[evince] Improve appdata and rename assets to app-id

commit 47136ec9deb5d0a99125864107426cbc6ac0c38a
Author: Nick Richards <nick endlessm com>
Date:   Mon Jun 4 19:16:56 2018 +0100

    Improve appdata and rename assets to app-id

 Makefile.am                                        |   2 +-
 configure.ac                                       |   4 +-
 data/Makefile.am                                   |   4 +-
 data/icons/16x16/apps/Makefile.am                  |   2 +-
 .../apps/{evince.png => org.gnome.Evince.png}      | Bin
 data/icons/22x22/apps/Makefile.am                  |   2 +-
 .../apps/{evince.png => org.gnome.Evince.png}      | Bin
 data/icons/24x24/apps/Makefile.am                  |   2 +-
 .../apps/{evince.png => org.gnome.Evince.png}      | Bin
 data/icons/256x256/apps/Makefile.am                |   2 +-
 .../apps/{evince.png => org.gnome.Evince.png}      | Bin
 data/icons/48x48/apps/Makefile.am                  |   2 +-
 .../apps/{evince.png => org.gnome.Evince.png}      | Bin
 data/icons/symbolic/apps/Makefile.am               |   2 +-
 ...-symbolic.svg => org.gnome.Evince-symbolic.svg} |   0
 ...in => org.gnome.Evince-previewer.desktop.in.in} |   0
 ...esktop.in.in => org.gnome.Evince.desktop.in.in} |   2 +-
 ...ince.service.in => org.gnome.Evince.service.in} |   0
 data/org.gnome.evince.Daemon.service.in            |   2 +-
 data/screenshots/evince-1.png                      | Bin 0 -> 552082 bytes
 data/screenshots/evince-2.png                      | Bin 0 -> 897677 bytes
 evince.appdata.xml.in                              |  46 ------------
 org.gnome.Evince.appdata.xml.in                    |  81 +++++++++++++++++++++
 23 files changed, 94 insertions(+), 59 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index df1e9060..28df42b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ header_DATA = \
 # Appdata files
 
 appdatadir = $(datadir)/metainfo
-appdata_in_files = evince.appdata.xml.in
+appdata_in_files = org.gnome.Evince.appdata.xml.in
 nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
diff --git a/configure.ac b/configure.ac
index 4f93bf43..eb86d3ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -953,8 +953,8 @@ cut-n-paste/unarr/Makefile
 cut-n-paste/unarr/common/Makefile
 cut-n-paste/unarr/lzmasdk/Makefile
 cut-n-paste/unarr/rar/Makefile
-data/evince.desktop.in
-data/evince-previewer.desktop.in
+data/org.gnome.Evince.desktop.in
+data/org.gnome.Evince-previewer.desktop.in
 data/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 44fcf332..e254b3de 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,7 +23,7 @@ ui_DATA =                             \
 
 @INTLTOOL_DESKTOP_RULE@
 
-DESKTOP_IN_FILES= evince.desktop.in.in evince-previewer.desktop.in.in
+DESKTOP_IN_FILES= org.gnome.Evince.desktop.in.in org.gnome.Evince-previewer.desktop.in.in
 DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 
 desktopdir = $(datadir)/applications
@@ -37,7 +37,7 @@ servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.evince.Daemon.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
-systemd_user_in_files = evince.service.in
+systemd_user_in_files = org.gnome.Evince.service.in
 
 if WITH_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
index f23ab1a5..68d72ca5 100644
--- a/data/icons/16x16/apps/Makefile.am
+++ b/data/icons/16x16/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       evince.png
+       org.gnome.Evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/16x16/apps/evince.png b/data/icons/16x16/apps/org.gnome.Evince.png
similarity index 100%
rename from data/icons/16x16/apps/evince.png
rename to data/icons/16x16/apps/org.gnome.Evince.png
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
index 30c03967..5bd24083 100644
--- a/data/icons/22x22/apps/Makefile.am
+++ b/data/icons/22x22/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       evince.png
+       org.gnome.Evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/22x22/apps/evince.png b/data/icons/22x22/apps/org.gnome.Evince.png
similarity index 100%
rename from data/icons/22x22/apps/evince.png
rename to data/icons/22x22/apps/org.gnome.Evince.png
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
index ff718d9a..9fbd116a 100644
--- a/data/icons/24x24/apps/Makefile.am
+++ b/data/icons/24x24/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       evince.png
+       org.gnome.Evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/24x24/apps/evince.png b/data/icons/24x24/apps/org.gnome.Evince.png
similarity index 100%
rename from data/icons/24x24/apps/evince.png
rename to data/icons/24x24/apps/org.gnome.Evince.png
diff --git a/data/icons/256x256/apps/Makefile.am b/data/icons/256x256/apps/Makefile.am
index 9b7039e0..5b14e801 100644
--- a/data/icons/256x256/apps/Makefile.am
+++ b/data/icons/256x256/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       evince.png
+       org.gnome.Evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/256x256/apps/evince.png b/data/icons/256x256/apps/org.gnome.Evince.png
similarity index 100%
rename from data/icons/256x256/apps/evince.png
rename to data/icons/256x256/apps/org.gnome.Evince.png
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
index 8fb3b67b..f8428fa8 100644
--- a/data/icons/48x48/apps/Makefile.am
+++ b/data/icons/48x48/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       evince.png
+       org.gnome.Evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/48x48/apps/evince.png b/data/icons/48x48/apps/org.gnome.Evince.png
similarity index 100%
rename from data/icons/48x48/apps/evince.png
rename to data/icons/48x48/apps/org.gnome.Evince.png
diff --git a/data/icons/symbolic/apps/Makefile.am b/data/icons/symbolic/apps/Makefile.am
index d6f1837e..220b16e0 100644
--- a/data/icons/symbolic/apps/Makefile.am
+++ b/data/icons/symbolic/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       evince-symbolic.svg
+       org.gnome.Evince-symbolic.svg
 
 noinst_DATA =
 
diff --git a/data/icons/symbolic/apps/evince-symbolic.svg 
b/data/icons/symbolic/apps/org.gnome.Evince-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/apps/evince-symbolic.svg
rename to data/icons/symbolic/apps/org.gnome.Evince-symbolic.svg
diff --git a/data/evince-previewer.desktop.in.in b/data/org.gnome.Evince-previewer.desktop.in.in
similarity index 100%
rename from data/evince-previewer.desktop.in.in
rename to data/org.gnome.Evince-previewer.desktop.in.in
diff --git a/data/evince.desktop.in.in b/data/org.gnome.Evince.desktop.in.in
similarity index 95%
rename from data/evince.desktop.in.in
rename to data/org.gnome.Evince.desktop.in.in
index fbc3bf8a..54346871 100644
--- a/data/evince.desktop.in.in
+++ b/data/org.gnome.Evince.desktop.in.in
@@ -7,7 +7,7 @@ Exec=evince %U
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=evince
+Icon=org.gnome.Evince
 X-GNOME-DocPath=
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=evince
diff --git a/data/evince.service.in b/data/org.gnome.Evince.service.in
similarity index 100%
rename from data/evince.service.in
rename to data/org.gnome.Evince.service.in
diff --git a/data/org.gnome.evince.Daemon.service.in b/data/org.gnome.evince.Daemon.service.in
index 4a392827..c1cd81c3 100644
--- a/data/org.gnome.evince.Daemon.service.in
+++ b/data/org.gnome.evince.Daemon.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.gnome.evince.Daemon
 Exec=@libexecdir@/evinced
-@if_systemd_service@SystemdService=evince.service
+@if_systemd_service@SystemdService=org.gnome.Evince.service
diff --git a/data/screenshots/evince-1.png b/data/screenshots/evince-1.png
new file mode 100644
index 00000000..53c942c3
Binary files /dev/null and b/data/screenshots/evince-1.png differ
diff --git a/data/screenshots/evince-2.png b/data/screenshots/evince-2.png
new file mode 100644
index 00000000..794c7d3c
Binary files /dev/null and b/data/screenshots/evince-2.png differ
diff --git a/org.gnome.Evince.appdata.xml.in b/org.gnome.Evince.appdata.xml.in
new file mode 100644
index 00000000..6a2e0d9a
--- /dev/null
+++ b/org.gnome.Evince.appdata.xml.in
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2014 Christian Persch
+
+  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 2, or (at your option)
+  any later version.
+
+  This program is distributed in the hope conf 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 <http://www.gnu.org/licenses/>.
+-->
+<component type="desktop-application">
+  <id>org.gnome.Evince</id>
+  <launchable type="desktop-id">org.gnome.Evince.desktop</launchable>
+  <metadata_license>GPL-2.0+</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <_name>Evince</_name>
+  <_summary>Document viewer for popular document formats</_summary>
+  <description>
+    <_p>A document viewer for the GNOME desktop. You can view, search or annotate documents in many 
different formats.</_p>
+    <_p>Evince supports documents in: PDF, PS, EPS, XPS, DjVu, TIFF, DVI (with SyncTeX), and Comic Books 
archives (CBR, CBT, CBZ, CB7).</_p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+    <image>https://gitlab.gnome.org/evince/raw/master/data/screenshots/evince-1.png</image>
+    <_caption>A clear, simple UI</_caption>
+    </screenshot>
+    <screenshot>
+    <image>https://gitlab.gnome.org/evince/raw/master/data/screenshots/evince-2.png</image>
+    <_caption>Advanced highlighting and annotation</_caption>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://wiki.gnome.org/Apps/Evince</url>
+  <url type="bugtracker">https://wiki.gnome.org/Apps/Evince/ReportingBugs</url>
+  <url type="translate">https://wiki.gnome.org/TranslationProject</url>
+  <url type="donation">https://www.gnome.org/support-gnome/</url>
+  <project_group>GNOME</project_group>
+  <compulsory_for_desktop>GNOME</compulsory_for_desktop>
+  <updatecontact>https://wiki.gnome.org/Apps/Evince/ReportingBugs</updatecontact>
+  <kudos>
+    <kudo>AppMenu</kudo>
+    <kudo>ModernToolkit</kudo>
+    <kudo>UserDocs</kudo>
+  </kudos>
+  <translation type="gettext">evince</translation>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">none</content_attribute>
+    <content_attribute id="violence-fantasy">none</content_attribute>
+    <content_attribute id="violence-realistic">none</content_attribute>
+    <content_attribute id="violence-bloodshed">none</content_attribute>
+    <content_attribute id="violence-sexual">none</content_attribute>
+    <content_attribute id="violence-desecration">none</content_attribute>
+    <content_attribute id="violence-slavery">none</content_attribute>
+    <content_attribute id="violence-worship">none</content_attribute>
+    <content_attribute id="drugs-alcohol">none</content_attribute>
+    <content_attribute id="drugs-narcotics">none</content_attribute>
+    <content_attribute id="drugs-tobacco">none</content_attribute>
+    <content_attribute id="sex-nudity">none</content_attribute>
+    <content_attribute id="sex-themes">none</content_attribute>
+    <content_attribute id="sex-homosexuality">none</content_attribute>
+    <content_attribute id="sex-prostitution">none</content_attribute>
+    <content_attribute id="sex-adultery">none</content_attribute>
+    <content_attribute id="sex-appearance">none</content_attribute>
+    <content_attribute id="language-profanity">none</content_attribute>
+    <content_attribute id="language-humor">none</content_attribute>
+    <content_attribute id="language-discrimination">none</content_attribute>
+    <content_attribute id="social-chat">none</content_attribute>
+    <content_attribute id="social-info">none</content_attribute>
+    <content_attribute id="social-audio">none</content_attribute>
+    <content_attribute id="social-location">none</content_attribute>
+    <content_attribute id="social-contacts">none</content_attribute>
+    <content_attribute id="money-purchasing">none</content_attribute>
+    <content_attribute id="money-gambling">none</content_attribute>
+  </content_rating>
+</component>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]