[redeclipse/f19: 21/23] Merge branch 'master' into f19

[Martin Erik Werner]

commit 62003aeceecba9b9e3202d041eb682a06ad7eb30
Merge: 385c60f 416bb80
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Thu May 2 10:43:05 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	redeclipse.spec

 .gitignore                                         |    1 +
 ....3.1-system-install-fix-cube2font-targets.patch |   31 ----
 redeclipse-1.4-akashi-relicense.patch              |  162 ++++++++++++++++++++
 ....4-desktop-file-don-t-quote-icon-app-name.patch |   19 +++
 ...-t-check-for-keymap-when-using-standalone.patch |   23 +++
 ...all-symlink-to-version.cfg-in-server-inst.patch |   17 ++
 redeclipse-build-with-system-enet.patch            |   22 ++--
 redeclipse-generate-tarball.sh                     |    9 +-
 redeclipse.spec                                    |   35 ++++-
 sources                                            |    2 +-
 10 files changed, 269 insertions(+), 52 deletions(-)
---
diff --cc redeclipse.spec
index 67a094d,c27312d..560cebf
--- a/redeclipse.spec
+++ b/redeclipse.spec
@@@ -167,9 -178,20 +178,23 @@@ f
  
  
  %changelog
+ * Wed May 01 2013 Martin Erik Werner <martinerikwerner at gmail.com> 1.4-3
+ - Add patch with note that Akashi-Font is OFL-licensed
+ 
+ * Sat Apr 27 2013 Bruno Wolff III <bruno at wolff.to> 1.4-2
+ - Rebuild for enet 1.3.7 soname bump
+ * Mon Mar 25 2013 Martin Erik Werner <martinerikwerner at gmail.com> 1.4-1
+ - New upstream release
+ - Remove cube2font build fix
+   + Applied upstream
+ - Update generate-tarball script
+ - Add upstream desktop file fix patch
+ - Add upstream server install fix patch
+ - Add upstream patch for starting server without data
+ 
 +* Sat Apr 27 2013 Bruno Wolff III <bruno at wolff.to> - 1.3.1-3
 +- Rebuild for enet 1.3.7 soname bump
 +
  * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild