[SCM] ffmpegthumbs packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-14-g1d0d0c1

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ffmpegthumbs.git;a=commitdiff;h=d73802a

The following commit has been merged in the kubuntu_xenial_archive branch:
commit d73802a4b796727eca45eedf5e2db43756f76a6b
Merge: 383ff7196175e66a48ecb675047854101c2fe078 4911fd629bcf0686df64e3b3830db7ae71ee5dfc
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 12 23:42:20 2016 +0100

    Merge remote-tracking branch 'origin/master' into kubuntu_xenial_archive

 debian/.gitattributes |  1 +
 debian/changelog      | 28 +++++++++++++++++++++++-----
 debian/control        |  8 +++-----
 debian/watch          |  2 +-
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 4c60c0c,92acc6c..46e5b72
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,16 +1,70 @@@
 +ffmpegthumbs (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
++  [ Clive Johnston ]
 +  * New upstream release
 +  * Adding new build deps
 +
++  [ Philip Muškovac ]
++  * Merge with debian git master
++  * Drop the kde4 build-deps
++
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:28:51 +0000
 +
 +ffmpegthumbs (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 11:50:27 +0100
 +
 +ffmpegthumbs (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 16:07:28 +0100
 +
 +ffmpegthumbs (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 16:58:14 +0100
 +
+ ffmpegthumbs (4:15.07.90-1) unstable; urgency=medium
+ 
+   * New upstream release (15.07.90).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:10:47 +0200
+ 
 +ffmpegthumbs (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 09:28:33 +0100
 +
 +ffmpegthumbs (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * New upstream release
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:26:37 +0200
 +
 +ffmpegthumbs (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:25:51 -0700
 +
+ ffmpegthumbs (4:14.12.2-1) experimental; urgency=medium
+ 
+   * Prepare Debian release.
+   * Bump Standards-Version to 3.9.6, no changes needed.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 16 Feb 2015 15:12:49 +0100
+ 
  ffmpegthumbs (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 26294bf,49d34f3..248e43d
--- a/debian/control
+++ b/debian/control
@@@ -7,21 -7,18 +7,19 @@@ Uploaders: Pino Toscano <pino at debian.or
             Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake,
                 debhelper (>= 9),
 -               kde-sc-dev-latest (>= 4:4.12),
 -               kdelibs5-dev,
 +               extra-cmake-modules,
-                kde-sc-dev-latest (>= 4:4.12),
-                kdelibs5-dev,
-                kio-dev,
++               kio-dev (>= 5.18),
                 libavcodec-dev,
                 libavformat-dev,
                 libavutil-dev,
                 libswscale-dev,
                 pkg-config,
 -               pkg-kde-tools (>= 0.12)
 +               pkg-kde-tools (>= 0.12),
 +               qtbase5-dev
  Standards-Version: 3.9.6
  Homepage: http://www.kde.org/
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/ffmpegthumbs.git/
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/ffmpegthumbs.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/ffmpegthumbs.git
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/ffmpegthumbs.git
  
  Package: ffmpegthumbs
  Architecture: any

-- 
ffmpegthumbs packaging