From a50306cab3e0d07bd568861dc6b43bbea78d63d3 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Sun, 12 Jul 2015 19:30:44 +0200 Subject: [PATCH] Post release version bump Say hello to Geany 1.26 "Rosset"! --- NEWS | 3 +++ configure.ac | 2 +- doc/geany.txt | 2 +- geany.exe.manifest | 2 +- geany_private.rc | 4 ++-- src/geany.h | 2 +- win32-config.h | 2 +- wscript | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 4f47a628d..168dc5bee 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Geany 1.26 (unreleased) + + Geany 1.25 (July 12, 2015) General diff --git a/configure.ac b/configure.ac index da2f4a1c4..03a898412 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.25], +AC_INIT([Geany], [1.26], [https://sourceforge.net/tracker/?group_id=153444&atid=787791]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/doc/geany.txt b/doc/geany.txt index 3c77b0461..d46fed0d9 100644 --- a/doc/geany.txt +++ b/doc/geany.txt @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.25 +.. |(version)| replace:: 1.26 .. -*- reStructuredText -*- ======= diff --git a/geany.exe.manifest b/geany.exe.manifest index dd7602497..60136ef8c 100644 --- a/geany.exe.manifest +++ b/geany.exe.manifest @@ -1,7 +1,7 @@ diff --git a/geany_private.rc b/geany_private.rc index f24c7583a..4c7b10c92 100644 --- a/geany_private.rc +++ b/geany_private.rc @@ -1,8 +1,8 @@ #include // include for version info constants -#define VER_FILEVERSION 1,25,0,0 -#define VER_FILEVERSION_STR "1.25" +#define VER_FILEVERSION 1,26,0,0 +#define VER_FILEVERSION_STR "1.26" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icons/geany.ico" diff --git a/src/geany.h b/src/geany.h index 08376c228..e6f2517d0 100644 --- a/src/geany.h +++ b/src/geany.h @@ -41,7 +41,7 @@ G_BEGIN_DECLS * listed in the documentation should not be changed */ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_TEMPLATES_SUBDIR "templates" -#define GEANY_CODENAME "Veed" +#define GEANY_CODENAME "Rosset" #define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_WIKI "http://wiki.geany.org/" #define GEANY_BUG_REPORT "http://www.geany.org/Support/Bugs" diff --git a/win32-config.h b/win32-config.h index c3d71938c..c406a7d65 100644 --- a/win32-config.h +++ b/win32-config.h @@ -311,7 +311,7 @@ /* #undef volatile */ /* Version number of package */ -#define VERSION "1.25" +#define VERSION "1.26" #define REVISION "-1" diff --git a/wscript b/wscript index d66b2b064..b66af4273 100644 --- a/wscript +++ b/wscript @@ -52,7 +52,7 @@ from waflib.Tools.compiler_cxx import cxx_compiler APPNAME = 'geany' -VERSION = '1.25' +VERSION = '1.26' LINGUAS_FILE = os.path.join('po', 'LINGUAS') MINIMUM_GTK_VERSION = '2.24.0' MINIMUM_GTK3_VERSION = '3.0.0' -- 2.11.4.GIT