Revision: 5989 http://geany.svn.sourceforge.net/geany/?rev=5989&view=rev Author: colombanw Date: 2011-10-03 14:39:01 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Post-release version bump
Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/configure.ac trunk/doc/geany.txt trunk/geany.nsi trunk/geany_private.rc trunk/src/geany.h trunk/win32-config.h trunk/wscript
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/ChangeLog 2011-10-03 14:39:01 UTC (rev 5989) @@ -1,3 +1,10 @@ +2011-10-03 Colomban Wendling <colomban(at)geany(dot)org> + + * TODO, configure.ac, doc/geany.txt, geany.nsi, geany_private.rc, + src/geany.h, win32-config.h, wscript: + Post-release version bump. + + 2011-10-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* Merge branches/unstable:
Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/TODO 2011-10-03 14:39:01 UTC (rev 5989) @@ -27,9 +27,9 @@ workspace-sockets branch)
- 1.0: - o stable plugin ABI for the 1.0 series? (Split up geany_data, prefs, - GeanyKeyCommand enum into groups) + Someday: + o stable plugin ABI? (Split up geany_data, prefs, GeanyKeyCommand + enum into groups) o review documentation
Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/configure.ac 2011-10-03 14:39:01 UTC (rev 5989) @@ -2,7 +2,7 @@ dnl $Id$
AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(geany, 0.21) +AM_INIT_AUTOMAKE(geany, 1.22) AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/doc/geany.txt 2011-10-03 14:39:01 UTC (rev 5989) @@ -1,4 +1,4 @@ -.. |(version)| replace:: 0.21 +.. |(version)| replace:: 1.22
======= Geany
Modified: trunk/geany.nsi =================================================================== --- trunk/geany.nsi 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/geany.nsi 2011-10-03 14:39:01 UTC (rev 5989) @@ -33,8 +33,8 @@ ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "0.21" -!define PRODUCT_VERSION_ID "0.21.0.0" +!define PRODUCT_VERSION "1.22" +!define PRODUCT_VERSION_ID "1.22.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany"
Modified: trunk/geany_private.rc =================================================================== --- trunk/geany_private.rc 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/geany_private.rc 2011-10-03 14:39:01 UTC (rev 5989) @@ -1,8 +1,8 @@
#include <windows.h> // include for version info constants
-#define VER_FILEVERSION 0,21,0,0 -#define VER_FILEVERSION_STR "0.21" +#define VER_FILEVERSION 1,22,0,0 +#define VER_FILEVERSION_STR "1.22"
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico"
Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/src/geany.h 2011-10-03 14:39:01 UTC (rev 5989) @@ -47,7 +47,7 @@ * listed in the documentation should not be changed */ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_TEMPLATES_SUBDIR "templates" -#define GEANY_CODENAME "Gromia" +#define GEANY_CODENAME "Tavira" #define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_STRING_UNTITLED _("untitled") #define GEANY_DEFAULT_DIALOG_HEIGHT 350
Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/win32-config.h 2011-10-03 14:39:01 UTC (rev 5989) @@ -314,7 +314,7 @@ /* #undef volatile */
/* Version number of package */ -#define VERSION "0.21" +#define VERSION "1.22"
#define REVISION "-1"
Modified: trunk/wscript =================================================================== --- trunk/wscript 2011-10-03 14:37:06 UTC (rev 5988) +++ trunk/wscript 2011-10-03 14:39:01 UTC (rev 5989) @@ -52,7 +52,7 @@
APPNAME = 'geany' -VERSION = '0.21' +VERSION = '1.22' LINGUAS_FILE = 'po/LINGUAS'
top = '.'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.