[eclipse-fedorapackager/f14/master: 10/10] Merge branch 'master' into f14.

[jerboaa]

commit 2de022d2ff8cea8064d2ead4312b73c9f6d240e6
Merge: 2c85d6f 25a4844
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Wed Jan 26 15:26:24 2011 -0500

    Merge branch 'master' into f14.

 eclipse-fedorapackager.spec |   19 +++++++++++++------
 sources                     |    2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)
---
diff --cc eclipse-fedorapackager.spec
index 6bd0185,d3b2aa6..a7ef97e
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@@ -2,8 -2,8 +2,8 @@@
  %global install_loc    %{_datadir}/eclipse/dropins/packager
  
  Name:           eclipse-fedorapackager
- Version:        0.1.10
+ Version:        0.1.11
 -Release:        2%{?dist}
 +Release:        1%{?dist}
  Summary:        Fedora Packager Tools
  
  Group:          Development/Tools
@@@ -98,28 -98,45 +98,35 @@@ pop
  %doc org.fedoraproject.eclipse.packager-feature/*.html
  
  %changelog
 -* Wed Jan 26 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.11-2
 -- Changed %description.
 -
+ * Wed Jan 26 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.11-1
++- Changed %description.
+ - Update to upstream 0.1.11
 -- Fix Trac #42, #55.
++- Fix Trac #42, #55, #58.
+ - Update doc plug-in.
 -- Work around JGit bug #317411.
 -
 -* Wed Jan 12 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.10-3
 -- Fix NPE in hasLocalChanges() FpGitProjectBits also due to
 -  different branch naming.
 -
 -* Wed Jan 12 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.10-2
 -- Fix NPE in branch mapping due to changed "f14"-like branch
 -  naming.
 -
 -* Tue Jan 11 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.10-1
 -- Update to upstream 0.1.10.
 -- Require EGit/JGit >= 0.10.0.
 -
 -* Wed Dec 15 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.9-2
 -- Update to upstream 0.1.9.
 -- Explicitly set autokarma=true for new Bodhi updates.
 -
 -* Wed Nov 17 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.9-1
 -- Experimental build including Bodhi updates reporting
 -  dialog.
++- Work around JGit bug #317411 (Trac #58).
++
 +* Mon Jan 17 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.1.10-1
 +- Update to upstream 0.1.10 release.
 +- Adapted code for better fedpkg compatibility (Trac #37, #38).
 +  Local branch names are now "f14"-like instead of "f14/master"
 +  with remote tracking configured.
 +- Refactored relevant JGit/EGit reliant code due to
 +  EGit/JGit 0.10.1 release.
 +- Added working set support to clone dialog (Trac #57,
 +  patch by mbooth).
 +- Check for unpushed changes before Koji build (Trac #53).
 +
 +* Wed Dec 15 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.9-1
 +- Add explicit autokarma=true when pushing Bodhi updates.
 +- Add pop-up with link to the pushed update.
 +- Upstream 0.1.9 release.
  
  * Wed Oct 20 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.8-1
 +- Merged changes from rawhide. Changes include:
  - Improve error checking in import wizard.
  - Update user documentation.
 -- Upstream release 0.1.8
 -
 -* Tue Oct 19 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.7-1
  - Include potential fix for Ticket #34 (download performance
    problem).
 -
 -* Thu Oct 14 2010 Severin Gehwolf <sgehwolf at redhat.com> 0.1.6-1
  - Remove eclipse-jgit R/BR since JGit is required by EGit
  - Note: EGit API isn't stable yet. So, this package (0.1.6) might
    or might not work with EGit 0.10.x. It's known to work with