Yann Leboulanger pushed to branch master at gajim / gajim
Commits: 15d83402 by André Apitzsch at 2017-04-18T21:19:15+02:00 use 'reverse DNS' convention for desktop and icon files
see https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.htm...
- - - - - 25f40386 by Yann Leboulanger at 2017-04-22T17:26:57+02:00 Merge branch 'reverseDNS' into 'master'
use 'reverse DNS' convention for desktop and icon files
See merge request !84 - - - - -
9 changed files:
- .gitignore - autogen.sh - configure.ac - data/Makefile.am - data/gajim.desktop.in.in → data/org.gajim.Gajim.desktop.in.in - icons/Makefile.am - icons/hicolor/128x128/apps/gajim.png → icons/hicolor/128x128/apps/org.gajim.Gajim.png - icons/hicolor/64x64/apps/gajim.png → icons/hicolor/64x64/apps/org.gajim.Gajim.png - icons/hicolor/scalable/apps/gajim.svg → icons/hicolor/scalable/apps/org.gajim.Gajim.svg
Changes:
===================================== .gitignore ===================================== --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ syntax: glob *~ autom4te.cache data/defs.py -data/gajim.desktop +data/org.gajim.Gajim.desktop libtool po/.intltool-merge-cache po/POTFILES
===================================== autogen.sh ===================================== --- a/autogen.sh +++ b/autogen.sh @@ -5,10 +5,10 @@ echo "[encoding: UTF-8]" > po/POTFILES.in \ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ 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 >> \ 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 ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip fi
===================================== configure.ac ===================================== --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AC_CONFIG_FILES([ data/moods/Makefile data/activities/Makefile icons/Makefile - data/gajim.desktop.in + data/org.gajim.Gajim.desktop.in data/gajim-remote.desktop.in data/defs.py src/Makefile
===================================== data/Makefile.am ===================================== --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = gui emoticons pixmaps iconsets moods activities @INTLTOOL_DESKTOP_RULE@
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)
installdefsdir = $(gajim_srcdir)/common @@ -29,6 +29,6 @@ EXTRA_DIST = $(desktop_in_files) \ DISTCLEANFILES = $(desktop_DATA) \ $(installdefs_DATA)
-CLEANFILES = gajim.desktop gajim-remote.desktop +CLEANFILES = org.gajim.Gajim.desktop gajim-remote.desktop
MAINTAINERCLEANFILES = Makefile.in
===================================== data/gajim.desktop.in.in → data/org.gajim.Gajim.desktop.in.in ===================================== --- a/data/gajim.desktop.in.in +++ b/data/org.gajim.Gajim.desktop.in.in @@ -6,7 +6,7 @@ _Comment=A GTK+ Jabber client _Keywords=chat;messaging;im;xmpp;bonjour;voip; Version=1.0 Exec=gajim -Icon=gajim +Icon=org.gajim.Gajim StartupNotify=true StartupWMClass=Gajim Terminal=false
===================================== icons/Makefile.am ===================================== --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -2,6 +2,6 @@ iconsdir = $(pkgdatadir)/icons nobase_dist_icons_DATA = $(srcdir)/*/*/*/*
systemiconsdir = $(datadir)/icons -nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/gajim.* +nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/org.gajim.Gajim.*
MAINTAINERCLEANFILES = Makefile.in
===================================== icons/hicolor/128x128/apps/gajim.png → icons/hicolor/128x128/apps/org.gajim.Gajim.png ===================================== Binary files a/icons/hicolor/128x128/apps/gajim.png and b/icons/hicolor/128x128/apps/org.gajim.Gajim.png differ
===================================== icons/hicolor/64x64/apps/gajim.png → icons/hicolor/64x64/apps/org.gajim.Gajim.png ===================================== Binary files a/icons/hicolor/64x64/apps/gajim.png and b/icons/hicolor/64x64/apps/org.gajim.Gajim.png differ
===================================== icons/hicolor/scalable/apps/gajim.svg → icons/hicolor/scalable/apps/org.gajim.Gajim.svg ===================================== --- a/icons/hicolor/scalable/apps/gajim.svg +++ b/icons/hicolor/scalable/apps/org.gajim.Gajim.svg
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0b0812bb757b37eb3f5a10c70185602b19...