[SCM] Amarok packaging branch, master, updated. debian/2.4.2-1
Modestas Vainius
modax at alioth.debian.org
Sun Jul 24 11:09:29 UTC 2011
The following commit has been merged in the master branch:
commit f58c678f530c4872c824bd9eda3c4047a08c1fd2
Merge: 244ad799bb1fb95cb82638a81bbce94faa646b77 9c7e1d4ea62086a6a359975ae932fbdb3ee7bd33
Author: Modestas Vainius <modax at debian.org>
Date: Sat Jul 23 20:41:29 2011 +0300
Merge commit 'upstream/2.4.2'
AUTHORS | 2 +
CMakeLists.txt | 5 +-
ChangeLog | 6 +
Mainpage.dox | 40 +-
doc/CMakeLists.txt | 12 +-
doc/de/CMakeLists.txt | 1 +
doc/de/index.docbook | 516 +
doc/{ => en_US}/Amarok-context.png | Bin 27755 -> 27755 bytes
doc/{ => en_US}/Amarok-contextadd.png | Bin 37050 -> 37050 bytes
doc/{ => en_US}/Amarok-removefromplaylist.png | Bin 82196 -> 82196 bytes
doc/{ => en_US}/Amarok-renameplaylist.png | Bin 13483 -> 13483 bytes
doc/{ => en_US}/Amarok2.1covermanager.png | Bin 125493 -> 125493 bytes
doc/{ => en_US}/Amarok2.1dynamicplaylist.png | Bin 10462 -> 10462 bytes
doc/{ => en_US}/Amarok2.1ipod.png | Bin 7966 -> 7966 bytes
doc/{ => en_US}/Amarok2.1pleditor.png | Bin 23731 -> 23731 bytes
doc/{ => en_US}/Amarok2.1rating.png | Bin 16902 -> 16902 bytes
doc/{ => en_US}/Amarok2.1right.png | Bin 18106 -> 18106 bytes
doc/{ => en_US}/Amarok2.1scriptmanager.png | Bin 28002 -> 28002 bytes
.../Amarok2.4.1ConfigureDialogCollection.png | Bin 27463 -> 27463 bytes
doc/{ => en_US}/Amarok2.4.1SavePlaylistChoices.png | Bin 5295 -> 5295 bytes
doc/{ => en_US}/AmarokNew2.4.png | Bin 37228 -> 37228 bytes
doc/{ => en_US}/Amarok_-_internet_services.png | Bin 13464 -> 13464 bytes
doc/{ => en_US}/Amarok_addtoplaylist.png | Bin 292057 -> 292057 bytes
doc/{ => en_US}/Amarok_addtoplaylist1.png | Bin 52097 -> 52097 bytes
doc/{ => en_US}/Amarokbreadcrumb.png | Bin 4896 -> 4896 bytes
doc/{ => en_US}/Amarokcollection.png | Bin 22583 -> 22583 bytes
doc/{ => en_US}/Amarokfull.png | Bin 73473 -> 73473 bytes
doc/{ => en_US}/Amarokmediasources-files.png | Bin 7188 -> 7188 bytes
doc/{ => en_US}/Amarokmediasources-home.png | Bin 10441 -> 10441 bytes
doc/{ => en_US}/Amarokrightmenu.png | Bin 6707 -> 6707 bytes
doc/{ => en_US}/Amarokripcd.png | Bin 15936 -> 15936 bytes
doc/{ => en_US}/Amaroksystray.png | Bin 4848 -> 4848 bytes
doc/{ => en_US}/Applications-internet.png | Bin 1680 -> 1680 bytes
doc/en_US/CMakeLists.txt | 1 +
doc/{ => en_US}/Cd_collection_sansa.png | Bin 20292 -> 20292 bytes
doc/{ => en_US}/Configurecollection.png | Bin 24862 -> 24862 bytes
doc/{ => en_US}/Context-applets-amarok.png | Bin 100577 -> 100577 bytes
doc/{ => en_US}/Controlamarok.png | Bin 6577 -> 6577 bytes
doc/{ => en_US}/Document-save.png | Bin 1802 -> 1802 bytes
doc/{ => en_US}/Edit-redo.png | Bin 2125 -> 2125 bytes
doc/{ => en_US}/Edit-undo.png | Bin 2128 -> 2128 bytes
doc/{ => en_US}/Firstruncollection2.png | Bin 9454 -> 9454 bytes
doc/{ => en_US}/Folder-amarok.png | Bin 1474 -> 1474 bytes
doc/{ => en_US}/Hi32-action-collection-amarok.png | Bin 2386 -> 2386 bytes
.../Hi48-action-clear-playlist-amarok.png | Bin 2118 -> 2118 bytes
.../Hi48-action-edit-playlist-queue.png | Bin 857 -> 857 bytes
...ion-media-standard-track-progression-amarok.png | Bin 2072 -> 2072 bytes
doc/{ => en_US}/Hi48-action-music-amarok.png | Bin 2027 -> 2027 bytes
doc/{ => en_US}/Hi48-action-podcast-amarok.png | Bin 2462 -> 2462 bytes
doc/{ => en_US}/Mediasources.png | Bin 11499 -> 11499 bytes
doc/{ => en_US}/Preferences-other.png | Bin 2478 -> 2478 bytes
doc/{ => en_US}/Pud-amarok.png | Bin 110692 -> 110692 bytes
doc/{ => en_US}/View-list-tree.png | Bin 1304 -> 1304 bytes
doc/{ => en_US}/View-media-playlist.png | Bin 1671 -> 1671 bytes
doc/{ => en_US}/index.docbook | 0
doc/es/CMakeLists.txt | 1 +
doc/es/add_dynamic.png | Bin 0 -> 102406 bytes
doc/es/advanced.docbook | 1636 ++
doc/es/amarok_playlist.png | Bin 0 -> 138008 bytes
doc/es/analyzer.png | Bin 0 -> 6374 bytes
doc/es/buttons.png | Bin 0 -> 8001 bytes
doc/es/collection.png | Bin 0 -> 89824 bytes
doc/es/config.docbook | 555 +
doc/es/config_appearance.png | Bin 0 -> 75907 bytes
doc/es/config_collection.png | Bin 0 -> 65003 bytes
doc/es/config_engine.png | Bin 0 -> 84913 bytes
doc/es/config_general.png | Bin 0 -> 82503 bytes
doc/es/config_osd.png | Bin 0 -> 67327 bytes
doc/es/config_playback.png | Bin 0 -> 58180 bytes
doc/es/config_scrobbler.png | Bin 0 -> 78952 bytes
doc/es/coverman.png | Bin 0 -> 146519 bytes
doc/es/dynamic_bar.png | Bin 0 -> 7697 bytes
doc/es/dynamic_settings.png | Bin 0 -> 14560 bytes
doc/es/equalizer.png | Bin 0 -> 15851 bytes
doc/es/faq.docbook | 1332 ++
doc/es/file_browser.png | Bin 0 -> 97396 bytes
doc/es/index.docbook | 2078 ++
doc/es/logo.png | Bin 0 -> 3442 bytes
doc/es/media_device.png | Bin 0 -> 27031 bytes
doc/es/menubar.png | Bin 0 -> 1923 bytes
doc/es/musicbrainz.png | Bin 0 -> 1602 bytes
doc/es/pl_tip1.png | Bin 0 -> 7894 bytes
doc/es/play_list.png | Bin 0 -> 16122 bytes
doc/es/player_window.png | Bin 0 -> 14203 bytes
doc/es/playlist_browser.png | Bin 0 -> 103404 bytes
doc/es/playlist_window.png | Bin 0 -> 67274 bytes
doc/es/queue_manager.png | Bin 0 -> 19799 bytes
doc/es/quick.docbook | 148 +
doc/es/requirements.docbook | 136 +
doc/es/rmb_menu.png | Bin 0 -> 23980 bytes
doc/es/script_manager.png | Bin 0 -> 25257 bytes
doc/es/status_bar.png | Bin 0 -> 6521 bytes
doc/es/tab_lyrics.png | Bin 0 -> 76109 bytes
doc/es/tab_music.png | Bin 0 -> 138808 bytes
doc/es/tab_wiki.png | Bin 0 -> 93580 bytes
doc/es/using.docbook | 2126 ++
doc/es/vis_window.png | Bin 0 -> 10859 bytes
doc/et/CMakeLists.txt | 1 +
doc/et/index.docbook | 1983 ++
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/CMakeLists.txt | 1 +
doc/nl/add_dynamic.png | Bin 0 -> 54799 bytes
doc/nl/amarok_playlist.png | Bin 0 -> 219736 bytes
doc/nl/analyzer.png | Bin 0 -> 7181 bytes
doc/nl/buttons.png | Bin 0 -> 6682 bytes
doc/nl/collection.png | Bin 0 -> 41672 bytes
doc/nl/config_appearance.png | Bin 0 -> 86442 bytes
doc/nl/config_collection.png | Bin 0 -> 82603 bytes
doc/nl/config_engine.png | Bin 0 -> 93689 bytes
doc/nl/config_general.png | Bin 0 -> 94943 bytes
doc/nl/config_osd.png | Bin 0 -> 82774 bytes
doc/nl/config_playback.png | Bin 0 -> 66760 bytes
doc/nl/config_scrobbler.png | Bin 0 -> 97021 bytes
doc/nl/context.png | Bin 0 -> 19174 bytes
doc/nl/coverman.png | Bin 0 -> 197793 bytes
doc/nl/dynamic_bar.png | Bin 0 -> 14355 bytes
doc/nl/dynamic_settings.png | Bin 0 -> 23936 bytes
doc/nl/equalizer.png | Bin 0 -> 22149 bytes
doc/nl/file_browser.png | Bin 0 -> 44719 bytes
doc/nl/index.docbook | 2032 ++
doc/nl/logo.png | Bin 0 -> 3554 bytes
doc/nl/media_device.png | Bin 0 -> 27339 bytes
doc/nl/menubar.png | Bin 0 -> 2936 bytes
doc/nl/musicbrainz.png | Bin 0 -> 1611 bytes
doc/nl/pl_browser.png | Bin 0 -> 15534 bytes
doc/nl/pl_tip1.png | Bin 0 -> 14540 bytes
doc/nl/play_list.png | Bin 0 -> 30197 bytes
doc/nl/player_window.png | Bin 0 -> 8727 bytes
doc/nl/playlist_browser.png | Bin 0 -> 54507 bytes
doc/nl/playlist_window.png | Bin 0 -> 94797 bytes
doc/nl/queue_manager.png | Bin 0 -> 16054 bytes
doc/nl/rmb_menu.png | Bin 0 -> 50338 bytes
doc/nl/script_manager.png | Bin 0 -> 38015 bytes
doc/nl/status_bar.png | Bin 0 -> 7441 bytes
doc/nl/tab_lyrics.png | Bin 0 -> 35244 bytes
doc/nl/tab_lyrics1.png | Bin 0 -> 22797 bytes
doc/nl/tab_music.png | Bin 0 -> 79393 bytes
doc/nl/tab_wiki.png | Bin 0 -> 106875 bytes
doc/nl/vis_window.png | Bin 0 -> 16022 bytes
doc/pt/CMakeLists.txt | 1 +
doc/pt/index.docbook | 1973 ++
doc/pt_BR/CMakeLists.txt | 1 +
doc/pt_BR/advanced.docbook | 1639 ++
doc/pt_BR/config.docbook | 555 +
doc/pt_BR/faq.docbook | 1340 ++
doc/pt_BR/index.docbook | 2046 ++
doc/pt_BR/quick.docbook | 146 +
doc/pt_BR/requirements.docbook | 136 +
doc/pt_BR/using.docbook | 2152 ++
doc/sv/CMakeLists.txt | 1 +
doc/sv/advanced.docbook | 1637 ++
doc/sv/config.docbook | 555 +
doc/sv/faq.docbook | 1350 ++
doc/sv/index.docbook | 2030 ++
doc/sv/quick.docbook | 148 +
doc/sv/requirements.docbook | 136 +
doc/sv/using.docbook | 2154 ++
doc/uk/.directory | 5 +
doc/uk/Addingmusic.png | Bin 0 -> 86470 bytes
doc/uk/Amarok-context.png | Bin 0 -> 30544 bytes
doc/uk/Amarok-contextadd.png | Bin 0 -> 35717 bytes
doc/uk/Amarok2.1covermanager.png | Bin 0 -> 173790 bytes
doc/uk/Amarok2.1dynamicplaylist.png | Bin 0 -> 14936 bytes
doc/uk/Amarok2.1ipod.png | Bin 0 -> 13298 bytes
doc/uk/Amarok2.1pleditor.png | Bin 0 -> 22420 bytes
doc/uk/Amarok2.1rating.png | Bin 0 -> 12131 bytes
doc/uk/Amarok2.1right.png | Bin 0 -> 30180 bytes
doc/uk/Amarok2.1scriptmanager.png | Bin 0 -> 20198 bytes
doc/uk/Amarok2.1svn965006.png | Bin 0 -> 70688 bytes
doc/uk/Amarok_-_context_view_configuration.png | Bin 0 -> 34213 bytes
doc/uk/Amarok_-_internet_services.png | Bin 0 -> 8975 bytes
doc/uk/Amarokbreadcrumb.png | Bin 0 -> 4988 bytes
doc/uk/Amarokcollection.png | Bin 0 -> 24025 bytes
doc/uk/Amarokfull.png | Bin 0 -> 84414 bytes
doc/uk/Amarokmediasources-home.png | Bin 0 -> 10423 bytes
doc/uk/Amarokrightmenu.png | Bin 0 -> 5117 bytes
doc/uk/Amarokripcd.png | Bin 0 -> 15554 bytes
doc/uk/CMakeLists.txt | 1 +
doc/uk/Configurecollection.png | Bin 0 -> 25274 bytes
doc/uk/Context-applets-amarok.png | Bin 0 -> 26418 bytes
doc/uk/Firstruncollection2.png | Bin 0 -> 8704 bytes
doc/uk/Mediasources.png | Bin 0 -> 13549 bytes
doc/uk/index.docbook | 2016 ++
po/bs/amarok.po |23569 ++++++++++----------
po/ca/amarok.po |23770 ++++++++++----------
po/ca at valencia/amarok.po |23744 ++++++++++----------
po/cs/amarok.po |23580 ++++++++++----------
po/da/amarok.po |23291 +++++++++----------
po/de/amarok.po |23846 ++++++++++----------
po/el/amarok.po |23460 ++++++++++----------
po/en_GB/amarok.po |23696 ++++++++++----------
po/es/amarok.po |23479 ++++++++++----------
po/et/amarok.po |23229 +++++++++----------
po/fi/amarok.po |23542 ++++++++++----------
po/fr/amarok.po |24582 ++++++++++----------
po/ga/amarok.po |23430 ++++++++++----------
po/gl/amarok.po |24042 ++++++++++----------
po/it/amarok.po |23366 ++++++++++----------
po/ja/amarok.po |23105 +++++++++---------
po/ja/amarok_scriptengine_qscript.po | 2 +-
po/ja/amarokcollectionscanner_qt.po | 2 +-
po/ja/amarokpkg.po | 2 +-
po/lt/amarok.po |23464 ++++++++++----------
po/nb/amarok.po |23120 +++++++++---------
po/nl/amarok.po |23290 ++++++++++---------
po/pa/amarok.po |22589 +++++++++---------
po/pl/amarok.po |24132 ++++++++++----------
po/pl/amarokcollectionscanner_qt.po | 7 +-
po/pl/amarokpkg.po | 2 -
po/pt/amarok.po |23384 ++++++++++----------
po/pt_BR/amarok.po |23473 ++++++++++----------
po/ru/amarok.po |23776 ++++++++++----------
po/sl/amarok.po |23750 ++++++++++----------
po/sr/amarok.po |24469 ++++++++++----------
po/sr/amarokcollectionscanner_qt.po | 1 +
po/sr at ijekavian/amarok.po |24468 ++++++++++----------
po/sr at ijekavian/amarokcollectionscanner_qt.po | 21 +-
po/sr at ijekavianlatin/amarok.po |24465 ++++++++++----------
po/sr at ijekavianlatin/amarokcollectionscanner_qt.po | 19 +-
po/sr at latin/amarok.po |24501 ++++++++++----------
po/sr at latin/amarokcollectionscanner_qt.po | 1 +
po/sv/amarok.po |23099 +++++++++---------
po/uk/amarok.po |23710 ++++++++++----------
po/zh_CN/amarok.po |23345 ++++++++++----------
po/zh_TW/amarok.po |22332 +++++++++---------
shared/Version.h | 2 +-
src/CMakeLists.txt | 1 +
src/MediaDeviceCache.cpp | 11 +-
src/MountPointManager.cpp | 2 +-
src/PluginManager.cpp | 2 +-
src/browsers/BrowserCategoryList.cpp | 2 +
src/browsers/CollectionSortFilterProxyModel.cpp | 4 +-
.../playlistbrowser/PlaylistBrowserModel.cpp | 2 +-
src/browsers/servicebrowser/ServiceBrowser.cpp | 4 -
.../amarok-context-applet-currenttrack.desktop | 8 +-
.../labels/amarok-context-applet-labels.desktop | 2 +
.../amarok-context-applet-similarArtists.desktop | 2 +
.../amarok-context-applet-songkick.desktop | 1 +
.../tabs/amarok-context-applet-tabs.desktop | 2 +
.../amarok-context-applet-upcomingEvents.desktop | 2 +
.../amarok-context-applet-videoclip.desktop | 1 +
.../amarok-containment-vertical.desktop | 2 +
.../engines/info/amarok-data-engine-info.desktop | 1 +
.../labels/amarok-data-engine-labels.desktop | 2 +
.../photos/amarok-data-engine-photos.desktop | 1 +
.../amarok-data-engine-similarArtists.desktop | 2 +
.../songkick/amarok-data-engine-songkick.desktop | 1 +
src/context/engines/tabs/TabsEngine.cpp | 2 +-
.../engines/tabs/amarok-data-engine-tabs.desktop | 2 +
.../amarok-data-engine-upcomingEvents.desktop | 2 +
.../videoclip/amarok-data-engine-videoclip.desktop | 1 +
...k-scriptengine-applet-simple-javascript.desktop | 2 +
.../amarok-scriptengine-runner-javascript.desktop | 1 +
.../amarok_collection-audiocdcollection.desktop | 4 +-
.../daap/amarok_collection-daapcollection.desktop | 2 +-
.../collections/db/ScanResultProcessor.cpp | 6 +-
.../collections/db/sql/SqlScanResultProcessor.cpp | 3 +-
.../massstorage/amarok_device_massstorage.desktop | 2 +-
.../db/sql/device/nfs/amarok_device_nfs.desktop | 2 +-
.../db/sql/device/smb/amarok_device_smb.desktop | 2 +-
.../amarok_collection-mysqlecollection.desktop | 3 +-
...amarok_collection-mysqlservercollection.desktop | 3 +-
.../amarok_collection-ipodcollection.desktop | 2 +-
...amarok_collection-mediadevicecollection.desktop | 2 +-
.../amarok_collection-mtpcollection.desktop | 2 +-
.../amarok_collection-nepomukcollection.desktop | 2 +-
.../amarok_collection-playdarcollection.desktop | 6 +-
.../amarok_collection-umscollection.desktop | 3 +-
.../umscollection/handler/UmsHandler.cpp | 4 +-
.../amarok_collection-upnpcollection.desktop | 2 +-
.../playlists/types/file/PlaylistFile.cpp | 35 +
src/core-impl/playlists/types/file/PlaylistFile.h | 7 +-
.../playlists/types/file/m3u/M3UPlaylist.cpp | 37 +-
.../playlists/types/file/m3u/M3UPlaylist.h | 3 +
.../playlists/types/file/pls/PLSPlaylist.cpp | 32 +
.../playlists/types/file/pls/PLSPlaylist.h | 3 +
.../playlists/types/file/xspf/XSPFPlaylist.cpp | 2 +-
src/data/amarok.notifyrc | 2 +
src/dialogs/OrganizeCollectionDialog.cpp | 180 +-
src/dialogs/OrganizeCollectionDialog.h | 8 +-
src/dialogs/TrackOrganizer.cpp | 49 +-
src/dialogs/TrackOrganizer.h | 16 +-
src/dynamic/BiasSolver.cpp | 6 +
src/dynamic/DynamicModel.cpp | 9 +
src/playlistmanager/file/PlaylistFileProvider.cpp | 35 +
src/playlistmanager/file/PlaylistFileProvider.h | 17 +-
src/scripts/radio_station_service/main.js | 1 -
.../ampache/amarok_service_ampache.desktop | 2 +-
.../gpodder/amarok_service_gpodder.desktop | 6 +-
.../jamendo/amarok_service_jamendo.desktop | 2 +-
src/services/lastfm/amarok_service_lastfm.desktop | 4 +-
.../magnatune/MagnatuneSignupDialogBase.ui | 2 +-
.../amarok_service_magnatunestore.desktop | 2 +-
.../mp3tunes/amarok_service_mp3tunes.desktop | 6 +-
.../amarok_service_mp3tunes_config.desktop | 2 +
src/services/mp3tunes/libmp3tunes/locker.c | 2 +-
.../amarok_service_opmldirectory.desktop | 5 +-
src/widgets/TrackSelectWidget.cpp | 5 +-
utilities/collectionscanner/Track.cpp | 13 +-
314 files changed, 434228 insertions(+), 391525 deletions(-)
--
Amarok packaging
More information about the pkg-kde-commits
mailing list