[SCM] Amarok packaging branch, master, updated. debian/2.6.0-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=645ef93

The following commit has been merged in the master branch:
commit 645ef930f58e1869f87dda8153e4aaeb76de4669
Merge: 57bed0c0ef830a34941ce2f2acb25c8572d472c6 977bcb210d7a73cad8e5e585074ac1c3aebf1526
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Aug 18 11:34:54 2012 +0300

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0

 ChangeLog                                          |    8 +-
 doc/nl/index.docbook                               |  370 +-
 doc/sv/index.docbook                               |    2 +-
 po/CMakeLists.txt                                  |    1 +
 po/bs/amarok.po                                    |   28 +-
 po/ca/amarok.po                                    |   28 +-
 po/ca at valencia/amarok.po                           |   28 +-
 po/cs/amarok.po                                    | 1677 +-
 po/da/amarok.po                                    |   28 +-
 po/de/amarok.po                                    |   28 +-
 po/el/amarok.po                                    |   28 +-
 po/en_GB/amarok.po                                 |   28 +-
 po/es/amarok.po                                    |   45 +-
 po/et/amarok.po                                    |   28 +-
 po/eu/amarok.po                                    |   28 +-
 po/fi/amarok.po                                    |  106 +-
 po/ga/amarok.po                                    |  637 +-
 po/gl/amarok.po                                    |   28 +-
 po/hu/amarok.po                                    |   91 +-
 po/it/amarok.po                                    |   28 +-
 po/ja/amarok.po                                    |   28 +-
 po/lt/amarok.po                                    |   28 +-
 po/lv/amarok.po                                    |  601 +-
 po/nb/amarok.po                                    |25816 ++++++++++----------
 po/nl/amarok.po                                    |   28 +-
 po/pa/CMakeLists.txt                               |    2 +
 po/{zh_CN => pa}/amarok.po                         | 6515 +++---
 po/{lv => pa}/amarokcollectionscanner_qt.po        |   17 +-
 po/{en_GB => pa}/amarokpkg.po                      |   46 +-
 po/pl/amarok.po                                    |   28 +-
 po/pt/amarok.po                                    |   28 +-
 po/pt_BR/amarok.po                                 |   28 +-
 po/ru/amarok.po                                    |   28 +-
 po/sl/amarok.po                                    |   28 +-
 po/sr/amarok.po                                    |26863 ++++++++++----------
 po/sr at ijekavian/amarok.po                          |26873 ++++++++++----------
 po/sr at ijekavianlatin/amarok.po                     |26915 ++++++++++----------
 po/sr at latin/amarok.po                              |26905 ++++++++++----------
 po/sv/amarok.po                                    |   28 +-
 po/uk/amarok.po                                    |   28 +-
 po/zh_CN/amarok.po                                 |   28 +-
 po/zh_TW/amarok.po                                 |   28 +-
 shared/Version.h                                   |    2 +-
 src/PluginManager.cpp                              |    2 +-
 src/amarok.desktop                                 |    2 +
 src/amarok_containers.desktop                      |    2 +
 .../labels/amarok-context-applet-labels.desktop    |    1 +
 ...amarok-context-applet-spectrum-analyzer.desktop |    1 +
 .../tabs/amarok-context-applet-tabs.desktop        |    1 +
 .../labels/amarok-data-engine-labels.desktop       |    1 +
 .../amarok-data-engine-spectrum-analyzer.desktop   |    1 +
 .../engines/tabs/amarok-data-engine-tabs.desktop   |    1 +
 .../amarok_collection-audiocdcollection.desktop    |    2 +-
 .../daap/amarok_collection-daapcollection.desktop  |    2 +-
 src/core-impl/collections/db/sql/SqlRegistry.cpp   |   21 +
 .../collections/db/sql/SqlScanResultProcessor.cpp  |   29 +-
 .../massstorage/amarok_device_massstorage.desktop  |    6 +-
 .../db/sql/device/nfs/amarok_device_nfs.desktop    |    6 +-
 .../db/sql/device/smb/amarok_device_smb.desktop    |    6 +-
 .../amarok_collection-mysqlecollection.desktop     |    2 +-
 ...amarok_collection-mysqlservercollection.desktop |    2 +-
 .../amarok_collection-ipodcollection.desktop       |    4 +-
 ...amarok_collection-mediadevicecollection.desktop |    2 +-
 .../amarok_collection-mtpcollection.desktop        |    2 +-
 .../mtpcollection/handler/MtpHandler.cpp           |    2 +
 .../amarok_collection-nepomukcollection.desktop    |    2 +-
 .../amarok_collection-playdarcollection.desktop    |    4 +-
 .../amarok_collection-umscollection.desktop        |    2 +-
 .../amarok_collection-upnpcollection.desktop       |    2 +-
 .../playlists/types/file/m3u/M3UPlaylist.cpp       |    3 +-
 .../playlists/types/file/pls/PLSPlaylist.cpp       |    3 +
 .../playlists/types/file/xspf/XSPFPlaylist.cpp     |    2 +
 src/playlist/navigators/TrackNavigator.cpp         |    2 +
 src/scripts/radio_station_service/main.js          |    2 +-
 .../amazon/amarok_service_amazonstore.desktop      |    4 +-
 .../amarok_service_amazonstore_config.desktop      |    1 +
 .../ampache/amarok_service_ampache.desktop         |    2 +-
 .../gpodder/amarok_service_gpodder.desktop         |    4 +-
 .../gpodder/amarok_service_gpodder_config.desktop  |    2 +
 .../jamendo/amarok_service_jamendo.desktop         |    2 +-
 src/services/lastfm/amarok_service_lastfm.desktop  |    2 +-
 .../amarok_service_magnatunestore.desktop          |    2 +-
 .../mp3tunes/amarok_service_mp3tunes.desktop       |    4 +-
 .../amarok_service_opmldirectory.desktop           |    2 +-
 84 files changed, 72193 insertions(+), 72088 deletions(-)

-- 
Amarok packaging