Merge remote branch 'origin/master' into el5

Conflicts: .gitignore sources ucview.spec
dist-git conversion
2010-10-18 01:07:17 +02:00 · 2010-07-29 14:36:55 +00:00 · 2010-02-27 00:58:47 +00:00 · 2009-11-26 01:13:32 +00:00 · 2009-05-24 02:18:45 +00:00 · 2009-05-04 10:16:29 +00:00
1 changed files with 15 additions and 0 deletions
--- a/ucview-0.31-include.patch
+++ b/ucview-0.31-include.patch
@ -0,0 +1,15 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for ucview >= 0.31 to fix broken
+include. Upstream is aware about the issue - and this should be fixed for the next
+release of ucview.
+
+--- ucview-0.31/src/ucview-window.h		2009-12-08 18:25:26.000000000 +0100
+++ ucview-0.31/src/ucview-window.h.include	2010-02-21 18:59:53.000000000 +0100
+@@ -12,7 +12,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ 
+-#include <ucview/ucview.h>
+#include <ucview.h>
+ 
+ #define UCVIEW_GCONF_DIR "/apps/ucview"
+ #define UCVIEW_PLUGIN_GCONF_DIR "plugins"
Author	SHA1	Message	Date
Robert Scheck	078b042a3d	Merge remote branch 'origin/master' into el5 Conflicts: .gitignore sources ucview.spec	2010-10-18 01:07:17 +02:00
Fedora Release Engineering	ed0e53afe6	dist-git conversion	2010-07-29 14:36:55 +00:00
Robert Scheck	089f94bd3c	Upgrade to 0.31 (#530708 )	2010-02-27 00:58:47 +00:00
Bill Nottingham	8419bbad94	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:13:32 +00:00
Robert Scheck	d95e4b82e2	Readded wrongly removed build requirement to dbus-glib-devel	2009-05-24 02:18:45 +00:00
Robert Scheck	88141a9266	Upgrade to 0.23	2009-05-04 10:16:29 +00:00
Robert Scheck	2c4a01e6ff	Rebuild against unicap 0.93	2008-10-19 14:25:17 +00:00
Robert Scheck	56a32f2881	Add some missing files...	2008-10-13 22:31:42 +00:00
Robert Scheck	92e7a36631	Upgrade to 0.22	2008-10-13 21:44:34 +00:00
Robert Scheck	05c913f82a	Upgrade to 0.21	2008-07-27 16:21:07 +00:00
Robert Scheck	ead9a14746	Upgrade to 0.20.1	2008-05-19 21:01:55 +00:00
Robert Scheck	e46027a0d2	Fixed *.desktop handling and DBUS support	2008-05-19 20:45:42 +00:00
Robert Scheck	9f9205fb18	Initial import of ucview	2008-05-19 19:18:34 +00:00
Kevin Fenzi	e78fc3aea6	Initialize branch EL-5 for ucview	2008-05-19 16:26:54 +00:00