[SCM] krdc packaging branch, kubuntu_wily_archive, updated. debian/4.14.1-1-20-g112add3

[Micah Gersten]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 112add3c6833ad6cf3f4f767abfa974d813e410b
Merge: 162bb24d475a1eec3e3aeb68a8d4f69de19d5dc8 ea8cd8aed028373285dd7096652bcf7185f85edc
Author: Micah Gersten <micahg at ubuntu.com>
Date:   Thu Jun 4 11:59:05 2015 -0500

    Merge branch 'no-change-rebuild-libvncclient1' into kubuntu_wily_archive
    
    Conflicts:
    	debian/changelog

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 98d5182,9fbf4ac..af4d81d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
 +krdc (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 13 May 2015 22:22:25 -0700
 +
+ krdc (4:14.12.3-0ubuntu2) wily; urgency=medium
+ 
+   * No change rebuild for libvncclient1
+ 
+  -- Micah Gersten <micahg at ubuntu.com>  Thu, 04 Jun 2015 11:45:37 -0500
+ 
  krdc (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
krdc packaging