[SCM] krfb packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-17-g172d5b2

[Micah Gersten]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 172d5b2a560b6196fa67f0faf08148385a3a1ac3
Merge: d54f5bad22763e792d2976c3fb26370eec70759d b42852a5a96d01f0f98029868dedb914898e745d
Author: Micah Gersten <micahg at ubuntu.com>
Date:   Thu Jun 4 15:24:41 2015 -0500

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

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

diff --cc debian/changelog
index 2afb9d9,bba31f9..0ccd45b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
 +krfb (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:24:21 -0700
 +
+ krfb (4:14.12.3-0ubuntu2) wily; urgency=medium
+ 
+   * No change rebuild for libvncserver1
+ 
+  -- Micah Gersten <micahg at ubuntu.com>  Thu, 04 Jun 2015 13:15:53 -0500
+ 
  krfb (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
krfb packaging