diff -Nru subtitlecomposer-0.5.3/ChangeLog subtitlecomposer-0.5.7/ChangeLog --- subtitlecomposer-0.5.3/ChangeLog 2009-05-25 05:01:22.000000000 +0000 +++ subtitlecomposer-0.5.7/ChangeLog 2014-09-26 10:33:30.000000000 +0000 @@ -1,3 +1,27 @@ +Version 0.5.7 +- ADD: GStreamer 1.0 support +- ADD: added Debian build +- MOD: updated Bulgarian and Croatian translations +- FIX: Phonon backend supports audio channel change +- FIX: Command line params were expected to be URL encoded +- FIX: UTF subtitles are saved with BOM +- FIX: updated/fixed translation catalogs and list of translators +- FIX: some files were wrongly identified as tmplayer subtitles + +Version 0.5.6: +- SubStation Alpha format fixes and color support +- source cleanup + +Version 0.5.5: +- text color support +- SubRip text color support +- reworked MicroDVD open/save + +Version 0.5.4: +- mplayer2 support +- mplayer VDPAU decoding support +- minor cmake build fixes + Version 0.5.3: - added Czech, Brazilian Portuguese, Bulgarian, French and German translations contributed by Petr Gadula, Marcio P. Moraes, Petar Toushkov, Thomas Gastine and Panagiotis Papadopoulos respectively diff -Nru subtitlecomposer-0.5.3/CMakeLists.txt subtitlecomposer-0.5.7/CMakeLists.txt --- subtitlecomposer-0.5.3/CMakeLists.txt 2009-02-25 22:46:19.000000000 +0000 +++ subtitlecomposer-0.5.7/CMakeLists.txt 2014-09-26 10:33:30.000000000 +0000 @@ -1,11 +1,11 @@ -PROJECT( subtitlecomposer ) +PROJECT(subtitlecomposer) -FIND_PACKAGE( KDE4 REQUIRED ) -# FIND_PACKAGE( Msgfmt REQUIRED ) -FIND_PACKAGE( Gettext REQUIRED ) +FIND_PACKAGE(KDE4 REQUIRED) +# FIND_PACKAGE(Msgfmt REQUIRED) +FIND_PACKAGE(Gettext REQUIRED) -INCLUDE( KDE4Defaults ) -INCLUDE( MacroLibrary ) +INCLUDE(KDE4Defaults) +INCLUDE(MacroLibrary) -ADD_SUBDIRECTORY( po ) -ADD_SUBDIRECTORY( src ) +ADD_SUBDIRECTORY(po) +ADD_SUBDIRECTORY(src) diff -Nru subtitlecomposer-0.5.3/debian/changelog subtitlecomposer-0.5.7/debian/changelog --- subtitlecomposer-0.5.3/debian/changelog 2014-01-23 20:12:42.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/changelog 2015-10-16 09:33:42.000000000 +0000 @@ -1,10 +1,10 @@ -subtitlecomposer (0.5.3-4ubuntu1) trusty; urgency=medium +subtitlecomposer (0.5.7-1) unstable; urgency=medium - * debian/rules: - - Make sure the test binaries are compiled before running dh_auto_test, - this fixes a FTBFS in Ubuntu. + [ Martin Steghöfer ] + * Imported Upstream version 0.5.7 (Closes: #571687, #704067, #776326, + #799957). - -- Andreas Moog Thu, 23 Jan 2014 21:11:56 +0100 + -- Maximiliano Curia Fri, 16 Oct 2015 11:33:42 +0200 subtitlecomposer (0.5.3-4) unstable; urgency=low diff -Nru subtitlecomposer-0.5.3/debian/control subtitlecomposer-0.5.7/debian/control --- subtitlecomposer-0.5.3/debian/control 2014-01-23 20:14:24.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/control 2015-10-16 09:33:42.000000000 +0000 @@ -1,13 +1,13 @@ Source: subtitlecomposer Section: kde Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian KDE Extras Team +Maintainer: Debian KDE Extras Team Uploaders: Maximiliano Curia Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools, - kdelibs5-dev, libgstreamer-plugins-base0.10-dev, libglib2.0-dev, libxml2-dev, + kdelibs5-dev, libgstreamer-plugins-base1.0-dev, libglib2.0-dev, libxml2-dev, libxine2-dev, libx11-dev -Standards-Version: 3.9.4 +Build-Conflicts: qt5-default +Standards-Version: 3.9.6 Homepage: http://sourceforge.net/projects/subcomposer Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/subtitlecomposer.git Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/subtitlecomposer.git @@ -15,7 +15,7 @@ Package: subtitlecomposer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends} -Suggests: mplayer +Suggests: mplayer2 Description: Subtitles editor for KDE A text-based subtitles editor for KDE supporting basic operations (text, time and style edition), realtime previewing and spell checking. Other diff -Nru subtitlecomposer-0.5.3/debian/copyright subtitlecomposer-0.5.7/debian/copyright --- subtitlecomposer-0.5.3/debian/copyright 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/copyright 2015-10-16 09:33:42.000000000 +0000 @@ -1,92 +1,38 @@ -This package was debianized by José Manuel Santamaría Lema on -Fri, 10 Apr 2009 22:11:11 +0200 - - -Upstream Author: - - Sergio Pistone - - -Copyright: - - Copyright © 2007-2008 Sergio Pistone - - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the license, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU General Public License -can be found in the file `/usr/share/common-licenses/GPL-2'. - -Files src/player/mplayer/mediadata.h, src/widgets/pointingslider.h, -src/widgets/pointingslider.cpp, src/widgets/attachablewidget.h and -src/widgets/attachablewidget.cpp: - - Copyright © 2006-2008 Ricardo Villalba - Copyright © 2007-2008 Sergio Pistone - -File src/player/xine/FindXCB.cmake: - - Copyright © 2007 Matthias Kretz - - Redistribution and use is allowed according to the terms of the BSD license. - For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - Contents of COPYING-CMAKE-SCRIPTS file: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Files src/main/utils/kreplace.h, src/main/utils/kreplace.cpp -and src/main/utils/kfind_p.h: - - Copyright © 2001 S.R.Haque - Copyright © 2002 David Faure - Copyright © 2004 Arend van Beelen jr. - - These files are under GNU Lesser General Public License as published by the - Free Software Foundation, version 2; on Debian systems the full text of the - GNU Lesser General Public License can be found in the - `/usr/share/common-licenses/LGPL-2' file. - -Files src/common/qxtsignalwaiter.h and src/common/qxtsignalwaiter.cpp: - - Copyright © 2006 Adam Higerd - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: subtitlecomposer +Source: https://github.com/maxrd2/subtitlecomposer + +Files: * +Copyright: 2007-2009, Sergio Pistone (sergio_pistone@yahoo.com.ar) based on Kaffeine by Jürgen Kofler + 2007-2009, Sergio Pistone (sergio_pistone@yahoo.com.ar) based on smplayer by Ricardo Villalba + 2007-2012, Sergio Pistone (sergio_pistone@yahoo.com.ar) + 2013, Mladen Milinkovic (max@smoothware.net) + 2006-2008, Ricardo Villalba (rvm@escomposlinux.org) +License: GPL-2+ + +Files: src/main/utils/kfind_p.h + src/main/utils/kreplace.cpp + src/main/utils/kreplace.h +Copyright: 2001, S.R.Haque . + 2002, David Faure + 2004, Arend van Beelen jr. +License: LGPL-2 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2, as published by the Free Software Foundation. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + . + The complete text of the GNU Library General Public License version 2 can be + found in the `/usr/share/common-licenses/LGPL-2' file. + +Files: src/common/qxtsignalwaiter.cpp + src/common/qxtsignalwaiter.h +Copyright: 2006, Adam Higerd ahigerd@stratitec.com +License: LGPL-2.1+_or_GPL-2+ QxtSignalWaiter is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2 or greater, or under the terms @@ -97,12 +43,61 @@ to you under the GPL. If you use Qt under the QPL, this is licensed to you under the QPL. If you use Qt with a commercial license purchased from Trolltech, this is licensed to you under the LGPL. - + . QxtSignalWaiter is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the appropriate license agreement for more details. + . + The complete text of the GNU General Public License version 2 can be + found in the `/usr/share/common-licenses/GPL-2' file, likewise, the complete + text of the GNU Lesser General Public License version 2.1 can be found in + `/usr/share/common-licenses/LGPL-2.1'. + +Files: src/services/FindGStreamer.cmake +Copyright: 2012, Raphael Kubo da Costa +License: BSD-2-Clause + +Files: src/services/xine/FindXCB.cmake +Copyright: 2007, Matthias Kretz +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: debian/* +Copyright: 2009, José Manuel Santamaría Lema +License: GPL-2+ -The Debian packaging is © 2009 José Manuel Santamaría Lema - and is licensed under the GPL v2 or later, -see `/usr/share/common-licenses/GPL-2'. \ No newline at end of file +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the license, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + The complete text of the GNU General Public License version 2 can be found in + the file `/usr/share/common-licenses/GPL-2'. diff -Nru subtitlecomposer-0.5.3/debian/patches/0001-Link-phonon.patch subtitlecomposer-0.5.7/debian/patches/0001-Link-phonon.patch --- subtitlecomposer-0.5.3/debian/patches/0001-Link-phonon.patch 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/0001-Link-phonon.patch 2015-10-16 09:33:42.000000000 +0000 @@ -0,0 +1,24 @@ +From: =?utf-8?q?Jos=C3=A9_Manuel_Santamar=C3=ADa_Lema?= +Date: Fri, 13 Nov 2009 18:36:09 +0000 +Subject: Link phonon + +This patch adds a missing link against Phonon. +Without this patch the package will FTBFS with binutils-gold. + +Forwarded: not-needed +--- + src/services/phonon/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/services/phonon/CMakeLists.txt b/src/services/phonon/CMakeLists.txt +index 96a3951..ee0d22a 100644 +--- a/src/services/phonon/CMakeLists.txt ++++ b/src/services/phonon/CMakeLists.txt +@@ -4,3 +4,7 @@ SET( services_phonon_SRCS + CACHE INTERNAL EXPORTEDVARIABLE + ) + ++SET( players_phonon_LIBS ++ ${KDE4_PHONON_LIBS} ++ CACHE INTERNAL EXPORTEDVARIABLE ++) diff -Nru subtitlecomposer-0.5.3/debian/patches/0002-Link-against-X11.patch subtitlecomposer-0.5.7/debian/patches/0002-Link-against-X11.patch --- subtitlecomposer-0.5.3/debian/patches/0002-Link-against-X11.patch 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/0002-Link-against-X11.patch 2015-10-16 09:33:42.000000000 +0000 @@ -0,0 +1,27 @@ +From: =?utf-8?q?Jos=C3=A9_Manuel_Santamar=C3=ADa_Lema?= +Date: Mon, 14 Oct 2013 15:29:39 +0200 +Subject: Link against X11 + +--- + src/services/xine/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/services/xine/CMakeLists.txt b/src/services/xine/CMakeLists.txt +index fc873eb..504cd77 100644 +--- a/src/services/xine/CMakeLists.txt ++++ b/src/services/xine/CMakeLists.txt +@@ -1,3 +1,5 @@ ++find_package(X11) ++ + SET( services_xine_INCLUDE_DIR + ${XINE_INCLUDE_DIR} + CACHE INTERNAL EXPORTEDVARIABLE +@@ -10,7 +12,7 @@ SET( services_xine_DEFS + + SET( services_xine_LIBS + ${XINE_LIBRARY} +- -lX11 ++ ${X11_LIBRARIES} + CACHE INTERNAL EXPORTEDVARIABLE + ) + diff -Nru subtitlecomposer-0.5.3/debian/patches/0003-Find-platform-dependant-include-files-of-GStreamer.patch subtitlecomposer-0.5.7/debian/patches/0003-Find-platform-dependant-include-files-of-GStreamer.patch --- subtitlecomposer-0.5.3/debian/patches/0003-Find-platform-dependant-include-files-of-GStreamer.patch 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/0003-Find-platform-dependant-include-files-of-GStreamer.patch 2015-10-16 09:33:42.000000000 +0000 @@ -0,0 +1,63 @@ +From: =?utf-8?q?Martin_Stegh=C3=B6fer?= +Date: Sun, 4 Oct 2015 19:02:50 +0200 +Subject: Find platform-dependant include files of GStreamer + +In the current -dev packages of GStreamer 1.x in Debian, the file +"gst/gstconfig.h" is not in the same directory as the rest of the +includes, but in a subdirectory of the library directory. However, +the FindGStreamer.cmake file of Subtitlecomposer is only looking +for a single include directory per component, based on the location +of a single reference file. This patch adds the subdirectory +"gstreamer-1.0/include" of the library dir of a component to the +include dirs variable of the same component. This way, platform- +dependant files like "gst/gstconfig.h" will be found, too. + +Forwarding is not needed, because upstream has moved on from using +the FindGStreamer.cmake. + +Forwarded: not-needed +--- + src/services/FindGStreamer.cmake | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/services/FindGStreamer.cmake b/src/services/FindGStreamer.cmake +index bf25d30..0dcc473 100644 +--- a/src/services/FindGStreamer.cmake ++++ b/src/services/FindGStreamer.cmake +@@ -67,6 +67,14 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _librar + NAMES ${_library} + HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR} + ) ++ ++ # Add the "gstreamer-1.0/include" sub directory of the lib path to the list of include folders ++ # (in order to be able to resolve "gst/gstconfig.h") ++ if(${_component_prefix}_LIBRARIES) ++ list(GET ${_component_prefix}_LIBRARIES 0 FIRST_LIBRARY) ++ get_filename_component(${_component_prefix}_LIBRARY_DIR ${FIRST_LIBRARY} DIRECTORY) ++ list(APPEND ${_component_prefix}_INCLUDE_DIRS "${${_component_prefix}_LIBRARY_DIR}/gstreamer-1.0/include") ++ endif() + endmacro() + + # ------------------------ +@@ -79,8 +87,9 @@ FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gst/base/gstadapter.h + + # 1.2. Check GStreamer version + if (GSTREAMER_INCLUDE_DIRS) +- if (EXISTS "${GSTREAMER_INCLUDE_DIRS}/gst/gstversion.h") +- file(READ "${GSTREAMER_INCLUDE_DIRS}/gst/gstversion.h" GSTREAMER_VERSION_CONTENTS) ++ foreach (GS_INCLUDE_DIR IN LISTS GSTREAMER_INCLUDE_DIRS) ++ if (EXISTS "${GS_INCLUDE_DIR}/gst/gstversion.h") ++ file(READ "${GS_INCLUDE_DIR}/gst/gstversion.h" GSTREAMER_VERSION_CONTENTS) + + string(REGEX MATCH "#define +GST_VERSION_MAJOR +\\(([0-9]+)\\)" _dummy "${GSTREAMER_VERSION_CONTENTS}") + set(GSTREAMER_VERSION_MAJOR "${CMAKE_MATCH_1}") +@@ -92,7 +101,8 @@ if (GSTREAMER_INCLUDE_DIRS) + set(GSTREAMER_VERSION_MICRO "${CMAKE_MATCH_1}") + + set(GSTREAMER_VERSION "${GSTREAMER_VERSION_MAJOR}.${GSTREAMER_VERSION_MINOR}.${GSTREAMER_VERSION_MICRO}") +- endif () ++ endif () ++ endforeach (GS_INCLUDE_DIR) + endif () + + if ("${GStreamer_FIND_VERSION}" VERSION_GREATER "${GSTREAMER_VERSION}") diff -Nru subtitlecomposer-0.5.3/debian/patches/0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch subtitlecomposer-0.5.7/debian/patches/0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch --- subtitlecomposer-0.5.3/debian/patches/0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch 2015-10-16 09:33:42.000000000 +0000 @@ -0,0 +1,59 @@ +From: =?utf-8?q?Martin_Stegh=C3=B6fer?= +Date: Mon, 5 Oct 2015 21:19:14 +0200 +Subject: Fix crash: Sonnet::Dialog cannot handle empty buffers. + +Subtitle Composer crashes on spell checking an empty subtitle. + +Apparently this is a general problem of Sonnet::Dialog, which cannot handle +empty buffers. I was able to reproduce the crash outside of Subtitle Composer +in an isolated example by passing an empty buffer to Sonnet::Dialog. + +Sonnet::Dialog's specification doesn't exclude empty buffers, so I consider +this a bug in Sonnet. But even so, it might be good to work around this problem +in Subtitle Composer, too. Even the KDE people themselves (the creators of +Sonnet) apply that kind of workaround in their applications +(e.g. in Kate [1] [2]). + +The workaround simply skips empty entries because they don't have to be +checked anyway. + +Forwarding of the patch is not needed because upstream has ported the +application to KF5, which doesn't show the problem any more. + +[1] https://bugs.kde.org/show_bug.cgi?id=228789 +[2] https://websvn.kde.org/trunk/KDE/kdelibs/kate/spellcheck/spellcheckdialog.cpp?r1=1103086&r2=1103085&pathrev=1103086 + +Bug-Debian: https://bugs.debian.org/694812 +Forwarded: not-needed +--- + src/main/utils/speller.cpp | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/src/main/utils/speller.cpp b/src/main/utils/speller.cpp +index 38bf100..e849541 100644 +--- a/src/main/utils/speller.cpp ++++ b/src/main/utils/speller.cpp +@@ -110,14 +110,18 @@ Speller::onBufferDone() + { + // NOTE: not setting the buffer in this slots closes the dialog + +- if(advance()) { ++ QString newBuffer; ++ while(newBuffer.isEmpty() && advance()) { + if(m_translationMode) { + m_feedPrimaryNext = !m_feedPrimaryNext; +- m_sonnetDialog->setBuffer(m_feedPrimaryNext ? m_iterator->current()->secondaryText().string() : m_iterator->current()->primaryText().string() +- ); +- } else +- m_sonnetDialog->setBuffer(m_iterator->current()->primaryText().string()); ++ newBuffer = m_feedPrimaryNext ? m_iterator->current()->secondaryText().string() : m_iterator->current()->primaryText().string(); ++ } else { ++ newBuffer = m_iterator->current()->primaryText().string(); ++ } + } ++ ++ if(!newBuffer.isEmpty()) ++ m_sonnetDialog->setBuffer(newBuffer); + } + + bool diff -Nru subtitlecomposer-0.5.3/debian/patches/01_link_gobject.diff subtitlecomposer-0.5.7/debian/patches/01_link_gobject.diff --- subtitlecomposer-0.5.3/debian/patches/01_link_gobject.diff 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/01_link_gobject.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -# Description: This pacth adds a missing find_package for GObject. -# Without this patch the package will FTBFS with binutils-gold. -# Forwarded: http://sourceforge.net/tracker/?func=detail&aid=2897376&group_id=208427&atid=1005654 -# Author: José Manuel Santamaría Lema -# ---- subtitlecomposer-0.5.3.orig/src/player/gstreamer/CMakeLists.txt -+++ subtitlecomposer-0.5.3/src/player/gstreamer/CMakeLists.txt -@@ -1,6 +1,7 @@ - # TODO WHY AREN'T THESE INCLUDED BY MACRO_OPTIONAL_FIND_PACKAGE( GStreamer )? - FIND_PACKAGE( GLIB2 REQUIRED ) - FIND_PACKAGE( LibXml2 REQUIRED ) -+FIND_PACKAGE( GObject REQUIRED ) - - SET( players_gstreamer_INCLUDE_DIR - ${GLIB2_INCLUDE_DIR} diff -Nru subtitlecomposer-0.5.3/debian/patches/02_link_krosscore.diff subtitlecomposer-0.5.7/debian/patches/02_link_krosscore.diff --- subtitlecomposer-0.5.3/debian/patches/02_link_krosscore.diff 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/02_link_krosscore.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -# Description: This pacth adds a missing link against Kross. -# Without this patch the package will FTBFS with binutils-gold. -# Forwarded: not-needed -# Author: José Manuel Santamaría Lema -# ---- subtitlecomposer-0.5.3.orig/src/main/CMakeLists.txt -+++ subtitlecomposer-0.5.3/src/main/CMakeLists.txt -@@ -46,6 +46,7 @@ - ${KDE4_KDEUI_LIBS} - ${KDE4_KHTML_LIBS} - ${KDE4_KFILE_LIBS} -+ ${KDE4_KROSSCORE_LIBS} - ${KDE4_KROSSUI_LIBS} - ${common_LIBS} - ${config_LIBS} diff -Nru subtitlecomposer-0.5.3/debian/patches/03_link_phonon.diff subtitlecomposer-0.5.7/debian/patches/03_link_phonon.diff --- subtitlecomposer-0.5.3/debian/patches/03_link_phonon.diff 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/03_link_phonon.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -# Description: This pacth adds a missing link against Phonon. -# Without this patch the package will FTBFS with binutils-gold. -# Forwarded: not-needed -# Author: José Manuel Santamaría Lema -# ---- subtitlecomposer-0.5.3.orig/src/player/phonon/CMakeLists.txt -+++ subtitlecomposer-0.5.3/src/player/phonon/CMakeLists.txt -@@ -4,3 +4,7 @@ - CACHE INTERNAL EXPORTEDVARIABLE - ) - -+SET( players_phonon_LIBS -+ ${KDE4_PHONON_LIBS} -+ CACHE INTERNAL EXPORTEDVARIABLE -+) diff -Nru subtitlecomposer-0.5.3/debian/patches/04_fix_ftbfs_gcc_4_5.diff subtitlecomposer-0.5.7/debian/patches/04_fix_ftbfs_gcc_4_5.diff --- subtitlecomposer-0.5.3/debian/patches/04_fix_ftbfs_gcc_4_5.diff 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/04_fix_ftbfs_gcc_4_5.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# Description: Fixes an FTBFS with gcc 4.5. -# Forwarded: http://sourceforge.net/tracker/index.php?func=detail&aid=2932063&group_id=208427&atid=1005654 -# Author: José Manuel Santamaría Lema ---- subtitlecomposer-0.5.3.orig/src/core/sstring.cpp -+++ subtitlecomposer-0.5.3/src/core/sstring.cpp -@@ -1112,7 +1112,7 @@ - append( str ); - } - --SStringList::SStringList( const SStringList::SStringList& list ): -+SStringList::SStringList( const SStringList& list ): - QList( list ) - { - } diff -Nru subtitlecomposer-0.5.3/debian/patches/link_against_x11.diff subtitlecomposer-0.5.7/debian/patches/link_against_x11.diff --- subtitlecomposer-0.5.3/debian/patches/link_against_x11.diff 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/link_against_x11.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ ---- a/src/player/xine/CMakeLists.txt -+++ b/src/player/xine/CMakeLists.txt -@@ -1,3 +1,5 @@ -+find_package(X11) -+ - SET( players_xine_INCLUDE_DIR - ${XINE_INCLUDE_DIR} - CACHE INTERNAL EXPORTEDVARIABLE -@@ -10,6 +12,7 @@ SET( players_xine_DEFS - - SET( players_xine_LIBS - ${XINE_LIBRARY} -+ ${X11_LIBRARIES} - CACHE INTERNAL EXPORTEDVARIABLE - ) - diff -Nru subtitlecomposer-0.5.3/debian/patches/series subtitlecomposer-0.5.7/debian/patches/series --- subtitlecomposer-0.5.3/debian/patches/series 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/patches/series 2015-10-16 09:33:42.000000000 +0000 @@ -1,5 +1,4 @@ -01_link_gobject.diff -02_link_krosscore.diff -03_link_phonon.diff -04_fix_ftbfs_gcc_4_5.diff -link_against_x11.diff +0001-Link-phonon.patch +0002-Link-against-X11.patch +0003-Find-platform-dependant-include-files-of-GStreamer.patch +0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch diff -Nru subtitlecomposer-0.5.3/debian/rules subtitlecomposer-0.5.7/debian/rules --- subtitlecomposer-0.5.3/debian/rules 2014-01-23 20:14:10.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/rules 2015-10-16 09:33:42.000000000 +0000 @@ -1,13 +1,7 @@ #!/usr/bin/make -f -BUILDDIR ?= obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) - %: - dh $@ --parallel --with=kde,xine --builddir=$(BUILDDIR) + dh $@ --parallel --with=kde,xine override_dh_install: dh_install - -override_dh_auto_test: - cd $(BUILDDIR) && make buildtests - dh_auto_test diff -Nru subtitlecomposer-0.5.3/debian/subtitlecomposer.lintian-overrides subtitlecomposer-0.5.7/debian/subtitlecomposer.lintian-overrides --- subtitlecomposer-0.5.3/debian/subtitlecomposer.lintian-overrides 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/subtitlecomposer.lintian-overrides 2015-10-16 09:33:42.000000000 +0000 @@ -4,5 +4,3 @@ subtitlecomposer: script-not-executable usr/share/kde4/apps/subtitlecomposer/scripts/example_iterate_selection.rb subtitlecomposer: script-not-executable usr/share/kde4/apps/subtitlecomposer/scripts/example_remove_impair_lines.rb subtitlecomposer: script-not-executable usr/share/kde4/apps/subtitlecomposer/scripts/example_trim_to_selection.rb -# Also provided by libxine2-dev -subtitlecomposer source: missing-build-dependency-for-dh-addon xine => libxine-dev diff -Nru subtitlecomposer-0.5.3/debian/watch subtitlecomposer-0.5.7/debian/watch --- subtitlecomposer-0.5.3/debian/watch 2013-11-26 09:27:25.000000000 +0000 +++ subtitlecomposer-0.5.7/debian/watch 2015-10-16 09:33:42.000000000 +0000 @@ -1,2 +1,3 @@ version=3 -http://sf.net/subcomposer/subtitlecomposer-(.*)\.tar\.bz2 +opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/subtitlecomposer-$1.tar.gz/g" \ + https://github.com/maxrd2/subtitlecomposer/releases .*/v?(\d\S*)\.tar\.gz diff -Nru subtitlecomposer-0.5.3/.gitignore subtitlecomposer-0.5.7/.gitignore --- subtitlecomposer-0.5.3/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/.gitignore 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,7 @@ +CMakeCache.txt +CMakeFiles +Makefile +cmake_install.cmake +install_manifest.txt +/build +*.user diff -Nru subtitlecomposer-0.5.3/pkg/arch/.gitignore subtitlecomposer-0.5.7/pkg/arch/.gitignore --- subtitlecomposer-0.5.3/pkg/arch/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/arch/.gitignore 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,8 @@ +src/ +pkg/ +repo/ +.build +.build-nightly +.updaterepo +subtitlecomposer-*.src.tar.gz +subtitlecomposer-*.pkg.tar.xz diff -Nru subtitlecomposer-0.5.3/pkg/arch/PKGBUILD subtitlecomposer-0.5.7/pkg/arch/PKGBUILD --- subtitlecomposer-0.5.3/pkg/arch/PKGBUILD 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/arch/PKGBUILD 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,38 @@ +# Contributor: Mladen Milinkovic +# Maintainer: Mladen Milinkovic + +# You can install/update Subtitle Composer from repository if you add following to /etc/pacman.conf +# [subtitlecomposer] +# # Subtitle Composer +# SigLevel = PackageRequired +# Server = http://smoothware.net/$repo/$arch + +pkgname=subtitlecomposer +pkgver=0.5.7 +pkgrel=1 +pkgdesc="A KDE subtitle editor" +arch=('i686' 'x86_64') +url="https://github.com/maxrd2/subtitlecomposer" +license=('GPL') +depends=('kdelibs' 'gettext') +makedepends=('cmake' 'automoc4' 'git') +conflicts=('subtitlecomposer-git') +optdepends=( + 'mplayer: for MPlayer backend' + 'mplayer2: for MPlayer backend' + 'gstreamer: for GStreamer backend' + 'xine-lib: for Xine backend' + ) +source=("https://github.com/maxrd2/subtitlecomposer/archive/v${pkgver}.tar.gz") +md5sums=('8b48fbb99f5e10312670367024aa6fe2') + +build() { + cd ${srcdir}/subtitlecomposer-${pkgver} + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/subtitlecomposer-${pkgver} + make DESTDIR=${pkgdir} install +} diff -Nru subtitlecomposer-0.5.3/pkg/arch/PKGBUILD-git subtitlecomposer-0.5.7/pkg/arch/PKGBUILD-git --- subtitlecomposer-0.5.3/pkg/arch/PKGBUILD-git 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/arch/PKGBUILD-git 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,44 @@ +# Contributor: Mladen Milinkovic +# Maintainer: Mladen Milinkovic + +# You can install/update Subtitle Composer from repository if you add following to /etc/pacman.conf +# [subtitlecomposer] +# # Subtitle Composer +# SigLevel = PackageRequired +# Server = http://smoothware.net/$repo/$arch + +pkgname=subtitlecomposer-git +pkgver=v0.5.6.7.ga5fa153 +pkgrel=1 +pkgdesc="A KDE subtitle editor - nightly build" +arch=('i686' 'x86_64') +url="https://github.com/maxrd2/subtitlecomposer" +license=('GPL') +depends=('kdelibs' 'gettext') +makedepends=('cmake' 'automoc4' 'git') +conflicts=('subtitlecomposer') +optdepends=( + 'mplayer: for MPlayer backend' + 'mplayer2: for MPlayer backend' + 'gstreamer: for GStreamer backend' + 'xine-lib: for Xine backend' + ) +source=('git+file:///home/max/projects/SubtitleComposer') +md5sums=('SKIP') + +pkgver() { + export APP_VER=${pkgver} + cd ${srcdir}/SubtitleComposer + git describe --always | sed 's|-|.|g' +} + +build() { + cd ${srcdir}/SubtitleComposer + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/SubtitleComposer + make DESTDIR=${pkgdir} install +} diff -Nru subtitlecomposer-0.5.3/pkg/debian/changelog subtitlecomposer-0.5.7/pkg/debian/changelog --- subtitlecomposer-0.5.3/pkg/debian/changelog 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/debian/changelog 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,71 @@ +subtitlecomposer (0.5.6.9~trusty) trusty; urgency=high + + * New release + + -- Goran Vidovic (gogo) Sat, 14 Jun 2014 20:07:05 +0100 + +subtitlecomposer (0.5.3-4) unstable; urgency=low + + [ José Manuel Santamaría Lema ] + * Using ${xine-x:Depends} provided by dh_xine (Closes: #575124). + * Point debian/control Vcs fields to the new Git repository. + * Build depend on libxine2-dev instead of libxine-dev (Closes: #724751). + * Add link_against_x11.diff (Closes: #713576). + * Bump Standards-Version to 3.9.4, no changes required. + * Update lintian overrides. + + [ Maximiliano Curia ] + * Update vcs fields. + * Migrate cdbs to dh 9. + * Add myself as uploader. + * Add lintian override, xine addon provided by libxine2-dev. + + -- Maximiliano Curia Tue, 26 Nov 2013 10:26:58 +0100 + +subtitlecomposer (0.5.3-3) unstable; urgency=low + + * Switch to dpkg-source 3.0 (quilt) format. + * Added 04_fix_ftbfs_gcc_4_5.diff (Closes: #565078). + * Added "DEB_KDE_LINK_WITH_AS_NEEDED := yes" to debian/rules. + + -- José Manuel Santamaría Lema Thu, 14 Jan 2010 15:30:06 +0100 + +subtitlecomposer (0.5.3-2) unstable; urgency=low + + * Added patches to avoid an FTBFS when compiling with binutils-gold: + + 01_link_gobject.diff + + 02_link_krosscore.diff + + 03_link_phonon.diff + * Bump Standards Version to 3.8.3, no changes needed. + + -- José Manuel Santamaría Lema Fri, 13 Nov 2009 19:48:15 +0100 + +subtitlecomposer (0.5.3-1) unstable; urgency=low + + * New upstream release. + * Dropped the following patches because upstream fixed the issues: + + debian/patches/missing_gstreamer_headers.patch + + debian/patches/missing_phonon_link.patch + + debian/patches/textoverlay_fix.patch + * No build-depend on quilt since there are no patches to apply. + * Don't install KRAZY file because upstream is not provinding it for this + release. + * Bump Standards Version to 3.8.2, no changes needed. + * Added lintian overrides for ruby scripts intended to be ran using Kross. + * Refreshed man page, generated with kdemangen.pl and edited by hand to avoid + lintian warnings. + + -- José Manuel Santamaría Lema Fri, 19 Jun 2009 00:41:55 +0200 + +subtitlecomposer (0.5.2-1) unstable; urgency=low + + * Manpage generated with kdemangen.pl and edited by hand to avoid lintian + warnings. + * Patches to fix missing library links/headers: + + debian/patches/missing_gstreamer_headers.patch + + debian/patches/missing_phonon_link.patch + * Patch to make the video player work: + + debian/patches/textoverlay_fix.patch + * Initial release (Closes: #516372). + + -- José Manuel Santamaría Lema Tue, 19 May 2009 00:47:30 +0200 diff -Nru subtitlecomposer-0.5.3/pkg/debian/compat subtitlecomposer-0.5.7/pkg/debian/compat --- subtitlecomposer-0.5.3/pkg/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/debian/compat 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1 @@ +9 diff -Nru subtitlecomposer-0.5.3/pkg/debian/control subtitlecomposer-0.5.7/pkg/debian/control --- subtitlecomposer-0.5.3/pkg/debian/control 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/debian/control 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,26 @@ +Source: subtitlecomposer +Section: kde +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: gogo +Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools, + kdelibs5-dev, libgstreamer-plugins-base0.10-dev, libglib2.0-dev, libxml2-dev, + libxine2-dev, libx11-dev, libicu-dev +Standards-Version: 3.9.4 +Homepage: https://github.com/maxrd2/subtitlecomposer +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/subtitlecomposer.git +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/subtitlecomposer.git + +Package: subtitlecomposer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends} +Suggests: mplayer +Description: Subtitles editor for KDE + A text-based subtitles editor for KDE supporting basic operations (text, + time and style edition), realtime previewing and spell checking. Other + fancy features are delaying all subtitles in the current subtitle file, + checking errors or creating translations. + . + Different backends (GStreamer, MPlayer, Phonon or xine) can be used to play + the realtime video preview which helps to synchronize the subtitles. diff -Nru subtitlecomposer-0.5.3/pkg/debian/copyright subtitlecomposer-0.5.7/pkg/debian/copyright --- subtitlecomposer-0.5.3/pkg/debian/copyright 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/debian/copyright 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,107 @@ +This package was debianized by José Manuel Santamaría Lema on +Fri, 10 Apr 2009 22:11:11 +0200 + + +Upstream Author: + + Sergio Pistone + + +Copyright: + + Copyright © 2007-2008 Sergio Pistone + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the license, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License +can be found in the file `/usr/share/common-licenses/GPL-2'. + +Files src/player/mplayer/mediadata.h, src/widgets/pointingslider.h, +src/widgets/pointingslider.cpp, src/widgets/attachablewidget.h and +src/widgets/attachablewidget.cpp: + + Copyright © 2006-2008 Ricardo Villalba + Copyright © 2007-2008 Sergio Pistone + +File src/player/xine/FindXCB.cmake: + + Copyright © 2007 Matthias Kretz + + Redistribution and use is allowed according to the terms of the BSD license. + For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + Contents of COPYING-CMAKE-SCRIPTS file: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files src/main/utils/kreplace.h, src/main/utils/kreplace.cpp +and src/main/utils/kfind_p.h: + + Copyright © 2001 S.R.Haque + Copyright © 2002 David Faure + Copyright © 2004 Arend van Beelen jr. + + These files are under GNU Lesser General Public License as published by the + Free Software Foundation, version 2; on Debian systems the full text of the + GNU Lesser General Public License can be found in the + `/usr/share/common-licenses/LGPL-2' file. + +Files src/common/qxtsignalwaiter.h and src/common/qxtsignalwaiter.cpp: + + Copyright © 2006 Adam Higerd + + QxtSignalWaiter is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2 or greater, or under the terms + of the GNU Lesser General Public License, version 2.1 or greater, or + under the terms of the Q Public License as published by Trolltech. + This disjunctive license follows the license of the linked Qt toolkit. + Specifically, if you use Qt under the GPL, QxtSignalWaiter is licensed + to you under the GPL. If you use Qt under the QPL, this is licensed to + you under the QPL. If you use Qt with a commercial license purchased + from Trolltech, this is licensed to you under the LGPL. + + QxtSignalWaiter is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + appropriate license agreement for more details. + +The Debian packaging is © 2009 José Manuel Santamaría Lema + and is licensed under the GPL v2 or later, +see `/usr/share/common-licenses/GPL-2'. diff -Nru subtitlecomposer-0.5.3/pkg/debian/docs subtitlecomposer-0.5.7/pkg/debian/docs --- subtitlecomposer-0.5.3/pkg/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/debian/docs 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,2 @@ +TODO +AUTHORS diff -Nru subtitlecomposer-0.5.3/pkg/debian/man/subtitlecomposer.1 subtitlecomposer-0.5.7/pkg/debian/man/subtitlecomposer.1 --- subtitlecomposer-0.5.3/pkg/debian/man/subtitlecomposer.1 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.5.7/pkg/debian/man/subtitlecomposer.1 2014-09-26 10:33:30.000000000 +0000 @@ -0,0 +1,152 @@ +.\" This file was generated by kdemangen.pl and edited by hand +.TH SUBTITLECOMPOSER 1 "Jun 2009" "K Desktop Environment" "A KDE subtitle editor." +.SH NAME +subtitlecomposer +\- A KDE subtitle editor. +.SH SYNOPSIS +subtitlecomposer [Qt\-options] [KDE\-options] [Primary URL] [Translation URL] +.SH DESCRIPTION +A KDE subtitle editor. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B Primary URL +Open location as primary subtitle +.TP +.B Translation URL +Open location as translation subtitle +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS KDE options: +.TP +.B \-\-caption +Use 'caption' as name in the titlebar +.TP +.B \-\-icon +Use 'icon' as the application icon +.TP +.B \-\-config +Use alternative configuration file +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style