Release 2.29.1YELP_2_19_1

svn path=/trunk/; revision=2851

4 files changed, 22 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 104c486c..a1d62ebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-07-30  Don Scorgie  <dscorgie@svn.gnome.org>
 
+        * configure.in: 
+        * NEWS:
+        - Version 2.19.1
+
+2007-07-30  Don Scorgie  <dscorgie@svn.gnome.org>
+
 	* src/Makefile.am: 
 	Disable test programs for now
 	
diff --git a/Makefile.am b/Makefile.am
index 9d410cfc..786677bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,8 @@ ACLOCAL_AMFLAGS = -I m4
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files=yelp.desktop.in.in
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+desktop_in_files=yelp.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 yelpdatadir = $(datadir)/yelp
 yelpdata_DATA = important_docs.xml
diff --git a/NEWS b/NEWS
index 14a8a144..d296dfd7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Changed in 2.19.1:
+------------------
+* Merge of yelp-spoon (rework) branch
+  - Move to shiny new on-demand pager system
+  - Remove scrollkeeper in favour of Rarian
+  - Update dependancy of gnome-doc-utils to latest version
+  - Make search, man and info pages required
+  - Reduced dependance on libgnome
+  - Large cleanup of other files
+  - Improve printing
+  - Give docbook a nice TOC on the right
+  - Probably many other things I've forgotten
+
 Changed in 2.18.1:
 ------------------
 * Updated translations:
diff --git a/configure.in b/configure.in
index d7a1d338..c0f41e62 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([Yelp],[2.18.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
+AC_INIT([Yelp],[2.19.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp],[yelp])
 
 GNOME_COMMON_INIT