[eclipse-xsd/eclipse-luna: 2/2] Merge latest from f21 branch

[Mat Booth]

commit 920a64ed3087bca9b5f86909f9b586e21f1d95ce
Merge: 8d6221e c120ae2
Author: Mat Booth <mat.booth at redhat.com>
Date:   Wed Aug 13 11:53:18 2014 +0100

    Merge latest from f21 branch

 0003-438418-Migrate-to-tycho-build.patch |   24 ++++++++++++++++--------
 eclipse-xsd.spec                         |    8 +++++++-
 2 files changed, 23 insertions(+), 9 deletions(-)
---
diff --cc eclipse-xsd.spec
index bfe043c,92367e8..56d3c2b
--- a/eclipse-xsd.spec
+++ b/eclipse-xsd.spec
@@@ -5,9 -2,9 +5,9 @@@
  
  %global git_tag R2_10_0
  
 -Name:      eclipse-xsd
 +Name:      %{?scl_prefix}eclipse-xsd
  Version:   2.10.0
- Release:   1.1%{?dist}
 -Release:   2%{?dist}
++Release:   2.1%{?dist}
  Summary:   XML Schema Definition (XSD) Eclipse plug-in
  License:   EPL
  URL:       http://www.eclipse.org/modeling/mdt/?project=xsd
@@@ -118,9 -111,9 +118,15 @@@ rm %{buildroot}%{eclipse_dropin}/xsd-ex
  %{eclipse_dropin}/xsd-examples
  
  %changelog
++* Wed Aug 13 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-2.1
++- Merge latest from f21 branch
++
+ * Wed Aug 13 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-2
+ - Qualifier should be lexographically greater than upstream's
+ 
 +* Sun Jul 27 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-1.1
 +- SCL-ise
 +
  * Wed Jun 25 2014 Mat Booth <mat.booth at redhat.com> - 2.10.0-1
  - Update to latest upstream release