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

Modestas Vainius modax at alioth.debian.org
Sat Jul 30 16:13:22 UTC 2011


The following commit has been merged in the master branch:
commit 90d354bf626f98b63d6fa7a9d6a3c0103090b5bf
Merge: 275a6ae790a503469fbdb02ec2aef16c6e652678 86c91524974b01f6542eba37d6ae920f682aa49d
Author: Modestas Vainius <modax at debian.org>
Date:   Thu Jul 28 17:39:49 2011 +0300

    Merge commit 'upstream/2.4.3'

 .reviewboardrc                                     |    2 +-
 ChangeLog                                          |   11 +-
 doc/pt/index.docbook                               |  200 +-
 po/CMakeLists.txt                                  |    1 +
 po/bs/amarok.po                                    |10500 ++++----
 po/ca/amarok.po                                    |10970 +++++-----
 po/ca at valencia/amarok.po                           |10823 +++++-----
 po/cs/amarok.po                                    |10693 ++++-----
 po/da/amarok.po                                    |10388 ++++----
 po/de/amarok.po                                    |10706 ++++-----
 po/el/amarok.po                                    |10598 ++++----
 po/en_GB/amarok.po                                 |10691 +++++----
 po/es/amarok.po                                    |10610 ++++----
 po/et/amarok.po                                    |10488 ++++----
 po/fi/amarok.po                                    |10289 ++++----
 po/fr/amarok.po                                    |11073 +++++-----
 po/ga/amarok.po                                    |10146 ++++----
 po/gl/amarok.po                                    |10826 +++++-----
 po/it/amarok.po                                    |10539 ++++----
 po/ja/amarok.po                                    |10428 ++++----
 po/lt/amarok.po                                    |10528 ++++----
 po/nl/amarok.po                                    |10514 ++++----
 po/pa/amarok.po                                    |10052 ++++----
 po/pl/amarok.po                                    |10486 ++++----
 po/pt/amarok.po                                    |10529 ++++----
 po/pt_BR/amarok.po                                 |10518 ++++----
 po/ru/amarok.po                                    |10615 ++++----
 po/sl/amarok.po                                    |10565 ++++----
 po/sr/amarok.po                                    |10493 ++++----
 po/sr at ijekavian/amarok.po                          |10498 ++++----
 po/sr at ijekavianlatin/amarok.po                     |10521 ++++----
 po/sr at latin/amarok.po                              |10524 ++++----
 po/sv/amarok.po                                    |10466 ++++----
 po/uk/amarok.po                                    |10529 ++++----
 po/wa/CMakeLists.txt                               |    2 +
 po/{zh_CN => wa}/amarok.po                         |25356 ++++++++++----------
 po/{zh_CN => wa}/amarokcollectionscanner_qt.po     |   55 +-
 po/zh_CN/amarok.po                                 |10517 ++++----
 po/zh_TW/amarok.po                                 |10202 ++++----
 shared/Version.h                                   |    2 +-
 src/PluginManager.cpp                              |    2 +-
 src/amarok_containers.desktop                      |    1 -
 .../labels/amarok-context-applet-labels.desktop    |    1 +
 .../tabs/amarok-context-applet-tabs.desktop        |    1 +
 .../upcomingevents/UpcomingEventsApplet.cpp        |    2 +-
 .../amarok-containment-vertical.desktop            |    2 +-
 .../labels/amarok-data-engine-labels.desktop       |    1 +
 .../engines/tabs/amarok-data-engine-tabs.desktop   |    1 +
 .../amarok_collection-audiocdcollection.desktop    |    4 +-
 .../daap/amarok_collection-daapcollection.desktop  |    6 +-
 src/core-impl/collections/db/DatabaseMeta.h        |    2 +-
 .../collections/db/sql/SqlCollectionLocation.cpp   |   12 +-
 src/core-impl/collections/db/sql/SqlMeta.h         |    2 +-
 .../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     |    2 +-
 ...amarok_collection-mysqlservercollection.desktop |    2 +-
 .../amarok_collection-ipodcollection.desktop       |    4 +-
 .../MediaDeviceCollectionLocation.cpp              |    2 +-
 ...amarok_collection-mediadevicecollection.desktop |    2 +-
 .../amarok_collection-mtpcollection.desktop        |    4 +-
 .../amarok_collection-nepomukcollection.desktop    |    2 +-
 .../amarok_collection-playdarcollection.desktop    |    5 +-
 .../playdarcollection/support/Query.cpp            |   12 +-
 .../collections/playdarcollection/support/Query.h  |    6 +-
 .../support/CollectionLocationDelegateImpl.cpp     |    6 +-
 .../amarok_collection-umscollection.desktop        |    2 +-
 .../amarok_collection-upnpcollection.desktop       |    4 +-
 src/core/collections/CollectionLocation.cpp        |    4 +-
 src/core/collections/CollectionLocation.h          |   12 +-
 src/core/meta/support/MetaUtility.cpp              |   13 +-
 src/covermanager/CoverFetchUnit.cpp                |    2 +-
 src/dbus/mpris1/PlayerHandler.cpp                  |    2 +-
 src/dynamic/biases/PartBias.cpp                    |    2 +-
 src/playlist/PlaylistModel.cpp                     |    6 +-
 .../ampache/amarok_service_ampache.desktop         |    2 +-
 .../gpodder/amarok_service_gpodder.desktop         |    4 +-
 .../jamendo/amarok_service_jamendo.desktop         |    2 +-
 src/services/lastfm/LastFmService.cpp              |   28 +-
 src/services/lastfm/LastFmService.h                |    1 +
 src/services/lastfm/ScrobblerAdapter.cpp           |   25 +-
 src/services/lastfm/ScrobblerAdapter.h             |    1 +
 src/services/lastfm/amarok_service_lastfm.desktop  |    2 +-
 .../amarok_service_magnatunestore.desktop          |    2 +-
 .../mp3tunes/amarok_service_mp3tunes.desktop       |    2 +-
 .../amarok_service_opmldirectory.desktop           |    2 +-
 87 files changed, 182040 insertions(+), 181122 deletions(-)

-- 
Amarok packaging



More information about the pkg-kde-commits mailing list