[SCM] blinken packaging branch, master, updated. debian/4.14.1-1-21-g1cbf876

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 444cbc0d6b5f6958e9d92415c82dd8cf53642c97
Merge: 5dfdebabaa3425c1780d3ac6c76acfb21f947e25 1e69a5d2e758bf46b501acc4e410e1f93c8c1ab7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 16 12:47:10 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/watch

 debian/.gitattributes       |  1 -
 debian/changelog            | 25 +++++++++++++++++++++++++
 debian/control              | 10 +++++-----
 debian/source/local-options |  1 -
 debian/watch                |  2 +-
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index c3554d6,cbf0901..3cd4d6c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,34 @@@
+ blinken (4:14.12.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove unstable from watch file, uscan fails with
+     remote site does not even have current version 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:37:03 -0800
+ 
+ blinken (4:14.12.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
+   * Remove kdelibs5-dev depend version as there was not a new release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 11 Dec 2014 15:18:07 -0800
+ 
+ blinken (4:14.11.97-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release candidate
+   * Fix watch urls for new release location
+   * Update Vcs urls for the new repository location
+   * Suggest khelpcenter instead of khelpcenter4
+   * PPA build
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 19:56:08 +0100
+ 
 +blinken (4:4.14.1-2) UNRELEASED; urgency=medium
 +
 +  * Fix the watch file to look for the blinken tarball, not bliken
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Fri, 21 Nov 2014 22:48:14 +0100
 +
  blinken (4:4.14.1-1) unstable; urgency=medium
  
    * New upstream release (4.14.1).

-- 
blinken packaging