From 24f2363fb702ac5e8b87fc16b5b30d761abd4fb9 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sun, 13 Apr 2014 19:33:23 +0200
Subject: [PATCH] Post release version bump

Say hello to Geany 1.25 "Veed"!
---
 NEWS               | 3 +++
 configure.ac       | 2 +-
 doc/geany.txt      | 2 +-
 geany.exe.manifest | 2 +-
 geany.nsi          | 4 ++--
 geany_private.rc   | 4 ++--
 src/geany.h        | 2 +-
 win32-config.h     | 2 +-
 wscript            | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index a45479fa0..66ab721df 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Geany 1.25 (unreleased)
+
+
 Geany 1.24 (April 13, 2014)
 
     General
diff --git a/configure.ac b/configure.ac
index aea10060e..7e07a0b55 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.24],
+AC_INIT([Geany], [1.25],
 		[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 2a36c6d2f..cdd17cf88 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -1,4 +1,4 @@
-.. |(version)| replace:: 1.24
+.. |(version)| replace:: 1.25
 .. -*- reStructuredText -*-
 
 =======
diff --git a/geany.exe.manifest b/geany.exe.manifest
index ee8b0d232..dd7602497 100644
--- a/geany.exe.manifest
+++ b/geany.exe.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 	<assemblyIdentity
-		version="1.24.0.0"
+		version="1.25.0.0"
 		processorArchitecture="X86"
 		name="Geany"
 		type="win32" />
diff --git a/geany.nsi b/geany.nsi
index 992e39aed..f16323207 100644
--- a/geany.nsi
+++ b/geany.nsi
@@ -32,8 +32,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
 ; helper defines  ;
 ;;;;;;;;;;;;;;;;;;;
 !define PRODUCT_NAME "Geany"
-!define PRODUCT_VERSION "1.24"
-!define PRODUCT_VERSION_ID "1.24.0.0"
+!define PRODUCT_VERSION "1.25"
+!define PRODUCT_VERSION_ID "1.25.0.0"
 !define PRODUCT_PUBLISHER "The Geany developer team"
 !define PRODUCT_WEB_SITE "http://www.geany.org/"
 !define PRODUCT_DIR_REGKEY "Software\Geany"
diff --git a/geany_private.rc b/geany_private.rc
index 4e1c198a1..2a1eb953c 100644
--- a/geany_private.rc
+++ b/geany_private.rc
@@ -1,8 +1,8 @@
 
 #include <windows.h> // include for version info constants
 
-#define VER_FILEVERSION             1,24,0,0
-#define VER_FILEVERSION_STR         "1.24"
+#define VER_FILEVERSION             1,25,0,0
+#define VER_FILEVERSION_STR         "1.25"
 #define APP_MANIFEST                1
 
 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico"
diff --git a/src/geany.h b/src/geany.h
index 5a416fa76..55913bf0a 100644
--- a/src/geany.h
+++ b/src/geany.h
@@ -47,7 +47,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					"Sakai"
+#define GEANY_CODENAME					"Veed"
 #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 9edb4e7ce..68f2cb3b7 100644
--- a/win32-config.h
+++ b/win32-config.h
@@ -311,7 +311,7 @@
 /* #undef volatile */
 
 /* Version number of package */
-#define VERSION "1.24"
+#define VERSION "1.25"
 
 #define REVISION "-1"
 
diff --git a/wscript b/wscript
index 410280f35..33daef4cb 100644
--- a/wscript
+++ b/wscript
@@ -51,7 +51,7 @@ from waflib.Tools.compiler_cxx import cxx_compiler
 
 
 APPNAME = 'geany'
-VERSION = '1.24'
+VERSION = '1.25'
 LINGUAS_FILE = 'po/LINGUAS'
 MINIMUM_GTK_VERSION = '2.16.0'
 MINIMUM_GTK3_VERSION = '3.0.0'