gedit r6811 - in trunk: . gedit help plugins/modelines po

[pborelli svn gnome org]

Author: pborelli
Date: Mon Jan  5 20:03:01 2009
New Revision: 6811
URL: http://svn.gnome.org/viewvc/gedit?rev=6811&view=rev

Log:
2.25.4


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/README
   trunk/configure.ac
   trunk/gedit/Makefile.am
   trunk/help/ChangeLog
   trunk/plugins/modelines/Makefile.am
   trunk/po/ChangeLog

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jan  5 20:03:01 2009
@@ -1,4 +1,22 @@
 ============
+gedit 2.25.4
+============
+
+New Features and Fixes
+======================
+- Add quick syntax highlightig and tab width selection in the statusbar (Jesse van den Kieboom)
+- More work on the internal bus system (Jesse van den Kieboom)
+- Bugfixes and features for the snippets plugin (Jesse van den Kieboom)
+- Parse syntax highlighting language from modelines (Sergej Chodarev)
+- Misc bugfixes
+
+New and updated translations
+============================
+- CÃsar Veiga (pt_BR)
+- Jorge Gonzalez (es)
+
+
+============
 gedit 2.25.3
 ============
 

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Mon Jan  5 20:03:01 2009
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is version 2.25.3 of gedit. gedit is a small and lightweight UTF-8 text 
+This is version 2.25.4 of gedit. gedit is a small and lightweight UTF-8 text 
 editor for the GNOME environment.
 
 gedit is part of GNOME and uses the latest GTK+ and GNOME libraries.
@@ -71,8 +71,8 @@
 
 Simple install procedure:
 
-  % gzip -cd gedit-2.25.3.tar.gz | tar xvf - 	# unpack the sources
-  % cd gedit-2.25.3				# change to the toplevel directory
+  % gzip -cd gedit-2.25.4.tar.gz | tar xvf - 	# unpack the sources
+  % cd gedit-2.25.4				# change to the toplevel directory
   % ./configure					# run the `configure' script
   % make					# build gedit
   [ Become root if necessary ]

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan  5 20:03:01 2009
@@ -4,7 +4,7 @@
 
 m4_define(gedit_major_version,  2)
 m4_define(gedit_minor_version, 25)
-m4_define(gedit_micro_version,  3)
+m4_define(gedit_micro_version,  4)
 m4_define(gedit_version, gedit_major_version.gedit_minor_version.gedit_micro_version)
 
 AC_INIT(gedit, gedit_version, http://bugzilla.gnome.org/enter_bug.cgi?product=gedit)

Modified: trunk/gedit/Makefile.am
==============================================================================
--- trunk/gedit/Makefile.am	(original)
+++ trunk/gedit/Makefile.am	Mon Jan  5 20:03:01 2009
@@ -46,11 +46,10 @@
 	gedit-marshal.h
 
 if PLATFORM_WIN32
-gedit.res: gedit.rc
-	$(WINDRES) -i gedit.rc --input-format=rc -o gedit.res -O coff
+gedit-res.o: gedit.rc
+	$(WINDRES) -i gedit.rc --input-format=rc -o gedit-res.o -O coff
 
-BUILT_SOURCES += gedit.res
-gedit_LDADD += gedit.res
+gedit_LDADD += gedit-res.o
 endif
 
 NOINST_H_FILES =			\

Modified: trunk/plugins/modelines/Makefile.am
==============================================================================
--- trunk/plugins/modelines/Makefile.am	(original)
+++ trunk/plugins/modelines/Makefile.am	Mon Jan  5 20:03:01 2009
@@ -27,7 +27,9 @@
 
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
-EXTRA_DIST = $(plugin_in_files)
+EXTRA_DIST = \
+	$(plugin_in_files)				\
+	$(modelines_DATA)
 
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)