[almanah/f15: 11/11] Merge branch 'master' into f16

[Andreas Osowski]

commit 7f3edd858a62dbd444c10c490f761bff1acc74a8
Merge: 30090cf 70661c5
Author: Andreas Osowski <th0br0 at mkdir.name>
Date:   Thu Sep 15 13:47:35 2011 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	almanah.spec

 .gitignore                               |    1 +
 almanah-0.7.3-gtk3.patch                 |  384 ------------------------------
 almanah-0.7.3-libedataserverui-3.0.patch |   47 ----
 almanah.spec                             |   52 +---
 sources                                  |    2 +-
 5 files changed, 14 insertions(+), 472 deletions(-)
---
diff --cc almanah.spec
index 33de271,18a1532..a14a7d5
--- a/almanah.spec
+++ b/almanah.spec
@@@ -2,10 -2,9 +2,9 @@@
  %global		spellcheck 0
  
  Name:		almanah
- Version:	0.7.3
- Release:	14%{?dist}
+ Version:	0.8.0
 -Release:	3%{?dist}
++Release:	1%{?dist}
  Summary:	Application for keeping an encrypted diary
- 
  Group:		Applications/Productivity
  License:	GPLv3+
  URL:		http://tecnocode.co.uk/projects/almanah/
@@@ -113,15 -82,18 +82,18 @@@ f
  %{_datadir}/%{name}/
  %{_datadir}/icons/hicolor/*/apps/%{name}.png
  %{_datadir}/applications/%{name}.desktop
- %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
- 
+ %{_datadir}/GConf/gsettings/%{name}.convert
+ %{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml
  
  %changelog
 -* Mon Aug 29 2011 Milan Crha <mcrha at redhat.com> - 0.8.0-3
 -- Rebuild against newer evolution-data-server
++* Thu Sep 15 2011 Andreas Osowski <th0br0 at mkdir.name> - 0.8.0-1
++- Update to 0.8.0 based on Tom Callaway's changes
+ 
 -* Tue Aug 16 2011 Milan Crha <mcrha at redhat.com> - 0.8.0-2
 -- Rebuild against newer evolution-data-server
 +* Tue Aug 30 2011 Milan Crha <mcrha at redhat.com> - 0.7.3-14
 +- Rebuild against newer evolution-data-server (once again)
  
 -* Fri Aug  5 2011 Tom Callaway <spot at fedoraproject.org> - 0.8.0-1
 -- update to 0.8.0
 +* Tue Aug 16 2011 Milan Crha <mcrha at redhat.com> - 0.7.3-13
 +- Rebuild against newer evolution-data-server
  
  * Thu Jun 16 2011 Milan Crha <mcrha at redhat.com> - 0.7.3-12
  - Rebuild against newer evolution-data-server