[fawkes/f14/master: 2/2] Merge branch 'master' into f14

[Tim Niemueller]

commit f590c11c36b92d2e4a5ecbad2658ba6ae6f01ac0
Merge: 8b83762 6ea9f1f
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Sun Jan 9 23:48:01 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	fawkes.spec

 .gitignore                     |    4 +-
 fawkes-0.4-desktop-files.patch |  213 ----
 fawkes-0.4-docs.patch          | 1308 ----------------------
 fawkes-0.4-libmicrohttpd.patch |   71 --
 fawkes-0.4-man-pages.patch     | 2357 ----------------------------------------
 fawkes-0.4-userconf.patch      |  823 --------------
 fawkes.spec                    |   37 +-
 sources                        |    2 +-
 8 files changed, 28 insertions(+), 4787 deletions(-)
---
diff --cc fawkes.spec
index 78a7787,783d813..c81ffe2
--- a/fawkes.spec
+++ b/fawkes.spec
@@@ -557,9 -566,10 +566,13 @@@ rm -rf %{buildroot
  %{_datadir}/doc/%{name}-%{version}
  
  %changelog
+ * Sun Jan 09 2011 Tim Niemueller <tim at niemueller.de> - 0.4.1-1
+ - Update to 0.4.1 (includes all patches of 0.4 package)
+ - Added more requires to devenv package
+ 
 +* Tue Nov 09 2010 Tim Niemueller <tim at niemueller.de> - 0.4-7
 +- Rebuild again, libmicrohttpd was not yet tagged into f14 override
 +
  * Mon Nov 08 2010 Tim Niemueller <tim at niemueller.de> - 0.4-6
  - Add patch and rebuild for new libmicrohttpd