diary r47 - in trunk: . data

[pwithnall svn gnome org]

Author: pwithnall
Date: Sun Jun 22 15:25:10 2008
New Revision: 47
URL: http://svn.gnome.org/viewvc/diary?rev=47&view=rev

Log:
2008-06-22  Philip Withnall  <philip tecnocode co uk>

	* NEWS:
	* README:
	* configure.ac: Bump to version 0.3.1.
	* data/Makefile.am: Fix the desktop file.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/README
   trunk/configure.ac
   trunk/data/Makefile.am

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Jun 22 15:25:10 2008
@@ -1,5 +1,11 @@
 Major new features in version...
 
+0.3.1:
+* Update documentation
+* Fix the non-encryption build
+* Make the search dialogue non-modal
+* Fix the desktop file
+
 0.3:
 * Update documentation to point to new SVN repository
 * Add search functionality

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Sun Jun 22 15:25:10 2008
@@ -15,7 +15,9 @@
 	http://www.gnome.org
 SQLite 3
 	http://sqlite.org
-GPGME
+GtkSpell 2.0
+	http://gtkspell.sourceforge.net/
+GPGME (optional)
 	http://www.gnupg.org/gpgme.html
 
 Copyright

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jun 22 15:25:10 2008
@@ -1,4 +1,4 @@
-AC_INIT(diary, 0.3)
+AC_INIT(diary, 0.3.1)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
@@ -109,7 +109,6 @@
 src/Makefile
 po/Makefile.in
 data/Makefile
-data/diary.desktop
 data/icons/Makefile
 data/icons/16x16/Makefile
 data/icons/22x22/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Sun Jun 22 15:25:10 2008
@@ -16,12 +16,15 @@
 # UI file
 uidir = $(datadir)/diary
 ui_DATA = diary.ui
-EXTRA_DIST = $(ui_DATA)
 
 # Desktop file
+ INTLTOOL_DESKTOP_RULE@
+
 desktop_in_files = diary.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
 
+EXTRA_DIST = \
+	$(ui_DATA)	\
+	$(desktop_in_files)
 CLEANFILES = $(desktop_DATA)