[SCM] Amarok packaging branch, master, updated. debian/2.6-beta1+75.g47e75df-1
Modestas Vainius
modax at alioth.debian.org
Fri Jun 29 00:03:59 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=795a3d0
The following commit has been merged in the master branch:
commit 795a3d0ee360a077d39376a4384053626e55e6e1
Merge: f97a5adca20b6afeaf1d60d7c9ad3e349a1120e6 be5ff62cd54e158490dccea18c78e9bc938d6e44
Author: Modestas Vainius <modax at debian.org>
Date: Fri Jun 29 01:50:28 2012 +0300
Merge tag 'upstream/2.6_beta1+75.g47e75df'
Upstream development snapshot v2.5.90-75-g47e75df
CMakeLists.txt | 9 +-
ChangeLog | 21 +
po/af/amarok.po |30743 ++++++++--------
po/ar/amarok.po |39005 ++++++++++----------
po/ast/amarok.po |27089 +++++++-------
po/be/amarok.po |30220 ++++++++--------
po/bg/amarok.po |30204 ++++++++--------
po/bs/amarok.po |27364 +++++++-------
po/ca/amarok.po |26806 +++++++-------
po/ca at valencia/amarok.po |26911 +++++++-------
po/cs/amarok.po |28772 +++++++-------
po/csb/amarok.po |31268 ++++++++--------
po/da/amarok.po |29954 ++++++++--------
po/de/amarok.po |26434 +++++++-------
po/el/amarok.po |32934 ++++++++--------
po/en_GB/amarok.po |31145 ++++++++--------
po/eo/amarok.po |31636 ++++++++--------
po/es/amarok.po |25902 +++++++-------
po/et/amarok.po |33156 ++++++++--------
po/eu/amarok.po |30426 ++++++++--------
po/fa/amarok.po |22580 ++++++------
po/fi/amarok.po |28722 +++++++-------
po/fr/amarok.po |32907 ++++++++--------
po/ga/amarok.po |30804 ++++++++--------
po/gl/amarok.po |27517 +++++++-------
po/he/amarok.po |28370 +++++++-------
po/hr/amarok.po | 514 +-
po/hu/amarok.po |28463 +++++++-------
po/is/amarok.po |28005 +++++++-------
po/it/amarok.po |30730 ++++++++--------
po/ja/amarok.po |25858 +++++++-------
po/km/amarok.po |26718 +++++++-------
po/ko/amarok.po |31705 ++++++++--------
po/ku/amarok.po |31463 ++++++++--------
po/lt/amarok.po |26835 +++++++-------
po/lv/amarok.po |26317 +++++++-------
po/mai/amarok.po |22247 ++++++------
po/ml/amarok.po |23436 ++++++------
po/ms/amarok.po |30674 ++++++++--------
po/nb/amarok.po | 1642 +-
po/nds/amarok.po |37220 +++++++++---------
po/ne/amarok.po |39887 ++++++++++----------
po/nl/amarok.po |29003 +++++++-------
po/nn/amarok.po | 1598 +-
po/oc/amarok.po |26825 +++++++-------
po/pa/amarok.po |28446 +++++++-------
po/pl/amarok.po |28625 +++++++-------
po/pt/amarok.po |25875 +++++++-------
po/pt_BR/amarok.po |25857 +++++++-------
po/ro/amarok.po |30633 ++++++++--------
po/ru/amarok.po |32715 ++++++++--------
po/se/amarok.po | 1592 +-
po/si/amarok.po |23739 ++++++------
po/sk/amarok.po |27211 +++++++-------
po/sl/amarok.po |31598 ++++++++--------
po/sq/amarok.po |22081 ++++++------
po/sr/amarok.po | 2749 +-
po/sr at ijekavian/amarok.po | 2749 +-
po/sr at ijekavianlatin/amarok.po | 2746 +-
po/sr at latin/amarok.po | 2746 +-
po/sv/amarok.po |27391 +++++++-------
po/tg/amarok.po |21397 ++++++------
po/th/amarok.po |33915 +++++++++---------
po/tr/amarok.po | 9809 +++---
po/ug/amarok.po |21138 ++++++------
po/uk/amarok.po |29025 ++++++++-------
po/wa/amarok.po |30960 ++++++++--------
po/zh_CN/amarok.po |27951 +++++++-------
po/zh_TW/amarok.po |25773 +++++++-------
shared/Version.h | 2 +-
src/MediaDeviceCache.cpp | 43 -
src/MediaDeviceCache.h | 2 -
src/MountPointManager.cpp | 8 +
src/MountPointManager.h | 1 +
src/OpmlParser.cpp | 6 +-
src/aboutdialog/AnimatedBarWidget.cpp | 27 +-
src/aboutdialog/AnimatedBarWidget.h | 2 +
src/amarok.desktop | 8 +
src/amarok_append.desktop | 2 +-
src/amarok_containers.desktop | 8 +
src/amarokurls/BookmarkMetaActions.cpp | 2 +-
src/browsers/BrowserCategoryList.cpp | 4 +-
src/browsers/BrowserCategoryListDelegate.cpp | 2 +-
src/browsers/CollectionTreeItemModelBase.cpp | 2 +-
.../playlistbrowser/PlaylistBrowserCategory.cpp | 5 +-
.../playlistbrowser/PlaylistBrowserFilterProxy.cpp | 7 -
.../playlistbrowser/PlaylistBrowserFilterProxy.h | 1 -
.../playlistbrowser/PlaylistBrowserModel.cpp | 6 +-
.../playlistbrowser/PlaylistsByProviderProxy.cpp | 22 +-
.../playlistbrowser/PlaylistsByProviderProxy.h | 1 +
.../playlistbrowser/PlaylistsInFoldersProxy.cpp | 4 +-
src/browsers/playlistbrowser/QtGroupingProxy.cpp | 135 +-
src/browsers/playlistbrowser/QtGroupingProxy.h | 25 +-
src/context/Applet.cpp | 3 +-
src/context/ContextView.cpp | 2 +-
src/context/ContextView.h | 6 +-
src/context/applets/CMakeLists.txt | 2 +-
src/context/applets/currenttrack/CurrentTrack.cpp | 4 +-
.../labels/amarok-context-applet-labels.desktop | 1 +
.../amarok-context-applet-playlistinfo.desktop | 2 +-
...amarok-context-applet-spectrum-analyzer.desktop | 6 +
.../tabs/amarok-context-applet-tabs.desktop | 1 +
.../verticallayout/VerticalToolbarContainment.cpp | 3 +-
.../amarok-containment-vertical.desktop | 4 +-
src/context/engines/CMakeLists.txt | 2 +-
.../labels/amarok-data-engine-labels.desktop | 1 +
.../amarok-data-engine-spectrum-analyzer.desktop | 6 +
.../engines/tabs/amarok-data-engine-tabs.desktop | 1 +
...k-scriptengine-applet-simple-javascript.desktop | 4 +-
.../servicetypes/amarok_containment.desktop | 2 +-
.../servicetypes/amarok_context_applet.desktop | 2 +-
.../timecode/TimecodeWriteCapability.cpp | 2 +-
.../massstorage/amarok_device_massstorage.desktop | 20 +
.../db/sql/device/nfs/amarok_device_nfs.desktop | 20 +
.../db/sql/device/smb/amarok_device_smb.desktop | 20 +
.../collections/ipodcollection/IpodCollection.cpp | 91 +-
.../collections/ipodcollection/IpodCollection.h | 14 +-
.../ipodcollection/IpodCollectionFactory.cpp | 20 +-
.../collections/ipodcollection/IpodMeta.cpp | 45 +-
.../collections/ipodcollection/IpodMeta.h | 13 +-
.../collections/ipodcollection/IpodPlaylist.h | 1 -
.../ipodcollection/IpodPlaylistProvider.cpp | 80 +-
.../ipodcollection/IpodPlaylistProvider.h | 13 +-
.../amarok_collection-ipodcollection.desktop | 20 +
.../ipodcollection/jobs/IpodParseTracksJob.cpp | 103 +-
.../ipodcollection/jobs/IpodParseTracksJob.h | 31 +-
.../ipodcollection/jobs/IpodWriteDatabaseJob.cpp | 6 +-
.../ipodcollection/jobs/IpodWriteDatabaseJob.h | 13 +-
.../ipodcollection/support/IpodDeviceHelper.cpp | 31 +-
.../ipodcollection/support/IpodDeviceHelper.h | 6 +-
.../playlist/MediaDevicePlaylist.h | 4 -
.../mtpcollection/handler/MtpHandler.cpp | 5 +
.../amarok_collection-playdarcollection.desktop | 2 +
.../proxycollection/ProxyCollectionMeta.cpp | 2 +-
.../support/CollectionLocationDelegateImpl.cpp | 6 +-
.../amarok_collection-umscollection.desktop | 2 +-
src/core-impl/meta/file/File.cpp | 7 +-
src/core-impl/meta/proxy/MetaProxy_p.h | 4 +-
src/core-impl/meta/timecode/TimecodeObserver.cpp | 2 +-
.../playlists/types/file/m3u/M3UPlaylist.cpp | 2 +-
.../playlists/types/file/m3u/M3UPlaylist.h | 9 -
.../playlists/types/file/pls/PLSPlaylist.h | 4 -
.../playlists/types/file/xspf/XSPFPlaylist.cpp | 20 -
.../playlists/types/file/xspf/XSPFPlaylist.h | 7 +-
src/core/CMakeLists.txt | 1 -
.../capabilities/EditablePlaylistCapability.cpp | 26 -
src/core/capabilities/EditablePlaylistCapability.h | 70 -
src/core/meta/Meta.h | 60 +-
src/core/meta/support/MetaUtility.cpp | 30 +-
src/core/playlists/Playlist.h | 3 +-
src/core/podcasts/PodcastMeta.h | 4 -
src/dbus/mpris1/TrackListHandler.cpp | 2 +-
src/dbus/mpris2/MediaPlayer2Player.cpp | 7 +-
src/dialogs/DiagnosticDialog.cpp | 6 +-
src/dynamic/BiasFactory.cpp | 5 +
src/dynamic/BiasFactory.h | 1 +
src/likeback/LikeBackBar.cpp | 3 +-
src/playlist/PlaylistController.cpp | 20 +-
src/playlist/PlaylistDock.cpp | 29 +-
src/playlist/PlaylistModel.cpp | 3 +-
src/playlist/PlaylistModel.h | 1 +
src/playlist/proxymodels/AbstractModel.h | 7 +
src/playlist/proxymodels/ProxyBase.cpp | 6 +
src/playlist/proxymodels/ProxyBase.h | 1 +
src/playlist/view/PlaylistViewCommon.cpp | 4 +-
src/playlist/view/listview/PrettyListView.cpp | 2 +-
src/playlistmanager/SyncedPodcast.h | 10 -
src/playlistmanager/file/PlaylistFileProvider.cpp | 4 +-
src/playlistmanager/file/PlaylistFileProvider.h | 6 +
src/playlistmanager/sql/SqlPlaylist.cpp | 13 -
src/playlistmanager/sql/SqlPlaylist.h | 16 +-
src/services/amazon/AmazonSettingsModule.cpp | 86 +-
src/services/amazon/AmazonStore.cpp | 15 +-
.../amazon/amarok_service_amazonstore.desktop | 12 +
.../amarok_service_amazonstore_config.desktop | 6 +
src/services/gpodder/GpodderProvider.cpp | 2 +-
.../gpodder/amarok_service_gpodder.desktop | 2 +
.../gpodder/amarok_service_gpodder_config.desktop | 12 +
src/services/lastfm/ScrobblerAdapter.cpp | 26 +-
src/services/lastfm/ScrobblerAdapter.h | 2 -
src/services/lastfm/amarok_service_lastfm.desktop | 2 +-
.../amarok_service_magnatunestore_config.desktop | 2 +-
.../amarok_service_mp3tunes_config.desktop | 2 +-
src/services/mp3tunes/libmp3tunes/harmony.c | 7 +-
src/services/mp3tunes/libmp3tunes/locker.c | 7 +-
src/statemanagement/BackendStartingState.cpp | 42 -
src/statemanagement/BackendStartingState.h | 37 -
src/statemanagement/State.cpp | 28 -
src/statemanagement/State.h | 91 -
src/statemanagement/StateManager.cpp | 125 -
src/statemanagement/StateManager.h | 82 -
src/statemanagement/Task.cpp | 35 -
src/statemanagement/Task.h | 41 -
src/statemanagement/Transition.cpp | 75 -
src/statemanagement/Transition.h | 58 -
src/toolbar/MainToolbar.cpp | 2 +-
src/widgets/ProgressWidget.cpp | 2 +-
tests/core-impl/logger/TestProxyLogger.cpp | 18 -
tests/core-impl/logger/TestProxyLogger.h | 1 -
tests/core-impl/meta/multi/TestMetaMultiTrack.cpp | 2 +
.../core-impl/playlists/types/file/CMakeLists.txt | 3 +-
.../playlists/types/file/m3u/TestM3UPlaylist.cpp | 23 +-
.../playlists/types/file/pls/TestPLSPlaylist.cpp | 8 +-
.../playlists/types/file/xspf/TestXSPFPlaylist.cpp | 5 -
.../playlists/types/file/xspf/TestXSPFPlaylist.h | 1 -
tests/core/CMakeLists.txt | 2 +
tests/core/capabilities/CMakeLists.txt | 10 +
tests/core/capabilities/TestActionsCapability.cpp | 57 +
tests/core/capabilities/TestActionsCapability.h | 43 +
tests/core/collections/CMakeLists.txt | 12 +
tests/core/collections/TestCollection.cpp | 168 +
tests/core/collections/TestCollection.h | 59 +
tests/core/collections/TestQueryMaker.cpp | 79 +
tests/core/collections/TestQueryMaker.h | 39 +
tests/core/meta/CMakeLists.txt | 7 +-
tests/core/meta/TestMetaCapability.cpp | 111 +
tests/core/meta/TestMetaCapability.h | 43 +
tests/core/playlists/CMakeLists.txt | 10 +
tests/core/playlists/TestPlaylistFormat.cpp | 111 +
tests/core/playlists/TestPlaylistFormat.h | 42 +
tests/data/playlists/test.m3u | 1 +
tests/mocks/MockQueryMaker.cpp | 21 +
tests/mocks/MockQueryMaker.h | 181 +
.../file/TestPlaylistFileProvider.cpp | 95 +-
.../file/TestPlaylistFileProvider.h | 1 -
225 files changed, 854252 insertions(+), 845804 deletions(-)
--
Amarok packaging
More information about the pkg-kde-commits
mailing list