[SCM] Amarok packaging branch, master, updated. debian/2.6-rc1-1
Modestas Vainius
modax at alioth.debian.org
Tue Aug 7 07:40:42 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=fa8f635
The following commit has been merged in the master branch:
commit fa8f63539b5cff6acaa9e845918ca247e0025b3b
Merge: 3e962af9224737422cd618d9d1596963e6b1afb0 422ebe4d329374c16d57740f050fd75fc72bff6c
Author: Modestas Vainius <modax at debian.org>
Date: Tue Aug 7 09:13:18 2012 +0300
Merge tag 'upstream/2.6-rc1'
Upstream version 2.6-rc1
CMakeLists.txt | 4 +-
ChangeLog | 17 +-
README | 8 +-
cmake/modules/FindFFmpeg.cmake | 54 +-
doc/CMakeLists.txt | 12 +-
doc/es/index.docbook | 68 +-
doc/fr/CMakeLists.txt | 1 -
doc/fr/advanced.docbook | 1640 -
doc/fr/config.docbook | 555 -
doc/fr/faq.docbook | 1402 -
doc/fr/index.docbook | 651 -
doc/fr/quick.docbook | 148 -
doc/fr/requirements.docbook | 136 -
doc/fr/using.docbook | 2157 --
doc/it/CMakeLists.txt | 1 -
doc/it/advanced.docbook | 1639 -
doc/it/config.docbook | 555 -
doc/it/faq.docbook | 1332 -
doc/it/index.docbook | 707 -
doc/it/quick.docbook | 148 -
doc/it/requirements.docbook | 136 -
doc/it/using.docbook | 2146 --
doc/nl/index.docbook | 251 +-
doc/pt/index.docbook | 22 +-
doc/pt_BR/index.docbook | 422 +-
doc/sv/index.docbook | 204 +-
doc/uk/amarok_playlist_layout_editor.png | Bin 89885 -> 30744 bytes
doc/uk/apgpresetsmatchallgroup.png | Bin 52103 -> 19292 bytes
doc/uk/generatingtree.png | Bin 60590 -> 21976 bytes
doc/uk/playlist-layout-editor-amarok.png | Bin 90293 -> 31062 bytes
.../playlist-layout-item-configuration-amarok.png | Bin 31398 -> 11846 bytes
external/CMakeLists.txt | 3 +-
po/CMakeLists.txt | 78 +-
po/af/CMakeLists.txt | 2 -
po/af/amarok.po |19079 -----------
po/ar/CMakeLists.txt | 2 -
po/ar/amarok.po |24741 ---------------
po/ast/CMakeLists.txt | 2 -
po/ast/amarok.po |17302 ----------
po/be/CMakeLists.txt | 2 -
po/be/amarok.po |19575 ------------
po/bg/CMakeLists.txt | 2 -
po/bg/amarok.po |18603 -----------
po/bg/amarok_scriptengine_qscript.po | 90 -
po/bg/amarokcollectionscanner_qt.po | 203 -
po/bg/amarokpkg.po | 122 -
po/bs/amarok.po |27528 ++++++++--------
po/ca/amarok.po |26713 ++++++++--------
po/ca at valencia/amarok.po |26994 ++++++++--------
po/cs/amarok.po |28826 +++++++++---------
po/csb/CMakeLists.txt | 2 -
po/csb/amarok.po |19661 ------------
po/da/amarok.po |29906 +++++++++---------
po/de/amarok.po |26504 ++++++++--------
po/el/amarok.po |33056 ++++++++++----------
po/en_GB/amarok.po |31377 +++++++++---------
po/eo/CMakeLists.txt | 2 -
po/eo/amarok.po |20236 ------------
po/eo/amarok_scriptengine_qscript.po | 93 -
po/eo/amarokcollectionscanner_qt.po | 65 -
po/eo/amarokpkg.po | 128 -
po/es/amarok.po |26045 ++++++++--------
po/et/amarok.po |33294 ++++++++++----------
po/eu/amarok.po |30485 +++++++++---------
po/fa/CMakeLists.txt | 2 -
po/fa/amarok.po |15245 ---------
po/fa/amarokcollectionscanner_qt.po | 66 -
po/fa/amarokpkg.po | 119 -
po/fi/amarok.po |28679 +++++++++---------
po/fi/amarok_scriptengine_qscript.po | 10 +-
po/fi/amarokcollectionscanner_qt.po | 10 +-
po/fi/amarokpkg.po | 10 +-
po/fr/CMakeLists.txt | 2 -
po/fr/amarok.po |19945 ------------
po/fr/amarok_scriptengine_qscript.po | 89 -
po/fr/amarokcollectionscanner_qt.po | 138 -
po/fr/amarokpkg.po | 125 -
po/ga/amarok.po |30817 +++++++++---------
po/gl/amarok.po |27875 ++++++++--------
po/he/CMakeLists.txt | 2 -
po/he/amarok.po |17864 -----------
po/hr/CMakeLists.txt | 2 -
po/hr/amarok.po |15323 ---------
po/hr/amarok_scriptengine_qscript.po | 93 -
po/hr/amarokcollectionscanner_qt.po | 69 -
po/hr/amarokpkg.po | 122 -
po/hu/amarok.po |28402 +++++++++---------
po/ia/CMakeLists.txt | 2 +
po/ia/amarokcollectionscanner_qt.po | 97 +
po/is/CMakeLists.txt | 2 -
po/is/amarok.po |17807 -----------
po/is/amarok_scriptengine_qscript.po | 93 -
po/is/amarokpkg.po | 126 -
po/it/amarok.po |30835 +++++++++---------
po/ja/amarok.po |26000 ++++++++--------
po/km/CMakeLists.txt | 2 -
po/km/amarok.po |16862 ----------
po/km/amarok_scriptengine_qscript.po | 91 -
po/km/amarokcollectionscanner_qt.po | 125 -
po/km/amarokpkg.po | 122 -
po/ko/CMakeLists.txt | 2 -
po/ko/amarok.po |19929 ------------
po/ko/amarok_scriptengine_qscript.po | 90 -
po/ko/amarokcollectionscanner_qt.po | 135 -
po/ko/amarokpkg.po | 119 -
po/ku/CMakeLists.txt | 2 -
po/ku/amarok.po |19735 ------------
po/lt/amarok.po |26918 ++++++++--------
po/lv/amarok.po |26440 ++++++++--------
po/mai/CMakeLists.txt | 2 -
po/mai/amarok.po |15667 ---------
po/mai/amarok_scriptengine_qscript.po | 91 -
po/mai/amarokcollectionscanner_qt.po | 67 -
po/mai/amarokpkg.po | 120 -
po/ml/CMakeLists.txt | 2 -
po/ml/amarok.po |16543 ----------
po/ms/CMakeLists.txt | 2 -
po/ms/amarok.po |20629 ------------
po/nb/amarok.po | 883 +-
po/nds/CMakeLists.txt | 2 -
po/nds/amarok.po |22919 --------------
po/nds/amarok_scriptengine_qscript.po | 91 -
po/nds/amarokcollectionscanner_qt.po | 68 -
po/nds/amarokpkg.po | 122 -
po/ne/CMakeLists.txt | 2 -
po/ne/amarok.po |24927 ---------------
po/nl/amarok.po |29035 +++++++++---------
po/nn/CMakeLists.txt | 2 -
po/nn/amarok.po |15013 ---------
po/nn/amarok_scriptengine_qscript.po | 92 -
po/nn/amarokcollectionscanner_qt.po | 69 -
po/nn/amarokpkg.po | 124 -
po/oc/CMakeLists.txt | 2 -
po/oc/amarok.po |17836 -----------
po/pa/CMakeLists.txt | 2 -
po/pa/amarok.po |17693 -----------
po/pa/amarokcollectionscanner_qt.po | 66 -
po/pa/amarokpkg.po | 119 -
po/pl/amarok.po |28655 +++++++++---------
po/pt/amarok.po |26036 ++++++++--------
po/pt_BR/amarok.po |25946 ++++++++--------
po/ro/CMakeLists.txt | 2 -
po/ro/amarok.po |19053 -----------
po/ro/amarok_scriptengine_qscript.po | 91 -
po/ro/amarokcollectionscanner_qt.po | 68 -
po/ro/amarokpkg.po | 126 -
po/ru/amarok.po |32663 ++++++++++----------
po/se/CMakeLists.txt | 2 -
po/se/amarok.po |14904 ---------
po/se/amarokcollectionscanner_qt.po | 68 -
po/si/CMakeLists.txt | 2 -
po/si/amarok.po |16475 ----------
po/sk/CMakeLists.txt | 2 -
po/sk/amarok.po |16742 ----------
po/sk/amarok_scriptengine_qscript.po | 89 -
po/sk/amarokcollectionscanner_qt.po | 65 -
po/sk/amarokpkg.po | 119 -
po/sl/amarok.po |31494 +++++++++----------
po/sl/amarokcollectionscanner_qt.po | 41 +-
po/sl/amarokpkg.po | 32 +-
po/sq/CMakeLists.txt | 2 -
po/sq/amarok.po |15420 ---------
po/sq/amarok_scriptengine_qscript.po | 92 -
po/sq/amarokcollectionscanner_qt.po | 68 -
po/sq/amarokpkg.po | 119 -
po/sr/amarok.po | 924 +-
po/sr/amarokcollectionscanner_qt.po | 41 +-
po/sr at ijekavian/amarok.po | 924 +-
po/sr at ijekavian/amarokcollectionscanner_qt.po | 43 +-
po/sr at ijekavianlatin/amarok.po | 924 +-
po/sr at ijekavianlatin/amarokcollectionscanner_qt.po | 43 +-
po/sr at latin/amarok.po | 924 +-
po/sr at latin/amarokcollectionscanner_qt.po | 41 +-
po/sv/amarok.po |27441 ++++++++---------
po/tg/CMakeLists.txt | 2 -
po/tg/amarok.po |15720 ---------
po/th/CMakeLists.txt | 2 -
po/th/amarok.po |20763 ------------
po/th/amarokpkg.po | 119 -
po/tr/CMakeLists.txt | 2 -
po/tr/amarok.po |22546 -------------
po/tr/amarok_scriptengine_qscript.po | 90 -
po/tr/amarokcollectionscanner_qt.po | 142 -
po/tr/amarokpkg.po | 121 -
po/ug/CMakeLists.txt | 2 -
po/ug/amarok.po |14896 ---------
po/ug/amarok_scriptengine_qscript.po | 90 -
po/ug/amarokcollectionscanner_qt.po | 66 -
po/ug/amarokpkg.po | 123 -
po/uk/amarok.po |29059 ++++++++---------
po/wa/CMakeLists.txt | 2 -
po/wa/amarok.po |19003 -----------
po/wa/amarokcollectionscanner_qt.po | 96 -
po/zh_CN/amarok.po |27886 ++++++++--------
po/zh_TW/amarok.po |25871 ++++++++--------
shared/FileType.cpp | 6 +-
shared/Version.h | 2 +-
shared/tag_helpers/APETagHelper.cpp | 2 +-
shared/tag_helpers/ASFTagHelper.cpp | 2 +-
shared/tag_helpers/ID3v2TagHelper.cpp | 2 +-
shared/tag_helpers/MP4TagHelper.cpp | 2 +-
shared/tag_helpers/TagHelper.h | 2 +-
shared/tag_helpers/VorbisCommentTagHelper.cpp | 2 +-
src/ActionClasses.cpp | 2 +-
src/CMakeLists.txt | 6 +-
src/EngineController.cpp | 512 +-
src/EngineController.h | 113 +-
src/MainWindow.cpp | 2 +-
src/OpmlParser.h | 2 +-
src/PluginManager.cpp | 28 +-
src/SvgHandler.cpp | 2 +-
.../libattica-ocsclient/providerinitjob.cpp | 21 +
src/amarok.desktop | 1 +
src/amarok_containers.desktop | 1 +
src/amarokurls/BookmarkTreeView.cpp | 2 +-
src/browsers/BrowserBreadcrumbWidget.h | 2 +-
src/browsers/BrowserMessageArea.cpp | 2 +-
src/browsers/CollectionTreeItemModel.cpp | 2 +-
.../DirPlaylistTrackFilterProxyModel.cpp | 52 +
.../filebrowser/DirPlaylistTrackFilterProxyModel.h | 38 +
src/browsers/filebrowser/FileBrowser.cpp | 11 +-
src/browsers/filebrowser/FileBrowser_p.h | 4 +-
src/browsers/filebrowser/FileView.cpp | 6 +-
.../filebrowser/MimeTypeFilterProxyModel.cpp | 47 -
.../filebrowser/MimeTypeFilterProxyModel.h | 47 -
.../playlistbrowser/PlaylistBrowserModel.cpp | 2 +-
.../playlistbrowser/PlaylistsInFoldersProxy.cpp | 2 +-
src/context/LyricsManager.cpp | 2 +-
src/context/applets/labels/LabelOverlayButton.cpp | 11 +-
.../spectrumanalyzer/SpectrumAnalyzerApplet.h | 2 +-
...amarok-context-applet-spectrum-analyzer.desktop | 1 +
.../applets/upcomingevents/UpcomingEventsApplet.h | 2 +-
.../spectrumanalyzer/SpectrumAnalyzerEngine.h | 2 +-
.../amarok-data-engine-spectrum-analyzer.desktop | 1 +
src/core-impl/collections/db/ScanManager.cpp | 3 +-
src/core-impl/collections/db/ScanManager.h | 10 +-
.../collections/db/sql/DatabaseUpdater.cpp | 8 +
src/core-impl/collections/db/sql/DatabaseUpdater.h | 10 +-
src/core-impl/collections/db/sql/SqlCollection.cpp | 26 +-
src/core-impl/collections/db/sql/SqlCollection.h | 5 +
src/core-impl/collections/db/sql/SqlMeta.cpp | 51 +-
src/core-impl/collections/db/sql/SqlMeta.h | 5 -
.../collections/db/sql/SqlReadLabelCapability.h | 2 +-
src/core-impl/collections/db/sql/SqlRegistry.cpp | 33 +-
src/core-impl/collections/db/sql/SqlRegistry.h | 21 +-
.../collections/db/sql/SqlScanResultProcessor.cpp | 352 +-
.../collections/db/sql/SqlScanResultProcessor.h | 75 +-
.../massstorage/amarok_device_massstorage.desktop | 2 +
.../db/sql/device/nfs/amarok_device_nfs.desktop | 2 +
.../db/sql/device/smb/amarok_device_smb.desktop | 2 +
.../collections/ipodcollection/IpodCollection.cpp | 4 +-
.../collections/ipodcollection/IpodCollection.h | 4 +-
.../ipodcollection/IpodCollectionFactory.cpp | 18 +-
.../ipodcollection/IpodCollectionFactory.h | 8 -
.../ipodcollection/IpodCollectionLocation.cpp | 2 +-
.../collections/ipodcollection/IpodMeta.cpp | 10 +-
.../collections/ipodcollection/IpodMeta.h | 2 +-
.../collections/ipodcollection/IpodPlaylist.h | 4 +-
.../amarok_collection-ipodcollection.desktop | 4 +
.../ipodcollection/jobs/IpodCopyTracksJob.cpp | 4 +-
.../ipodcollection/jobs/IpodParseTracksJob.cpp | 4 +-
.../ipodcollection/support/IphoneMountPoint.cpp | 2 +-
.../ipodcollection/support/IpodDeviceHelper.h | 2 +-
.../podcast/MediaDevicePodcastMeta.h | 17 +
.../podcast/MediaDevicePodcastProvider.cpp | 17 +
.../podcast/MediaDevicePodcastProvider.h | 16 +
.../playdarcollection/support/Controller.h | 2 +-
.../playdarcollection/support/ProxyResolver.h | 2 +-
.../playdarcollection/support/QMFunctionTypes.h | 2 +-
.../collections/playdarcollection/support/Query.h | 2 +-
.../collections/support/CollectionManager.cpp | 13 +-
src/core-impl/collections/support/MemoryMeta.h | 4 +-
.../collections/umscollection/UmsCollection.cpp | 2 +-
.../collections/umscollection/UmsCollection.h | 2 +-
.../collections/upnpcollection/UpnpQueryMaker.cpp | 2 +-
.../collections/upnpcollection/upnptypes.h | 2 +-
src/core-impl/meta/file/File.cpp | 39 +-
src/core-impl/meta/file/File.h | 9 +
src/core-impl/meta/stream/Stream.cpp | 174 +-
src/core-impl/meta/stream/Stream.h | 36 +-
src/core-impl/meta/stream/Stream_p.h | 119 +-
src/core-impl/playlists/types/file/PlaylistFile.h | 2 +-
.../sql/PodcastFilenameLayoutConfigDialog.cpp | 2 +-
.../sql/PodcastFilenameLayoutConfigDialog.h | 2 +-
src/core-impl/podcasts/sql/SqlPodcastMeta.cpp | 2 +-
src/core-impl/podcasts/sql/SqlPodcastProvider.cpp | 2 +-
src/core-impl/podcasts/sql/SqlPodcastProvider.h | 5 -
src/core/collections/CollectionLocation.cpp | 8 +-
src/core/collections/CollectionLocation.h | 2 +-
src/core/interfaces/Logger.h | 2 +-
src/core/meta/support/MetaConstants.cpp | 3 +-
src/core/meta/support/MetaKeys.cpp | 2 +
src/core/meta/support/MetaKeys.h | 9 +
src/core/meta/support/MetaUtility.h | 2 +-
src/core/meta/support/PrivateMetaRegistry.h | 12 +-
src/core/playlists/Playlist.h | 2 +-
src/core/playlists/PlaylistProvider.cpp | 17 +
src/core/support/Debug.cpp | 7 +-
src/covermanager/CoverCache.h | 2 +-
src/covermanager/CoverFetchUnit.cpp | 2 +-
.../amarok14/FastForwardWorker.cpp | 2 +-
src/dialogs/EditFilterDialog.cpp | 1 +
src/dialogs/TagDialog.cpp | 5 +-
src/dialogs/TagGuesser.h | 4 +-
src/dynamic/BiasSolver.cpp | 2 +-
src/dynamic/BiasSolver.h | 2 +-
src/dynamic/biases/PartBias.cpp | 2 +-
src/dynamic/biases/TagMatchBias.cpp | 2 +-
src/likeback/LikeBack.cpp | 4 +-
src/likeback/LikeBack.h | 12 +-
src/moodbar/MoodbarManager.cpp | 2 +-
src/musicbrainz/MusicBrainzMeta.h | 2 +-
src/musicbrainz/MusicDNSAudioDecoder.cpp | 686 +-
src/musicbrainz/MusicDNSAudioDecoder.h | 11 +-
src/musicbrainz/MusicDNSFinder.cpp | 2 +-
src/musicbrainz/MusicDNSFinder.h | 3 +-
src/playlist/PlaylistActions.cpp | 35 +-
src/playlist/PlaylistActions.h | 8 +
src/playlist/PlaylistDefines.h | 3 +-
src/playlist/PlaylistInfoWidget.h | 2 +-
src/playlist/PlaylistQueueEditor.h | 2 +-
src/playlist/navigators/StandardTrackNavigator.h | 2 +-
src/playlist/view/listview/PrettyItemDelegate.cpp | 2 +-
src/playlist/view/listview/PrettyItemDelegate.h | 2 +-
.../constraints/PlaylistDuration.cpp | 2 +-
src/playlistmanager/file/PlaylistFileProvider.cpp | 7 +-
src/playlistmanager/sql/SqlPlaylist.cpp | 24 -
src/playlistmanager/sql/SqlPlaylist.h | 10 +-
src/playlistmanager/sql/SqlUserPlaylistProvider.h | 7 +-
src/scanner/GenericScanManager.h | 2 +-
src/scriptengine/AmarokPlaylistScript.cpp | 22 +-
src/scriptengine/AmarokPlaylistScript.h | 1 +
src/scripts/librivox_service/CMakeLists.txt | 3 +-
src/scripts/lyrics_lyricwiki/CMakeLists.txt | 3 +-
src/scripts/radio_station_service/CMakeLists.txt | 3 +-
.../amazon/amarok_service_amazonstore.desktop | 2 +
src/services/ampache/images/CMakeLists.txt | 2 +-
src/services/jamendo/JamendoInfoParser.h | 4 -
src/services/jamendo/images/CMakeLists.txt | 2 +-
src/services/lastfm/LastFmServiceConfig.h | 2 +-
src/services/lastfm/images/CMakeLists.txt | 3 +-
src/services/magnatune/images/CMakeLists.txt | 2 +-
src/services/opmldirectory/OpmlDirectoryView.cpp | 16 +
src/services/opmldirectory/OpmlDirectoryView.h | 16 +
src/services/scriptable/ScriptableService.cpp | 2 +-
src/toolbar/MainToolbar.cpp | 2 +-
src/widgets/AmarokContextMenu.h | 2 +-
src/widgets/BookmarkPopup.cpp | 2 +-
tests/CMakeLists.txt | 7 +
tests/TestDebug.cpp | 93 +-
tests/TestEngineController.cpp | 74 +
tests/TestEngineController.h | 34 +
tests/context/CMakeLists.txt | 3 +-
.../similarartists/TestSimilarArtistsEngine.cpp | 2 +-
.../upcomingevents/TestUpcomingEventsEngine.cpp | 2 +-
.../collections/db/sql/SqlMountPointManagerMock.h | 18 +-
.../db/sql/TestSqlCollectionLocation.cpp | 2 +-
.../collections/db/sql/TestSqlQueryMaker.cpp | 6 +-
.../collections/db/sql/TestSqlScanManager.cpp | 63 +-
.../core-impl/collections/db/sql/TestSqlTrack.cpp | 2 +-
.../core-impl/playlists/types/file/CMakeLists.txt | 4 +-
.../playlists/types/file/m3u/TestM3UPlaylist.cpp | 6 +-
.../playlists/types/file/pls/TestPLSPlaylist.cpp | 11 +-
.../playlists/types/file/xspf/TestXSPFPlaylist.cpp | 28 +-
tests/core/collections/CMakeLists.txt | 1 +
.../collections/MockCollectionLocationDelegate.h | 15 +
tests/core/collections/support/CMakeLists.txt | 10 +
.../collections/support/TestTrackForUrlWorker.cpp | 119 +
.../collections/support/TestTrackForUrlWorker.h | 66 +
tests/core/meta/CMakeLists.txt | 2 +
tests/core/meta/TestMetaCapability.cpp | 4 +-
tests/core/meta/support/CMakeLists.txt | 23 +
tests/core/meta/support/TestMetaAlbumKey.cpp | 111 +
tests/core/meta/support/TestMetaAlbumKey.h | 47 +
tests/core/meta/support/TestMetaTrackKey.cpp | 60 +
tests/core/meta/support/TestMetaTrackKey.h | 40 +
.../core/meta/support/TestPrivateMetaRegistry.cpp | 170 +
tests/core/meta/support/TestPrivateMetaRegistry.h | 71 +
tests/data/audio/album2/Track01.ogg | Bin 0 -> 4344 bytes
tests/data/audio/album2/Track02.ogg | Bin 0 -> 4350 bytes
tests/dynamic/TestDynamicModel.cpp | 2 +-
tests/mocks/MockQueryMaker.h | 5 +
tests/mocks/MockTrackForUrlWorker.cpp | 33 +
tests/mocks/MockTrackForUrlWorker.h | 40 +
.../file/TestPlaylistFileProvider.cpp | 68 +-
.../file/TestPlaylistFileProvider.h | 1 +
tests/services/amazon/TestAmazonTrack.cpp | 1 +
utilities/collectionscanner/Album.cpp | 2 +-
utilities/collectionscanner/BatchFile.cpp | 5 +
utilities/collectionscanner/BatchFile.h | 2 +-
390 files changed, 417472 insertions(+), 1051040 deletions(-)
--
Amarok packaging
More information about the pkg-kde-commits
mailing list