[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.5-1-6-g7e8f59b

Pino Toscano pino at moszumanska.debian.org
Wed Feb 14 07:36:06 UTC 2018


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

The following commit has been merged in the master branch:
commit 1db3222f58db882f8605c245353fc3964cbcaf97
Merge: 762191e24d2ed826f5d15506395f448f646cbf20 9623d5e869cff418d561fa7e9dd5475a29c11b6a
Author: Pino Toscano <pino at debian.org>
Date:   Wed Feb 14 08:02:02 2018 +0100

    Update upstream source from tag 'upstream/0.6.6'
    
    Update to upstream version '0.6.6'
    with Debian dir 0c507b72fac17db3afcd66afa7a1d1cd0a89fc54

 CMakeLists.txt                                     |   22 +-
 COPYING                                            |   39 +-
 ChangeLog                                          |  244 +-
 README.md                                          |   54 +-
 cmake/FindFFmpeg.cmake                             |   65 +
 cmake/FindGLIB2.cmake                              |    4 +-
 cmake/FindGObject.cmake                            |    2 +-
 cmake/FindGStreamer.cmake                          |    4 +-
 cmake/FindGStreamerPlugins.cmake                   |  108 +-
 cmake/FindPocketSphinx.cmake                       |   16 +-
 cmake/FindXine.cmake                               |    9 +-
 configure                                          |    2 +-
 install                                            |    2 +-
 pkg/arch/PKGBUILD                                  |    2 +-
 pkg/arch/PKGBUILD-git                              |   14 +-
 {debian => pkg/debian}/.gitattributes              |    0
 pkg/debian/changelog                               |  131 +-
 pkg/debian/control                                 |   44 +-
 pkg/debian/copyright                               |  160 +-
 pkg/debian/docs                                    |    1 -
 pkg/debian/man/subtitlecomposer.1                  |  149 +-
 pkg/debian/patches/03_link_phonon.diff             |   15 -
 pkg/debian/patches/pocketsphinx-ubuntu.patch       |   13 -
 pkg/debian/patches/series                          |    2 -
 pkg/debian/rules                                   |   22 +-
 {debian => pkg/debian}/source/format               |    0
 pkg/debian/subtitlecomposer.lintian-overrides      |   10 +-
 pkg/debian/subtitlecomposer.menu                   |    4 -
 pkg/debian/watch                                   |    3 +-
 po/hr/subtitlecomposer.po                          | 3786 ++++++++++----------
 po/subtitlecomposer.pot                            | 2898 ++++++++-------
 src/CMakeLists.txt                                 |  106 +-
 src/{main => }/actions/CMakeLists.txt              |    0
 src/{main => }/actions/kcodecactionext.cpp         |    2 +-
 src/{main => }/actions/kcodecactionext.h           |    0
 src/{main => }/actions/krecentfilesactionext.cpp   |    0
 src/{main => }/actions/krecentfilesactionext.h     |    0
 src/{main => }/actions/useraction.cpp              |    8 +-
 src/{main => }/actions/useraction.h                |    0
 src/{main => }/actions/useractionnames.h           |    0
 src/{main => }/application.cpp                     |   61 +-
 src/{main => }/application.h                       |    8 +-
 src/common/CMakeLists.txt                          |   16 -
 src/{main => }/configs/CMakeLists.txt              |    0
 src/{main => }/configs/configdialog.cpp            |    6 +-
 src/{main => }/configs/configdialog.h              |    0
 src/{main => }/configs/errorsconfigwidget.cpp      |    2 +-
 src/{main => }/configs/errorsconfigwidget.h        |    0
 src/{main => }/configs/errorsconfigwidget.ui       |    0
 src/{main => }/configs/generalconfigwidget.cpp     |    2 +-
 src/{main => }/configs/generalconfigwidget.h       |    0
 src/{main => }/configs/generalconfigwidget.ui      |  120 +-
 src/{main => }/configs/playerconfigwidget.cpp      |   17 +-
 src/{main => }/configs/playerconfigwidget.h        |    0
 src/{main => }/configs/playerconfigwidget.ui       |    0
 src/{main => }/configs/waveformconfigwidget.cpp    |    0
 src/{main => }/configs/waveformconfigwidget.h      |    0
 src/{main => }/configs/waveformconfigwidget.ui     |   22 +-
 src/core/rangelist.h                               |    2 +-
 src/core/sstring.cpp                               |    6 +-
 src/core/subtitle.cpp                              |   40 +-
 src/core/subtitle.h                                |    8 +-
 src/core/subtitleactions.cpp                       |    2 +-
 src/core/subtitleactions.h                         |    6 +-
 src/core/subtitleiterator.cpp                      |    2 +-
 src/core/subtitleiterator.h                        |    4 +-
 src/core/subtitleline.cpp                          |    2 +-
 src/core/subtitleline.h                            |    4 +-
 src/core/subtitlelineactions.cpp                   |    2 +-
 src/core/subtitlelineactions.h                     |    4 +-
 src/core/tests/CMakeLists.txt                      |   10 +-
 src/core/tests/rangelisttest.cpp                   |    2 +-
 src/core/tests/rangetest.cpp                       |    2 +-
 src/core/tests/sstringtest.cpp                     |    2 +-
 src/core/tests/timetest.cpp                        |    2 +-
 src/core/time.cpp                                  |    2 +-
 src/{main => }/currentlinewidget.cpp               |    4 +-
 src/{main => }/currentlinewidget.h                 |    4 +-
 src/{main => }/dialogs/CMakeLists.txt              |    0
 src/{main => }/dialogs/actiondialog.cpp            |    0
 src/{main => }/dialogs/actiondialog.h              |    0
 .../dialogs/actionwitherrortargetsdialog.cpp       |    0
 .../dialogs/actionwitherrortargetsdialog.h         |    2 +-
 src/{main => }/dialogs/actionwithtargetdialog.cpp  |    2 +-
 src/{main => }/dialogs/actionwithtargetdialog.h    |    2 +-
 src/{main => }/dialogs/adjusttimesdialog.cpp       |    2 +-
 src/{main => }/dialogs/adjusttimesdialog.h         |    2 +-
 src/{main => }/dialogs/autodurationsdialog.cpp     |    0
 src/{main => }/dialogs/autodurationsdialog.h       |    0
 src/{main => }/dialogs/changeframeratedialog.cpp   |    0
 src/{main => }/dialogs/changeframeratedialog.h     |    0
 src/{main => }/dialogs/changetextscasedialog.cpp   |    0
 src/{main => }/dialogs/changetextscasedialog.h     |    0
 src/{main => }/dialogs/checkerrorsdialog.cpp       |    0
 src/{main => }/dialogs/checkerrorsdialog.h         |    0
 src/{main => }/dialogs/clearerrorsdialog.cpp       |    0
 src/{main => }/dialogs/clearerrorsdialog.h         |    2 +-
 src/{main => }/dialogs/durationlimitsdialog.cpp    |    2 +-
 src/{main => }/dialogs/durationlimitsdialog.h      |    2 +-
 .../dialogs/fixoverlappingtimesdialog.cpp          |    0
 src/{main => }/dialogs/fixoverlappingtimesdialog.h |    2 +-
 src/{main => }/dialogs/fixpunctuationdialog.cpp    |    0
 src/{main => }/dialogs/fixpunctuationdialog.h      |    0
 src/{main => }/dialogs/insertlinedialog.cpp        |    0
 src/{main => }/dialogs/insertlinedialog.h          |    0
 src/{main => }/dialogs/intinputdialog.cpp          |    0
 src/{main => }/dialogs/intinputdialog.h            |    0
 src/{main => }/dialogs/intinputdialog.ui           |    0
 src/{main => }/dialogs/joinsubtitlesdialog.cpp     |    6 +-
 src/{main => }/dialogs/joinsubtitlesdialog.h       |    2 +-
 src/{main => }/dialogs/opensubtitledialog.cpp      |    8 +-
 src/{main => }/dialogs/opensubtitledialog.h        |    0
 src/{main => }/dialogs/progressdialog.cpp          |    0
 src/{main => }/dialogs/progressdialog.h            |    0
 src/{main => }/dialogs/removelinesdialog.cpp       |    0
 src/{main => }/dialogs/removelinesdialog.h         |    0
 src/{main => }/dialogs/savesubtitledialog.cpp      |   10 +-
 src/{main => }/dialogs/savesubtitledialog.h        |    2 +-
 .../dialogs/selectablesubtitledialog.cpp           |    2 +-
 src/{main => }/dialogs/selectablesubtitledialog.h  |    0
 src/{main => }/dialogs/shifttimesdialog.cpp        |    2 +-
 src/{main => }/dialogs/shifttimesdialog.h          |    0
 src/{main => }/dialogs/smarttextsadjustdialog.cpp  |    0
 src/{main => }/dialogs/smarttextsadjustdialog.h    |    0
 src/{main => }/dialogs/splitsubtitledialog.cpp     |    6 +-
 src/{main => }/dialogs/splitsubtitledialog.h       |    2 +-
 src/{main => }/dialogs/subtitlecolordialog.cpp     |    0
 src/{main => }/dialogs/subtitlecolordialog.h       |    0
 src/{main => }/dialogs/syncsubtitlesdialog.cpp     |    0
 src/{main => }/dialogs/syncsubtitlesdialog.h       |    0
 src/{main => }/dialogs/textinputdialog.cpp         |    0
 src/{main => }/dialogs/textinputdialog.h           |    0
 src/{main => }/dialogs/textinputdialog.ui          |    0
 src/{main => }/dialogs/translatedialog.cpp         |    0
 src/{main => }/dialogs/translatedialog.h           |    2 +-
 src/formats/CMakeLists.txt                         |    1 +
 src/formats/format.h                               |    6 +-
 src/formats/formatmanager.cpp                      |    6 +-
 src/formats/microdvd/microdvdinputformat.h         |   14 +-
 src/formats/microdvd/microdvdoutputformat.h        |   28 +-
 src/formats/mplayer/mplayerinputformat.h           |    2 +-
 src/formats/mplayer/mplayeroutputformat.h          |    4 +-
 src/formats/mplayer2/mplayer2inputformat.h         |    2 +-
 src/formats/mplayer2/mplayer2outputformat.h        |    4 +-
 src/formats/subrip/subripinputformat.h             |    2 +-
 src/formats/subrip/subripoutputformat.h            |    4 +-
 .../substationalpha/substationalphainputformat.h   |    2 +-
 .../substationalpha/substationalphaoutputformat.h  |    6 +-
 src/formats/subviewer1/subviewer1inputformat.h     |    2 +-
 src/formats/subviewer1/subviewer1outputformat.h    |    4 +-
 src/formats/subviewer2/subviewer2inputformat.h     |    2 +-
 src/formats/subviewer2/subviewer2outputformat.h    |    4 +-
 src/formats/textdemux/CMakeLists.txt               |    2 +-
 src/formats/textdemux/textdemux.cpp                |   16 +-
 src/formats/textdemux/textdemux.h                  |    1 +
 src/formats/tmplayer/tmplayerinputformat.h         |    2 +-
 src/formats/tmplayer/tmplayeroutputformat.h        |    4 +-
 src/formats/vobsub/CMakeLists.txt                  |    3 -
 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             |   44 +-
 src/formats/vobsub/vobsubinputinitdialog.cpp       |   23 +-
 src/formats/vobsub/vobsubinputinitdialog.h         |    9 +-
 src/formats/vobsub/vobsubinputprocessdialog.cpp    |  113 +-
 src/formats/vobsub/vobsubinputprocessdialog.h      |   15 +-
 .../youtubecaptions/youtubecaptionsinputformat.h   |    2 +-
 .../youtubecaptions/youtubecaptionsoutputformat.h  |    4 +-
 src/helpers/CMakeLists.txt                         |    8 +
 src/{common => helpers}/commondefs.cpp             |    0
 src/{common => helpers}/commondefs.h               |    0
 src/{common => helpers}/fileloadhelper.cpp         |    0
 src/{common => helpers}/fileloadhelper.h           |    0
 src/{common => helpers}/filesavehelper.cpp         |    0
 src/{common => helpers}/filesavehelper.h           |    0
 src/{common => helpers}/filetrasher.cpp            |    0
 src/{common => helpers}/filetrasher.h              |    0
 src/{common => helpers}/languagecode.cpp           |    0
 src/{common => helpers}/languagecode.h             |    0
 src/{main => }/icons/128-apps-subtitlecomposer.png |  Bin
 src/{main => }/icons/128-categories-waveform.png   |  Bin
 src/{main => }/icons/16-actions-select_stream.png  |  Bin
 .../icons/16-actions-time_from_video.png           |  Bin
 src/{main => }/icons/16-apps-subtitlecomposer.png  |  Bin
 src/{main => }/icons/256-apps-subtitlecomposer.png |  Bin
 src/{main => }/icons/32-apps-subtitlecomposer.png  |  Bin
 src/{main => }/icons/48-actions-audio_extract.png  |  Bin
 src/{main => }/icons/48-apps-gstreamer.png         |  Bin
 src/{main => }/icons/48-apps-mediaplayer.png       |  Bin
 src/{main => }/icons/48-apps-mplayer.png           |  Bin
 src/{main => }/icons/48-apps-xine.png              |  Bin
 src/{main => }/icons/64-apps-mpv.png               |  Bin
 src/{main => }/icons/CMakeLists.txt                |    0
 src/{main => }/icons/README                        |    0
 src/{main => }/icons/sc-actions-anchor.svg         |    0
 .../sc-actions-current_line_follows_video.svg      |    0
 src/{main => }/icons/sc-actions-playrate_minus.svg |    0
 src/{main => }/icons/sc-actions-playrate_plus.svg  |    0
 src/{main => }/icons/sc-actions-set_hide_time.svg  |    0
 src/{main => }/icons/sc-actions-set_show_time.svg  |    0
 src/{main => }/lineswidget.cpp                     |    0
 src/{main => }/lineswidget.h                       |    8 +-
 src/{main => }/main.cpp                            |   12 +-
 src/main/CMakeLists.txt                            |   84 -
 src/main/errorsdialog.cpp                          |  140 -
 src/main/errorsdialog.h                            |   56 -
 src/main/errorswidget.cpp                          |  808 -----
 src/main/errorswidget.h                            |  189 -
 src/{main => }/main_tests.h                        |   12 +-
 src/{main => }/mainwindow.cpp                      |    4 +-
 src/{main => }/mainwindow.h                        |    2 +-
 src/{main => }/playerwidget.cpp                    |   16 +-
 src/{main => }/playerwidget.h                      |    6 +-
 src/{main => }/scconfig.kcfg                       |   13 +
 src/{main => }/scconfig.kcfgc                      |    0
 src/{speechplugins => }/scconfigdummy.cpp          |    0
 src/{videoplayerplugins => }/scconfigdummy.h       |    2 +-
 src/{main => }/scripting/CMakeLists.txt            |    0
 src/{main => }/scripting/examples/CMakeLists.txt   |    0
 src/{main => }/scripting/examples/README           |    0
 .../examples/example_capitalize_all_lines.js       |    0
 .../examples/example_capitalize_all_lines.py       |    0
 .../examples/example_capitalize_all_lines.rb       |    0
 .../examples/example_iterate_selection.js          |    0
 .../examples/example_iterate_selection.py          |    0
 .../examples/example_iterate_selection.rb          |    0
 .../examples/example_remove_impair_lines.js        |    0
 .../examples/example_remove_impair_lines.py        |    0
 .../examples/example_remove_impair_lines.rb        |    0
 .../examples/example_trim_to_selection.js          |    0
 .../examples/example_trim_to_selection.py          |    0
 .../examples/example_trim_to_selection.rb          |    0
 .../scripting/examples/fix_dialog_cues.py          |    0
 .../examples/remove_hearing_impaired_text.js       |    0
 src/{main => }/scripting/scripting_list.cpp        |    0
 src/{main => }/scripting/scripting_list.h          |    0
 src/{main => }/scripting/scripting_range.cpp       |    0
 src/{main => }/scripting/scripting_range.h         |    2 +-
 src/{main => }/scripting/scripting_rangelist.cpp   |    4 +-
 src/{main => }/scripting/scripting_rangelist.h     |    2 +-
 .../scripting/scripting_rangesmodule.cpp           |    4 +-
 src/{main => }/scripting/scripting_rangesmodule.h  |    0
 src/{main => }/scripting/scripting_sstring.cpp     |    0
 src/{main => }/scripting/scripting_sstring.h       |    2 +-
 .../scripting/scripting_stringsmodule.cpp          |    0
 src/{main => }/scripting/scripting_stringsmodule.h |    2 +-
 src/{main => }/scripting/scripting_subtitle.cpp    |    2 +-
 src/{main => }/scripting/scripting_subtitle.h      |    4 +-
 .../scripting/scripting_subtitleline.cpp           |    2 +-
 src/{main => }/scripting/scripting_subtitleline.h  |    2 +-
 .../scripting/scripting_subtitlelinemodule.cpp     |    0
 .../scripting/scripting_subtitlelinemodule.h       |    2 +-
 .../scripting/scripting_subtitlemodule.cpp         |    2 +-
 .../scripting/scripting_subtitlemodule.h           |    2 +-
 src/{main => }/scripting/scriptsmanager.cpp        |   14 +-
 src/{main => }/scripting/scriptsmanager.h          |    0
 src/{main => }/scripting/scriptsmanager.ui         |    0
 src/speechplugins/CMakeLists.txt                   |   10 +-
 src/speechplugins/pocketsphinx/CMakeLists.txt      |    8 +-
 .../pocketsphinx/pocketsphinxplugin.cpp            |    2 +-
 .../pocketsphinx/pocketsphinxplugin.h              |    2 +-
 src/speechplugins/scconfigdummy.h                  |   26 -
 src/speechprocessor/speechprocessor.cpp            |   11 +-
 src/streamprocessor/CMakeLists.txt                 |   14 -
 src/streamprocessor/streamprocessor.cpp            |  778 ++--
 src/streamprocessor/streamprocessor.h              |   55 +-
 src/{main => }/subtitlecomposer.desktop            |    0
 src/{main => }/subtitlecomposer.xml                |    0
 src/{main => }/subtitlecomposerrc                  |    0
 src/{main => }/subtitlecomposerui.rc               |    0
 src/{main => }/utils/CMakeLists.txt                |    0
 src/{main => }/utils/errorfinder.cpp               |    4 +-
 src/{main => }/utils/errorfinder.h                 |    2 +-
 src/{main => }/utils/errortracker.cpp              |    4 +-
 src/{main => }/utils/errortracker.h                |    2 +-
 src/{main => }/utils/finder.cpp                    |    2 +-
 src/{main => }/utils/finder.h                      |    4 +-
 src/{main => }/utils/language.cpp                  |    0
 src/{main => }/utils/language.h                    |    0
 src/{main => }/utils/replacer.cpp                  |    2 +-
 src/{main => }/utils/replacer.h                    |    6 +-
 src/{main => }/utils/speller.cpp                   |    4 +-
 src/{main => }/utils/speller.h                     |    4 +-
 src/{main => }/utils/translator.cpp                |    0
 src/{main => }/utils/translator.h                  |    2 +-
 src/videoplayer/videoplayer.cpp                    |    4 +-
 src/videoplayer/videoplayer.h                      |    2 +-
 src/videoplayerplugins/CMakeLists.txt              |   35 +-
 src/videoplayerplugins/gstreamer/CMakeLists.txt    |   18 +-
 .../gstreamer}/gstreamer.cpp                       |    0
 .../gstreamer}/gstreamer.h                         |    2 +-
 .../gstreamer/gstreamerplayerbackend.cpp           |    6 +-
 .../gstreamer/gstreamerplayerbackend.h             |    2 +-
 src/videoplayerplugins/mplayer/CMakeLists.txt      |    2 +-
 .../mplayer/mplayerplayerbackend.cpp               |    2 +-
 .../mplayer/mplayerplayerbackend.h                 |    2 +-
 .../mplayer/mplayerplayerprocess.cpp               |    2 +-
 src/videoplayerplugins/mpv/CMakeLists.txt          |   10 +-
 src/videoplayerplugins/mpv/mpvbackend.cpp          |    2 +-
 src/videoplayerplugins/mpv/mpvbackend.h            |    2 +-
 src/videoplayerplugins/phonon/CMakeLists.txt       |    8 +-
 .../phonon/phononplayerbackend.cpp                 |    2 +-
 .../phonon/phononplayerbackend.h                   |    2 +-
 src/videoplayerplugins/scconfigdummy.cpp           |   37 -
 src/videoplayerplugins/xine/CMakeLists.txt         |   13 +-
 src/videoplayerplugins/xine/xineplayerbackend.cpp  |    2 +-
 src/videoplayerplugins/xine/xineplayerbackend.h    |    2 +-
 src/{widgets => }/waveformwidget.cpp               |  109 +-
 src/{widgets => }/waveformwidget.h                 |   22 +-
 src/widgets/CMakeLists.txt                         |    1 -
 src/widgets/simplerichtextedit.cpp                 |    2 +-
 src/widgets/simplerichtextedit.h                   |    2 +-
 src/widgets/textoverlaywidget.cpp                  |    4 +-
 subtitlecomposer.pot                               | 3151 ----------------
 321 files changed, 5532 insertions(+), 12777 deletions(-)

-- 
subtitlecomposer packaging



More information about the pkg-kde-commits mailing list