[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.4-2-9-g7115364

Pino Toscano pino at moszumanska.debian.org
Fri Sep 29 17:23:42 UTC 2017


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

The following commit has been merged in the master branch:
commit d08def95927ccbf76d98ec017b8a915db440f9cc
Merge: b83c74ba1d84091a18aa2190c813ac4c041d689e fd2cfe187c0bc9ff547e14b13d9d98edd75118a6
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 29 18:47:48 2017 +0200

    Updated version 0.6.5 from 'upstream/0.6.5'
    
    with Debian dir cb4c4ade241abffeb1fc65912012db2c71b28144

 .copyright.sh                                      |   27 +-
 ChangeLog                                          |   28 +
 README.md                                          |    3 +
 cmake/FindXine.cmake                               |    6 +-
 pkg/arch/PKGBUILD                                  |   25 +-
 pkg/arch/PKGBUILD-git                              |    5 +-
 pkg/debian/control                                 |    2 +-
 po/cs/subtitlecomposer.po                          |  402 ++----
 po/hr/subtitlecomposer.po                          |  100 +-
 src/common/commondefs.cpp                          |   14 +-
 src/common/commondefs.h                            |   22 +-
 src/common/fileloadhelper.cpp                      |    5 +-
 src/common/fileloadhelper.h                        |   13 +-
 src/common/filesavehelper.cpp                      |    9 +-
 src/common/filesavehelper.h                        |   13 +-
 src/common/filetrasher.cpp                         |    6 +-
 src/common/filetrasher.h                           |   41 +-
 src/common/languagecode.h                          |   41 +-
 src/config.h.cmake                                 |    2 +-
 src/core/action.h                                  |   94 +-
 src/core/actionmanager.h                           |   41 +-
 src/core/compositeaction.h                         |   69 +-
 src/core/formatdata.h                              |   41 +-
 src/core/range.h                                   |   41 +-
 src/core/rangelist.h                               |   41 +-
 src/core/sstring.cpp                               |  478 ++++---
 src/core/sstring.h                                 |  343 +----
 src/core/subtitle.cpp                              |  136 +-
 src/core/subtitle.h                                |    9 +-
 src/core/subtitleactions.cpp                       |   60 +-
 src/core/subtitleactions.h                         |   73 +-
 src/core/subtitleiterator.cpp                      |   38 +-
 src/core/subtitleiterator.h                        |   45 +-
 src/core/subtitleline.cpp                          |   28 +-
 src/core/subtitleline.h                            |   13 +-
 src/core/subtitlelineactions.cpp                   |   66 +-
 src/core/subtitlelineactions.h                     |   79 +-
 src/core/tests/rangelisttest.cpp                   |   38 +-
 src/core/tests/rangelisttest.h                     |   41 +-
 src/core/tests/rangetest.cpp                       |   38 +-
 src/core/tests/rangetest.h                         |   41 +-
 src/core/tests/sstringtest.cpp                     |   40 +-
 src/core/tests/sstringtest.h                       |   41 +-
 src/core/tests/timetest.cpp                        |   38 +-
 src/core/tests/timetest.h                          |   41 +-
 src/core/time.h                                    |   43 +-
 src/formats/CMakeLists.txt                         |   10 +
 src/formats/format.h                               |   51 +-
 src/formats/formatmanager.cpp                      |   72 +-
 src/formats/formatmanager.h                        |   49 +-
 src/formats/inputformat.h                          |   46 +-
 src/formats/microdvd/microdvdinputformat.h         |   53 +-
 src/formats/microdvd/microdvdoutputformat.h        |   65 +-
 src/formats/mplayer/mplayerinputformat.h           |   49 +-
 src/formats/mplayer/mplayeroutputformat.h          |   49 +-
 src/formats/mplayer2/mplayer2inputformat.h         |   47 +-
 src/formats/mplayer2/mplayer2outputformat.h        |   49 +-
 src/formats/outputformat.h                         |   42 +-
 src/formats/subrip/subripinputformat.h             |   47 +-
 src/formats/subrip/subripoutputformat.h            |   49 +-
 .../substationalpha/substationalphainputformat.h   |   96 +-
 .../substationalpha/substationalphaoutputformat.h  |   93 +-
 src/formats/subviewer1/subviewer1inputformat.h     |   49 +-
 src/formats/subviewer1/subviewer1outputformat.h    |   47 +-
 src/formats/subviewer2/subviewer2inputformat.h     |   49 +-
 src/formats/subviewer2/subviewer2outputformat.h    |   64 +-
 src/formats/textdemux/textdemux.h                  |    5 +-
 src/formats/tmplayer/tmplayerinputformat.h         |   45 +-
 src/formats/tmplayer/tmplayeroutputformat.h        |   49 +-
 src/formats/vobsub/CMakeLists.txt                  |   19 +
 src/formats/vobsub/mplayer/CMakeLists.txt          |   16 +
 src/formats/vobsub/mplayer/README                  |    4 +
 src/formats/vobsub/mplayer/mp_msg.c                |  249 ++++
 src/formats/vobsub/mplayer/mp_msg.h                |  171 +++
 src/formats/vobsub/mplayer/spudec.c                | 1494 ++++++++++++++++++++
 src/formats/vobsub/mplayer/spudec.h                |   58 +
 src/formats/vobsub/mplayer/unrar_exec.c            |  235 +++
 src/formats/vobsub/mplayer/unrar_exec.h            |   62 +
 src/formats/vobsub/mplayer/vobsub.c                | 1467 +++++++++++++++++++
 src/formats/vobsub/mplayer/vobsub.h                |   61 +
 src/formats/vobsub/vobsubinputformat.h             |  174 +++
 src/formats/vobsub/vobsubinputinitdialog.cpp       |   73 +
 .../vobsub/vobsubinputinitdialog.h}                |   51 +-
 src/formats/vobsub/vobsubinputinitdialog.ui        |  146 ++
 src/formats/vobsub/vobsubinputprocessdialog.cpp    |  894 ++++++++++++
 src/formats/vobsub/vobsubinputprocessdialog.h      |   95 ++
 src/formats/vobsub/vobsubinputprocessdialog.ui     |  345 +++++
 .../youtubecaptions/youtubecaptionsinputformat.h   |   51 +-
 .../youtubecaptions/youtubecaptionsoutputformat.h  |   43 +-
 src/main/CMakeLists.txt                            |    1 +
 src/main/actions/CMakeLists.txt                    |    1 +
 src/main/actions/krecentfilesactionext.h           |    8 +-
 src/main/actions/useraction.cpp                    |   41 +-
 src/main/actions/useraction.h                      |   41 +-
 src/main/actions/useractionnames.h                 |   43 +-
 src/main/application.cpp                           |  260 ++--
 src/main/application.h                             |   18 +-
 src/main/configs/configdialog.cpp                  |   15 +-
 src/main/configs/configdialog.h                    |    3 +-
 src/main/configs/errorsconfigwidget.h              |   14 +-
 src/main/configs/errorsconfigwidget.ui             |    8 +-
 src/main/configs/generalconfigwidget.h             |   14 +-
 src/main/configs/generalconfigwidget.ui            |   24 +-
 src/main/configs/playerconfigwidget.h              |   14 +-
 src/main/currentlinewidget.cpp                     |    9 +-
 src/main/currentlinewidget.h                       |    8 +-
 src/main/dialogs/actiondialog.h                    |    8 +-
 src/main/dialogs/actionwitherrortargetsdialog.h    |   41 +-
 src/main/dialogs/actionwithtargetdialog.h          |    8 +-
 src/main/dialogs/adjusttimesdialog.h               |   41 +-
 src/main/dialogs/autodurationsdialog.h             |    8 +-
 src/main/dialogs/changeframeratedialog.h           |   41 +-
 src/main/dialogs/changetextscasedialog.h           |   41 +-
 src/main/dialogs/checkerrorsdialog.h               |   41 +-
 src/main/dialogs/clearerrorsdialog.h               |   41 +-
 src/main/dialogs/durationlimitsdialog.h            |   41 +-
 src/main/dialogs/fixoverlappingtimesdialog.h       |    8 +-
 src/main/dialogs/fixpunctuationdialog.h            |   41 +-
 src/main/dialogs/insertlinedialog.h                |   41 +-
 src/main/dialogs/intinputdialog.h                  |    8 +-
 src/main/dialogs/joinsubtitlesdialog.cpp           |   10 +-
 src/main/dialogs/joinsubtitlesdialog.h             |   41 +-
 src/main/dialogs/opensubtitledialog.cpp            |    8 +-
 src/main/dialogs/opensubtitledialog.h              |    8 +-
 src/main/dialogs/progressdialog.h                  |    8 +-
 src/main/dialogs/removelinesdialog.h               |   41 +-
 src/main/dialogs/savesubtitledialog.cpp            |   27 +-
 src/main/dialogs/savesubtitledialog.h              |    8 +-
 src/main/dialogs/selectablesubtitledialog.h        |    8 +-
 src/main/dialogs/shifttimesdialog.h                |   41 +-
 src/main/dialogs/smarttextsadjustdialog.h          |    8 +-
 src/main/dialogs/splitsubtitledialog.cpp           |   12 +-
 src/main/dialogs/splitsubtitledialog.h             |   41 +-
 src/main/dialogs/subtitlecolordialog.h             |   42 +-
 src/main/dialogs/syncsubtitlesdialog.h             |   41 +-
 src/main/dialogs/textinputdialog.h                 |    8 +-
 src/main/dialogs/translatedialog.h                 |   41 +-
 src/main/errorsdialog.h                            |    8 +-
 src/main/errorswidget.h                            |   41 +-
 src/main/icons/128-apps-subtitlecomposer.png       |  Bin 22018 -> 21973 bytes
 ...veform-logo.png => 128-categories-waveform.png} |  Bin 3493 -> 3493 bytes
 src/main/icons/16-actions-select_stream.png        |  Bin 0 -> 801 bytes
 src/main/icons/16-actions-time_from_video.png      |  Bin 0 -> 878 bytes
 src/main/icons/16-apps-subtitlecomposer.png        |  Bin 922 -> 895 bytes
 src/main/icons/256-apps-subtitlecomposer.png       |  Bin 57680 -> 57572 bytes
 src/main/icons/32-apps-subtitlecomposer.png        |  Bin 2644 -> 2622 bytes
 src/main/icons/48-actions-audio_extract.png        |  Bin 0 -> 2030 bytes
 src/main/icons/48-apps-gstreamer.png               |  Bin 0 -> 1329 bytes
 ...ediaplayer-logo.png => 48-apps-mediaplayer.png} |  Bin
 .../{mplayer-logo.png => 48-apps-mplayer.png}      |  Bin
 src/main/icons/48-apps-xine.png                    |  Bin 0 -> 1435 bytes
 src/main/icons/64-apps-mpv.png                     |  Bin 0 -> 5576 bytes
 src/main/icons/CMakeLists.txt                      |   31 +-
 src/main/icons/anchor.svgz                         |  Bin 692 -> 0 bytes
 src/main/icons/audio-extract.png                   |  Bin 2051 -> 0 bytes
 src/main/icons/current-line-follows-video.svgz     |  Bin 1172 -> 0 bytes
 src/main/icons/gstreamer-logo.png                  |  Bin 1345 -> 0 bytes
 src/main/icons/mpv-logo.png                        |  Bin 5633 -> 0 bytes
 src/main/icons/sc-actions-anchor.svg               |    3 +
 .../sc-actions-current_line_follows_video.svg      |    4 +
 src/main/icons/sc-actions-playrate_minus.svg       |    4 +
 src/main/icons/sc-actions-playrate_plus.svg        |    4 +
 src/main/icons/sc-actions-set_hide_time.svg        |    4 +
 src/main/icons/sc-actions-set_show_time.svg        |    4 +
 src/main/icons/select-stream.png                   |  Bin 801 -> 0 bytes
 src/main/icons/set-hide-time.svgz                  |  Bin 1186 -> 0 bytes
 src/main/icons/set-show-time.svgz                  |  Bin 1179 -> 0 bytes
 src/main/icons/time-from-video.png                 |  Bin 882 -> 0 bytes
 src/main/icons/xine-logo.png                       |  Bin 1478 -> 0 bytes
 src/main/lineswidget.cpp                           |  126 +-
 src/main/lineswidget.h                             |   47 +-
 src/main/main.cpp                                  |   32 +-
 src/main/mainwindow.h                              |    8 +-
 src/main/playerwidget.cpp                          |  112 +-
 src/main/playerwidget.h                            |   15 +-
 src/main/scconfig.kcfg                             |    4 +
 src/main/scripting/scripting_list.cpp              |   39 +-
 src/main/scripting/scripting_list.h                |   50 +-
 src/main/scripting/scripting_range.h               |   41 +-
 src/main/scripting/scripting_rangelist.h           |   41 +-
 src/main/scripting/scripting_rangesmodule.h        |   41 +-
 src/main/scripting/scripting_sstring.cpp           |   42 +-
 src/main/scripting/scripting_sstring.h             |   43 +-
 src/main/scripting/scripting_stringsmodule.h       |   41 +-
 src/main/scripting/scripting_subtitle.h            |   41 +-
 src/main/scripting/scripting_subtitleline.h        |   41 +-
 src/main/scripting/scripting_subtitlelinemodule.h  |   41 +-
 src/main/scripting/scripting_subtitlemodule.h      |   41 +-
 src/main/scripting/scriptsmanager.cpp              |   21 +-
 src/main/scripting/scriptsmanager.h                |    8 +-
 src/main/subtitlecomposer.desktop                  |    2 +-
 src/main/subtitlecomposer.xml                      |   21 +-
 src/main/subtitlecomposerui.rc                     |    7 +-
 src/main/utils/errorfinder.h                       |   41 +-
 src/main/utils/errortracker.h                      |   14 +-
 src/main/utils/finder.h                            |   41 +-
 src/main/utils/language.h                          |   41 +-
 src/main/utils/replacer.h                          |    8 +-
 src/main/utils/speller.h                           |   14 +-
 src/main/utils/translator.cpp                      |   24 +-
 src/main/utils/translator.h                        |   49 +-
 src/profiler.h                                     |   45 +-
 .../pocketsphinx/pocketsphinxplugin.cpp            |    8 +-
 src/speechprocessor/speechplugin.h                 |    8 +-
 src/speechprocessor/speechprocessor.cpp            |    9 +-
 src/streamprocessor/gstreamer.h                    |   41 +-
 src/streamprocessor/streamprocessor.cpp            |   13 +-
 src/streamprocessor/streamprocessor.h              |    8 +-
 src/videoplayer/playerbackend.cpp                  |   12 +-
 src/videoplayer/playerbackend.h                    |   37 +-
 src/videoplayer/videoplayer.cpp                    |   61 +-
 src/videoplayer/videoplayer.h                      |   37 +-
 src/videoplayer/videowidget.h                      |   43 +-
 src/videoplayer/waveformat.h                       |   41 +-
 .../gstreamer/gstreamerconfigwidget.h              |    8 +-
 .../gstreamer/gstreamerplayerbackend.cpp           |  100 +-
 .../gstreamer/gstreamerplayerbackend.h             |   15 +-
 src/videoplayerplugins/mplayer/mediadata.h         |    4 -
 .../mplayer/mplayerconfigwidget.h                  |   14 +-
 .../mplayer/mplayerplayerbackend.h                 |   13 +-
 .../mplayer/mplayerplayerprocess.h                 |    8 +-
 src/videoplayerplugins/mpv/mpvbackend.cpp          |   50 +-
 src/videoplayerplugins/mpv/mpvbackend.h            |   10 +-
 src/videoplayerplugins/mpv/mpvconfigwidget.cpp     |   12 +-
 src/videoplayerplugins/mpv/mpvconfigwidget.h       |    8 +-
 .../phonon/phononplayerbackend.h                   |   10 +-
 src/videoplayerplugins/xine/xineconfigwidget.h     |   14 +-
 src/videoplayerplugins/xine/xineplayerbackend.cpp  |    5 +-
 src/videoplayerplugins/xine/xineplayerbackend.h    |    8 +-
 src/videoplayerplugins/xine/xinevideolayerwidget.h |   39 +-
 src/widgets/layeredwidget.h                        |    8 +-
 src/widgets/pointingslider.h                       |    4 -
 src/widgets/simplerichtextedit.h                   |    8 +-
 src/widgets/textoverlaywidget.cpp                  |   20 +-
 src/widgets/textoverlaywidget.h                    |   41 +-
 src/widgets/timeedit.h                             |   41 +-
 src/widgets/timevalidator.cpp                      |   39 +-
 src/widgets/timevalidator.h                        |   41 +-
 src/widgets/waveformwidget.cpp                     |  350 ++++-
 src/widgets/waveformwidget.h                       |   30 +-
 240 files changed, 9609 insertions(+), 3921 deletions(-)

-- 
subtitlecomposer packaging



More information about the pkg-kde-commits mailing list