[SCM] artikulate packaging branch, kubuntu_vivid_backports, updated. dbae7497980827cf13725b98d3a5639ee94fec43

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit dbae7497980827cf13725b98d3a5639ee94fec43
Merge: 7b0f0071dc5231d190024a745334b98a3d7dfef6 bf32b62fdf041a74fcead180bceee47a8173a915
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 13 15:22:47 2015 +0200

    Merge branch 'kubuntu_vivid_archive' into kubuntu_vivid_backports
    
    Conflicts:
    	debian/changelog

 debian/changelog | 33 ++++++++++++++++++++++++++++++---
 debian/control   |  6 +++---
 debian/watch     |  1 +
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 4f115e7,c8b4819..6355afc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,32 +1,38 @@@
 +artikulate (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 16 Apr 2015 11:55:46 -0700
 +
- artikulate (4:14.11.95-0ubuntu1) UNRELEASED; urgency=medium
+ artikulate (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
  
-   * New upstream beta release
+   * Add back in kdelibs5 parent version depend. 
+   * kdelibs is actually in the 4.14 series. Adjust version. 
+   * New upstream release. 
+   * Fix version..
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 20 Feb 2015 11:03:44 -0800
+ 
+ artikulate (4:14.12.2-0ubuntu1) vivid; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+ 
+   [ José Manuel Santamaría Lema ]
+   * Bump build depend on libqtgstreamer-dev to 1.2.0
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 08:53:09 -0800
+ 
+ artikulate (4:14.12.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove kdelibs5-dev depend version as there was not a new release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 16:20:52 +0100
+ 
+ artikulate (4:14.11.97-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release candidate
      - build-depend on extra-cmake-modules
      - add new files to artikulate.install, docs and not-installed
      - update artikulate.lintian-overrides for an added file

-- 
artikulate packaging