[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:43 UTC 2017


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

The following commit has been merged in the master branch:
commit 69446c7b8416b36042f644ef0d7dcc711a91067b
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 29 19:09:48 2017 +0200

    copyright: update
---
 debian/changelog |  1 +
 debian/copyright | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4edf5d..2445bd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ subtitlecomposer (0.6.5-0r1) UNRELEASED; urgency=medium
   * New upstream release.
   * Replace the transitional build dependencies:
     - kio-dev -> libkf5kio-dev
+  * Update copyright.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 29 Sep 2017 18:50:11 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 6ab8a5a..85b32a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: subtitlecomposer
 Source: https://github.com/maxrd2/subtitlecomposer
 
@@ -7,7 +7,7 @@ Copyright: 2006-2008, Ricardo Villalba <rvm at escomposlinux.org>
            2007-2009, Sergio Pistone <sergio_pistone at yahoo.com.ar> based on Kaffeine by Jürgen Kofler
            2007-2009, Sergio Pistone <sergio_pistone at yahoo.com.ar> based on smplayer by Ricardo Villalba
            2007-2012, Sergio Pistone <sergio_pistone at yahoo.com.ar>
-           2010-2016, Mladen Milinkovic <max at smoothware.net>
+           2010-2017, Mladen Milinkovic <max at smoothware.net>
 License: GPL-2+
 
 Files: cmake/*
@@ -42,10 +42,16 @@ License: BSD-3-clause
  (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/formats/vobsub/mplayer/*
+Copyright: MPlayer
+           2005, Jindrich Makovicka <makovick at gmail.com>
+           2007, Ulion <ulion2002 at gmail.com>
+License: GPL-2+
+
 Files: debian/*
 Copyright: 2009, José Manuel Santamaría Lema <panfaust at gmail.com>
            2015, Martin Steghöfer <martin at steghoefer.eu>
-           2016, Pino Toscano <pino at debian.org>
+           2016-2017, Pino Toscano <pino at debian.org>
 License: GPL-2+
 
 License: GPL-2+

-- 
subtitlecomposer packaging



More information about the pkg-kde-commits mailing list