[SCM] bangarang packaging branch, master, updated. debian/2.0.1-1.retag-6-g9c00a50

Ryan Kavanagh ryanakca-guest at alioth.debian.org
Sun Dec 18 19:51:48 UTC 2011


The following commit has been merged in the master branch:
commit f4207c37563eeb1c6ab626c9a602235b9b554081
Merge: 7831eb2a3f93c3017b0a2a8e93de4210ee6b5810 180a46c4b1f7cac75fbe8933e6e321c3204d1195
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Sun Dec 18 13:22:38 2011 -0500

    Merge commit 'upstream/2.1'

 README                                             |    2 +-
 icons/hi256-app-bangarang.png                      |  Bin 0 -> 11379 bytes
 icons/hi32-app-bangarang-douban.png                |  Bin 0 -> 5478 bytes
 po/CMakeLists.txt                                  |    3 +
 po/bangarang.pot                                   | 2393 +++++-----
 po/cs/bangarang.po                                 | 4989 ++++++++++---------
 po/da/bangarang.po                                 | 5081 ++++++++++----------
 po/de/bangarang.po                                 | 2987 ++++++------
 po/el/bangarang.po                                 | 2952 ++++++------
 po/es/bangarang.po                                 | 3227 ++++++-------
 po/fi/bangarang.po                                 | 2926 ++++++------
 po/fr/bangarang.po                                 | 2929 ++++++------
 po/hu/CMakeLists.txt                               |    2 +
 po/hu/bangarang.po                                 | 2304 +++++++++
 po/it/bangarang.po                                 | 2965 +++++++------
 po/lt/bangarang.po                                 | 2949 ++++++------
 po/merge.sh                                        |   17 -
 po/nl/bangarang.po                                 | 3003 +++++++------
 po/pl/bangarang.po                                 | 2937 ++++++------
 po/pt/CMakeLists.txt                               |    2 +
 po/pt/bangarang.po                                 | 2305 +++++++++
 po/pt_BR/bangarang.po                              | 2942 ++++++------
 po/ru/CMakeLists.txt                               |    2 +
 po/ru/bangarang.po                                 | 2330 +++++++++
 po/uk/bangarang.po                                 | 2943 ++++++------
 po/zh_CN/bangarang.po                              | 2827 ++++++-----
 reference/README                                   |    1 -
 reference/imdbqueryengine.cpp                      |  564 ---
 reference/imdbqueryengine.h                        |  256 -
 reference/scriptconsole.cpp                        |  153 -
 reference/scriptconsole.h                          |   65 -
 src/CMakeLists.txt                                 |   60 +-
 src/Messages.sh                                    |   30 +-
 src/{ => app/common}/actionsmanager.cpp            |  210 +-
 src/{ => app/common}/actionsmanager.h              |    6 +
 src/app/common/artworkpainter.cpp                  |   95 +
 .../common/artworkpainter.h}                       |   33 +-
 src/{ => app/common}/bangarangapplication.cpp      |  163 +-
 src/{ => app/common}/bangarangapplication.h        |   10 +
 src/{ => app/common}/bangarangnotifieritem.cpp     |    0
 src/{ => app/common}/bangarangnotifieritem.h       |    0
 src/{ => app/common}/dbusobjects.cpp               |    6 +-
 src/{ => app/common}/dbusobjects.h                 |    0
 src/app/common/flickcharm.cpp                      |  294 ++
 src/app/common/flickcharm.h                        |   49 +
 src/app/common/mainwindow.cpp                      |  578 +++
 src/app/common/mainwindow.h                        |  122 +
 src/{ => app/common}/mediaitemdelegate.cpp         |  163 +-
 src/{ => app/common}/mediaitemdelegate.h           |   13 +-
 src/{ => app/common}/mediaview.cpp                 |   29 +-
 src/{ => app/common}/mediaview.h                   |    9 +-
 src/{ => app/common}/ratingdelegate.cpp            |    0
 src/{ => app/common}/ratingdelegate.h              |    0
 src/{ => app/common}/sensiblewidgets.cpp           |    0
 src/{ => app/common}/sensiblewidgets.h             |    0
 src/{ => app/common}/starrating.cpp                |    0
 src/{ => app/common}/starrating.h                  |    2 +-
 src/{ => app}/main.cpp                             |   10 +-
 src/app/medialists/audiolistsstack.cpp             |   71 +
 src/app/medialists/audiolistsstack.h               |   31 +
 src/{ => app/medialists}/infobox.cpp               |   20 +-
 src/{ => app/medialists}/infobox.h                 |    1 +
 src/{ => app/medialists}/infoitemdelegate.cpp      |  280 +-
 src/{ => app/medialists}/infoitemdelegate.h        |   12 +-
 src/{ => app/medialists}/infoitemview.cpp          |   12 +-
 src/{ => app/medialists}/infoitemview.h            |    2 +
 src/{ => app/medialists}/infomanager.cpp           |   93 +-
 src/{ => app/medialists}/infomanager.h             |    6 +-
 src/app/medialists/medialistsettings.cpp           |  411 ++
 src/{ => app/medialists}/medialistsettings.h       |    2 +
 src/app/medialists/medialistsmanager.cpp           |  581 +++
 src/app/medialists/medialistsmanager.h             |   96 +
 src/app/medialists/savedlistsmanager.cpp           | 1098 +++++
 src/{ => app/medialists}/savedlistsmanager.h       |   11 +-
 src/app/medialists/videolistsstack.cpp             |   71 +
 src/app/medialists/videolistsstack.h               |   32 +
 src/{ => app/nowplaying}/audiosettings.cpp         |   19 +-
 src/{ => app/nowplaying}/audiosettings.h           |    1 +
 .../nowplaying}/bangarangvideowidget.cpp           |   12 +-
 .../nowplaying}/bangarangvideowidget.h             |    3 +-
 src/{ => app/nowplaying}/bookmarksmanager.cpp      |   20 +-
 src/{ => app/nowplaying}/bookmarksmanager.h        |    3 +
 src/{ => app/nowplaying}/nowplayingdelegate.cpp    |   91 +-
 src/{ => app/nowplaying}/nowplayingdelegate.h      |    2 +
 src/app/nowplaying/nowplayingmanager.cpp           |  581 +++
 src/app/nowplaying/nowplayingmanager.h             |   90 +
 src/{ => app/nowplaying}/nowplayingview.cpp        |   15 +-
 src/{ => app/nowplaying}/nowplayingview.h          |    3 +-
 src/{ => app/nowplaying}/playlistview.cpp          |   20 +-
 src/{ => app/nowplaying}/playlistview.h            |    6 +-
 src/{ => app/nowplaying}/videosettings.cpp         |  187 +-
 src/{ => app/nowplaying}/videosettings.h           |    5 +-
 src/app/ui/audiolistsstack.ui                      | 1081 +++++
 {convenience => src/app/ui/convenience}/README     |    0
 .../app/ui/convenience}/audio-x-wav.png            |  Bin 698 -> 698 bytes
 .../app/ui/convenience}/configure.png              |  Bin 717 -> 717 bytes
 .../app/ui/convenience}/dialog-close.png           |  Bin 813 -> 813 bytes
 .../app/ui/convenience}/document-open-folder.png   |  Bin 419 -> 419 bytes
 .../app/ui/convenience}/document-save.png          |  Bin 563 -> 563 bytes
 .../app/ui/convenience}/documentinfo.png           |  Bin 861 -> 861 bytes
 .../app/ui/convenience}/flag-blue.png              |  Bin 1691 -> 1691 bytes
 .../app/ui/convenience}/help-about.png             |  Bin 734 -> 734 bytes
 .../app/ui/convenience}/list-add.png               |  Bin 564 -> 564 bytes
 .../app/ui/convenience}/list-remove.png            |  Bin 332 -> 332 bytes
 .../app/ui/convenience}/mail-mark-notjunk.png      |  Bin 1127 -> 1127 bytes
 .../app/ui/convenience}/media-optical.png          |  Bin 1066 -> 1066 bytes
 .../app/ui/convenience}/media-playback-start.png   |  Bin 1177 -> 1177 bytes
 .../app/ui/convenience}/media-playback-start16.png |  Bin 501 -> 501 bytes
 .../app/ui/convenience}/media-skip-backward.png    |  Bin 753 -> 753 bytes
 .../app/ui/convenience}/media-skip-forward.png     |  Bin 752 -> 752 bytes
 .../preferences-desktop-text-to-speech.png         |  Bin 915 -> 915 bytes
 .../app/ui/convenience}/system-users.png           |  Bin 2092 -> 2092 bytes
 .../app/ui/convenience}/tool-animator.png          |  Bin 1960 -> 1960 bytes
 .../app/ui/convenience}/tool-animator16.png        |  Bin 892 -> 892 bytes
 .../app/ui/convenience}/video-television.png       |  Bin 542 -> 542 bytes
 .../app/ui/convenience}/video-x-generic.png        |  Bin 721 -> 721 bytes
 .../app/ui/convenience}/view-fullscreen.png        |  Bin 396 -> 396 bytes
 .../app/ui/convenience}/view-media-playlist.png    |  Bin 908 -> 908 bytes
 .../app/ui/convenience}/view-sort-ascending.png    |  Bin 632 -> 632 bytes
 src/{ => app/ui}/mainwindow.ui                     | 2463 ++--------
 src/app/ui/videolistsstack.ui                      |  961 ++++
 src/mainwindow.cpp                                 | 1467 ------
 src/mainwindow.h                                   |  212 -
 src/medialistsettings.cpp                          |  384 --
 src/platform/devicemanager.cpp                     |  135 +
 src/platform/devicemanager.h                       |   48 +
 src/platform/infofetchers/doubaninfofetcher.cpp    |  223 +
 src/platform/infofetchers/doubaninfofetcher.h      |   56 +
 src/platform/infofetchers/feedinfofetcher.cpp      |   21 +-
 src/platform/infofetchers/infofetcher.cpp          |   41 -
 src/platform/infofetchers/infofetcher.h            |    1 -
 src/platform/infoitemmodel.cpp                     |  229 +-
 src/platform/infoitemmodel.h                       |   11 +
 src/platform/listengines/ampachelistengine.cpp     |  383 ++
 .../{feedlistengine.h => ampachelistengine.h}      |   49 +-
 src/platform/listengines/audioclipslistengine.cpp  |    4 +
 src/platform/listengines/dvdlistengine.cpp         |   57 +-
 src/platform/listengines/dvdlistengine.h           |    4 +-
 src/platform/listengines/feedlistengine.cpp        |  110 +-
 src/platform/listengines/feedlistengine.h          |    1 +
 src/platform/listengines/filelistengine.cpp        |   76 +-
 src/platform/listengines/listenginefactory.cpp     |    8 +-
 src/platform/listengines/listenginefactory.h       |    3 +-
 src/platform/listengines/medialistsengine.cpp      |  109 +-
 src/platform/listengines/medialistsengine.h        |    2 +
 src/platform/listengines/musiclistengine.cpp       |    8 +-
 src/platform/listengines/nepomuklistengine.cpp     |    2 +
 src/platform/listengines/semanticslistengine.cpp   |  120 +-
 src/platform/listengines/semanticslistengine.h     |    3 +
 src/platform/listengines/videolistengine.cpp       |   20 +
 src/platform/mediaindexer.cpp                      |   33 +
 src/platform/mediaindexer.h                        |   10 +-
 src/platform/mediaitemmodel.cpp                    |    7 +
 src/platform/mediaitemmodel.h                      |    9 +-
 src/platform/mediaquery.h                          |    6 +-
 src/platform/playlist.cpp                          |  104 +-
 src/platform/playlist.h                            |    4 +-
 src/platform/utilities/artwork.cpp                 |   26 +-
 src/platform/utilities/filetags.cpp                |    2 +-
 src/platform/utilities/filetags.h                  |    4 +-
 src/platform/utilities/general.cpp                 |   33 +-
 src/platform/utilities/general.h                   |    2 +-
 src/platform/utilities/mediaitems.cpp              |   28 +-
 src/platform/utilities/mediaitems.h                |    1 +
 src/platform/utilities/sha256.cpp                  |  406 ++
 src/platform/utilities/sha256.h                    |   49 +
 src/platform/utilities/typechecks.cpp              |   72 +-
 src/platform/utilities/typechecks.h                |    1 +
 src/savedlistsmanager.cpp                          |  762 ---
 169 files changed, 42558 insertions(+), 29119 deletions(-)

-- 
bangarang packaging



More information about the pkg-kde-commits mailing list