[tigervnc/f20: 2/2] Merge branch 'f19' into f20

[Tim Waugh]

commit 4cc2b0e8c43ffe9b8a38a4af96355d786666bd40
Merge: c703243 dc90bee
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Jul 14 17:07:29 2014 +0100

    Merge branch 'f19' into f20

 tigervnc-ext-init.patch     |   20 +++
 tigervnc-inputreset.patch   |  383 +++++++++++++++++++++++++++++++++++++++++++
 tigervnc-pointersync.patch  |   21 ++-
 tigervnc-undo-fc23895.patch |   48 ++++++
 tigervnc.spec               |   13 +-
 5 files changed, 475 insertions(+), 10 deletions(-)
---
diff --cc tigervnc.spec
index 7c04d7a,567c3be..23cb62f
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:		tigervnc
  Version:	1.3.0
- Release:	15%{?dist}
 -Release:	12%{?dist}
++Release:	16%{?dist}
  Summary:	A TigerVNC remote display system
  
  Group:		User Interface/Desktops
@@@ -363,30 -356,23 +367,33 @@@ f
  %{_datadir}/icons/hicolor/*/apps/*
  
  %changelog
 -* Mon Jul 14 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-12
++* Mon Jul 14 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-16
+ - Input reset fixes from upstream (bug #1116956).
+ 
 -* Thu May 22 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-11
 +* Thu May 22 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-15
  - Keep pointer in sync when using module (upstream bug #152).
  
 -* Wed Mar 19 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-10
 +* Wed Mar 19 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-14
  - Fixed heap-based buffer overflow (CVE-2014-0011, bug #1050928).
  
 -* Mon Feb 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-9
 +* Mon Feb 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-13
  - Clearer xstartup file (bug #923655).
  
 -* Tue Jan 21 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-8
 +* Tue Jan 14 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-12
  - Fixed instructions in systemd unit file.
 +
 +* Fri Jan 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-11
  - Fixed viewer crash when cursor has not been set (bug #1038701).
 +
 +* Thu Dec 12 2013 Tim Waugh <twaugh at redhat.com> 1.3.0-10
  - Avoid invalid read when ZRLE connection closed (upstream bug #133).
  
 +* Tue Dec  3 2013 Tim Waugh <twaugh at redhat.com> 1.3.0-9
 +- Fixed build failure with -Werror=format-security (bug #1037358).
 +
 +* Thu Nov 07 2013 Adam Jackson <ajax at redhat.com> 1.3.0-8
 +- Rebuild against xserver 1.15RC1
 +
  * Tue Sep 24 2013 Tim Waugh <twaugh at redhat.com> 1.3.0-7
  - Removed incorrect patch (for unexpected key_is_down). Fixes stuck
    keys bug (bug #989502).