[eclipse-fedorapackager/f14/master: 4/4] - Merge rawhide changes.

[jerboaa]

commit 0937ffd2a6958d570ceb9bd8f9389aad1370d9c7
Merge: e7b8a0e 552e9c7
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Mon Oct 4 14:55:52 2010 -0400

    - Merge rawhide changes.

 eclipse-fedorapackager.spec |   17 ++++++++++++++---
 sources                     |    2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --cc eclipse-fedorapackager.spec
index eed7994,1758a50..b439700
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@@ -97,8 -97,23 +97,19 @@@ pop
  %doc org.fedoraproject.eclipse.packager-feature/*.html
  
  %changelog
+ * Mon Oct 4 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.3-1
 -- Push release for actual build.
++- Merge rawhide changes.
+ 
+ * Mon Oct 4 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.3-0.1
+ - Better error checking in FedoraCheckoutWizard.java
+ - Fixes https://fedorahosted.org/eclipse-fedorapackager/ticket/31
+ - Fixes https://fedorahosted.org/eclipse-fedorapackager/ticket/36
+ 
+ * Fri Oct 1 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.2-1
+ - Fix getDistDefines() in FedoraHandlerUtils.
+ 
 -* Thu Sep 30 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.1-2
 -- Spin new release to fix replace sources bug.
 -
 -* Wed Sep 29 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.1-1
 -- Update to upstream 0.1.1
 -- Various bug fixes.
 +* Thu Sep 30 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.1-1
 +- Merge changes from master.
  
  * Fri Aug 27 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.0-0.3
  - Updated Eclipse help for Eclipse Fedora Packager.