[shotwell/f14/master: 6/6] Pull in shotwell 0.8.1 from F-15 branch, since due to the Vala update, 0.7.2 is no longer buildable

[Michel Alexandre Salim]

commit 1666a5a8a1bd41b516649fef29d09294481352f8
Merge: 4094f81 64b469d
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Mar 18 01:39:36 2011 +0100

    Pull in shotwell 0.8.1 from F-15 branch, since due to the Vala update,
    0.7.2 is no longer buildable on F-14 + updates
    
    Merge commit '64b469dc295fed211340b9d49decd8c8cf1f36b9' into f14
    
    Conflicts:
    	shotwell.spec

 .gitignore                     |    2 ++
 prefixly-correct.patch         |   39 ---------------------------------------
 shotwell-fix-permissions.patch |   13 -------------
 shotwell.spec                  |   25 +++++++++++++++++--------
 sources                        |    2 +-
 5 files changed, 20 insertions(+), 61 deletions(-)
---
diff --cc shotwell.spec
index 8d0256b,0a45178..199204f
--- a/shotwell.spec
+++ b/shotwell.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           shotwell
- Version:        0.7.2
- Release:        4%{?dist}
+ Version:        0.8.1
 -Release:        1%{?dist}
++Release:        2%{?dist}
  Summary:        A photo organizer for the GNOME desktop
  
  Group:          Applications/Multimedia
@@@ -94,12 -92,18 +94,21 @@@ gtk-update-icon-cache --quiet %{_datadi
  
  
  %changelog
- * Fri Mar 18 2011 Michel Salim <salimma at fedoraproject.org> - 0.7.2-4
++* Fri Mar 18 2011 Michel Salim <salimma at fedoraproject.org> - 0.8.1-2
 +- Get gettext to actually generate translated strings (# 642092)
 +
- * Sun Jan  2 2011 Siddhesh Poyarekar <siddhesh at redhat.com> - 0.7.2-3
+ * Sun Jan 16 2011 Christopher Aillon <caillon at redhat.com> - 0.8.1-1
+ - Update to 0.8.1
+ 
+ * Sat Jan  8 2011 Christopher Aillon <caillon at redhat.com> - 0.8.0-1
+ - Update to 0.8.0
+ 
+ * Sun Jan  2 2011 Siddhesh Poyarekar <siddhesh at redhat.com> - 0.7.2-4
  - Add user_photos to permissions required. Fixes bz #666512.
  
+ * Sun Jan 02 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.7.2-3
+ - rebuild (exiv2)
+ 
  * Wed Sep 29 2010 jkeating - 0.7.2-2
  - Rebuilt for gcc bug 634757