Diffusion Amarok c55055964613

Merge remote-tracking branch 'origin/master' into kf5
c55055964613
Actions

Authored by ltoscano on Aug 17 2017, 3:58 PM.

Description

Merge remote-tracking branch 'origin/master' into kf5

Also, use the ${KDE_INSTALL_METAINFODIR} as destination for the
appdata file.

Details

Committed

ltoscano

Aug 17 2017, 3:58 PM

Parents

R181:2702bb8821b1: SVN_SILENT made messages (.desktop file) - always resolve ours
R181:323e2d5b4324: Fix build

Branches

Unknown

Tags

Unknown

ltoscano committed R181:c55055964613: Merge remote-tracking branch 'origin/master' into kf5 (authored by ltoscano).Aug 17 2017, 3:58 PM

Merged Changes

Commit	Author	Details	Committed
2702bb8821b1	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 14 2017
59af19310a3a	l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 28 2017
0340ec23f4df	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 10 2017
09a93983ea34	l10n daemon script	GIT_SILENT made messages (after extraction)	May 8 2017
bb067eedf4f0	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 23 2017
632897f77381	l10n daemon script	GIT_SILENT made messages (after extraction)	Apr 23 2017
2d4cd36dce12	l10n daemon script	GIT_SILENT made messages (after extraction)	Apr 15 2017
1ca02962351d	l10n daemon script	GIT_SILENT made messages (after extraction)	Apr 7 2017
18b7d8690f28	l10n daemon script	GIT_SILENT made messages (after extraction)	Mar 25 2017
e9654abfca01	l10n daemon script	GIT_SILENT made messages (after extraction)	Mar 22 2017
7c6458bf79d0	l10n daemon script	GIT_SILENT made messages (after extraction)	Mar 19 2017
e315605e95af	l10n daemon script	GIT_SILENT made messages (after extraction)	Mar 18 2017
679d8454a72f	ltoscano	Fix appdata: add the required <summary/> tag	Mar 16 2017
3d549a32e131	l10n daemon script	GIT_SILENT made messages (after extraction)	Feb 28 2017
22e0ac2baf09	ltoscano	Add namespace to desktop and appdata files	Feb 26 2017
ef181ce2e43a	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Feb 23 2017
32de65770090	Giuseppe Silletti/heikobecker	Fix Gpodder credential service without kwallet	Feb 17 2017

Changes (16)

				Path	Packages
	M			src/CMakeLists.txt
	V			src/{amarok.appdata.xml → org.kde.amarok.appdata.xml}
	V			src/{amarok_containers.desktop → org.kde.amarok_containers.desktop}
	M			src/amarok_plugin.desktop
	M			src/context/servicetypes/amarok_containment.desktop
	M			src/context/servicetypes/amarok_context_applet.desktop
	M			src/core-impl/collections/audiocd/amarok_collection-audiocdcollection.desktop
	M			src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.desktop
	M			src/core-impl/collections/mediadevicecollection/amarok_collection-mediadevicecollection.desktop
	M			src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop
	M			src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop
	M			src/dbus/mpris2/MediaPlayer2.cpp
	V			src/{org.kde.amarok.appdata.xml ← amarok.appdata.xml}
	V			src/{org.kde.amarok_containers.desktop ← amarok_containers.desktop}
	M			src/scripting/scripts/librivox_service/script.desktop
	M			src/services/gpodder/GpodderServiceConfig.cpp