use 'reverse DNS' convention for desktop and icon files

see https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html
This commit is contained in:
André Apitzsch 2017-04-18 21:19:15 +02:00
parent 86e29fb7f4
commit 15d834025c
9 changed files with 8 additions and 8 deletions

2
.gitignore vendored
View File

@ -9,7 +9,7 @@ syntax: glob
*~ *~
autom4te.cache autom4te.cache
data/defs.py data/defs.py
data/gajim.desktop data/org.gajim.Gajim.desktop
libtool libtool
po/.intltool-merge-cache po/.intltool-merge-cache
po/POTFILES po/POTFILES

View File

@ -5,10 +5,10 @@
echo "[encoding: UTF-8]" > po/POTFILES.in \ echo "[encoding: UTF-8]" > po/POTFILES.in \
&& for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
po/POTFILES.in; done \ po/POTFILES.in; done \
&& ls -1 data/gajim.desktop.in.in data/gajim-remote.desktop.in.in \ && ls -1 data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \
po/POTFILES.in \ po/POTFILES.in \
&& echo -e "data/gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1
if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then
ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip
fi fi

View File

@ -72,7 +72,7 @@ AC_CONFIG_FILES([
data/moods/Makefile data/moods/Makefile
data/activities/Makefile data/activities/Makefile
icons/Makefile icons/Makefile
data/gajim.desktop.in data/org.gajim.Gajim.desktop.in
data/gajim-remote.desktop.in data/gajim-remote.desktop.in
data/defs.py data/defs.py
src/Makefile src/Makefile

View File

@ -2,7 +2,7 @@ SUBDIRS = gui emoticons pixmaps iconsets moods activities
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_in_files = gajim.desktop.in.in gajim-remote.desktop.in.in desktop_in_files = org.gajim.Gajim.desktop.in.in gajim-remote.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
installdefsdir = $(gajim_srcdir)/common installdefsdir = $(gajim_srcdir)/common
@ -29,6 +29,6 @@ EXTRA_DIST = $(desktop_in_files) \
DISTCLEANFILES = $(desktop_DATA) \ DISTCLEANFILES = $(desktop_DATA) \
$(installdefs_DATA) $(installdefs_DATA)
CLEANFILES = gajim.desktop gajim-remote.desktop CLEANFILES = org.gajim.Gajim.desktop gajim-remote.desktop
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

View File

@ -6,7 +6,7 @@ _Comment=A GTK+ Jabber client
_Keywords=chat;messaging;im;xmpp;bonjour;voip; _Keywords=chat;messaging;im;xmpp;bonjour;voip;
Version=1.0 Version=1.0
Exec=gajim Exec=gajim
Icon=gajim Icon=org.gajim.Gajim
StartupNotify=true StartupNotify=true
StartupWMClass=Gajim StartupWMClass=Gajim
Terminal=false Terminal=false

View File

@ -2,6 +2,6 @@ iconsdir = $(pkgdatadir)/icons
nobase_dist_icons_DATA = $(srcdir)/*/*/*/* nobase_dist_icons_DATA = $(srcdir)/*/*/*/*
systemiconsdir = $(datadir)/icons systemiconsdir = $(datadir)/icons
nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/gajim.* nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/org.gajim.Gajim.*
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB