[rhythmbox/wip/hadess/update-app-id: 2/2] all: Update rhythmbox-device launcher name




commit e941e3167f83ded9e166db2c21f978b919c0b4cf
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 23 16:45:53 2020 +0200

    all: Update rhythmbox-device launcher name
    
    Prefix the rhythmbox-device .desktop file with the application ID so
    that it gets exported when built via Flatpak.
    
    No functional changes.

 .gitignore                                                        | 2 +-
 configure.ac                                                      | 2 +-
 data/Makefile.am                                                  | 8 ++++----
 ...ce.desktop.in.in => org.gnome.Rhythmbox3.device.desktop.in.in} | 0
 po/POTFILES.in                                                    | 2 +-
 po/POTFILES.skip                                                  | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 559f6072e..a2240dc08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,7 @@ bindings/gi/RB-3.0.typelib
 org.gnome.Rhythmbox3.service
 *.desktop
 org.gnome.Rhythmbox3.desktop.in
-rhythmbox-device.desktop.in
+org.gnome.Rhythmbox3.device.desktop.in
 playlists.xml
 gschemas.compiled
 org.gnome.rhythmbox.gschema.valid
diff --git a/configure.ac b/configure.ac
index 9432612f0..87b702732 100644
--- a/configure.ac
+++ b/configure.ac
@@ -668,7 +668,7 @@ podcast/Makefile
 shell/Makefile
 data/Makefile
 data/org.gnome.Rhythmbox3.desktop.in
-data/rhythmbox-device.desktop.in
+data/org.gnome.Rhythmbox3.device.desktop.in
 data/ui/Makefile
 data/icons/Makefile
 data/icons/hicolor/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 215c4aab3..610dd52c9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = ui icons
 @INTLTOOL_DESKTOP_RULE@
 
 Multimediadir = $(datadir)/applications
-Multimedia_in_files = org.gnome.Rhythmbox3.desktop.in rhythmbox-device.desktop.in
+Multimedia_in_files = org.gnome.Rhythmbox3.desktop.in org.gnome.Rhythmbox3.device.desktop.in
 Multimedia_DATA = $(Multimedia_in_files:.desktop.in=.desktop)
 
 playlists_in_files = playlists.xml.in
@@ -61,14 +61,14 @@ EXTRA_DIST = $(service_in_files)    \
             $(profiles_DATA)       \
             $(appdata_in_files)    \
             org.gnome.Rhythmbox3.desktop.in.in \
-            rhythmbox-device.desktop.in.in
+            org.gnome.Rhythmbox3.device.desktop.in.in
 
 CLEANFILES =                                   \
        org.gnome.Rhythmbox3.desktop                    \
-       rhythmbox-device.desktop                \
+       org.gnome.Rhythmbox3.device.desktop             \
        org.gnome.Rhythmbox3.service            \
        playlists.xml                           \
        org.gnome.Rhythmbox3.desktop.in                 \
-       rhythmbox-device.desktop.in             \
+       org.gnome.Rhythmbox3.device.desktop.in          \
        gschemas.compiled                       \
        $(appdata_DATA)
diff --git a/data/rhythmbox-device.desktop.in.in b/data/org.gnome.Rhythmbox3.device.desktop.in.in
similarity index 100%
rename from data/rhythmbox-device.desktop.in.in
rename to data/org.gnome.Rhythmbox3.device.desktop.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9e865d4c3..eb19a2e28 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,7 @@ backends/rb-player.c
 data/playlists.xml.in
 data/org.gnome.Rhythmbox3.appdata.xml.in
 data/org.gnome.Rhythmbox3.desktop.in.in
-data/rhythmbox-device.desktop.in.in
+data/org.gnome.Rhythmbox3.device.desktop.in.in
 [type: gettext/glade]data/ui/app-menu.ui
 [type: gettext/glade]data/ui/browser-popup.ui
 [type: gettext/glade]data/ui/create-playlist.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index fd281a5ca..e5aeb5833 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,10 +1,10 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
 data/org.gnome.Rhythmbox3.desktop.in
-data/rhythmbox-device.desktop.in
+data/org.gnome.Rhythmbox3.device.desktop.in
 data/org.gnome.rhythmbox.gschema.xml
 
 # these entries work around an intltool bug so distcheck passes
 # https://bugs.launchpad.net/intltool/+bug/1117944
 sub/data/org.gnome.Rhythmbox3.desktop.in
-sub/data/rhythmbox-device.desktop.in
+sub/data/org.gnome.Rhythmbox3.device.desktop.in


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]