From 611c2751f6d0cf0bc62cb186d2d79948e8c9e4f1 Mon Sep 17 00:00:00 2001
From: Nils Kneuper <crazy-ivanovic@gmx.net>
Date: Sat, 23 Jun 2007 18:21:20 +0000
Subject: [PATCH] bumped version to 1.3.4+svn and changed server ports

---
 changelog         |  2 ++
 config.h.dummy    |  8 ++++----
 configure.ac      |  4 ++--
 data/_main.cfg    |  4 ++--
 players_changelog | 43 ++++++++++++++++++++++++++++++-------------
 src/wesconfig.h   |  2 +-
 6 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/changelog b/changelog
index bf9cb9fe0d4..80ec01c2165 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,5 @@
+Version 1.3.4+svn:
+
 Version 1.3.4:
  * campaigns
    * Two Brothers
diff --git a/config.h.dummy b/config.h.dummy
index 700b69b3f8f..721bb00e1e3 100644
--- a/config.h.dummy
+++ b/config.h.dummy
@@ -9,17 +9,17 @@
 #define PACKAGE_NAME "Battle for Wesnoth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Battle for Wesnoth 1.3.4"
+#define PACKAGE_STRING "Battle for Wesnoth 1.3.4+svn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "wesnoth"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.4"
+#define PACKAGE_VERSION "1.3.4+svn"
 
 /* Version number of package */
-#define VERSION "1.3.4"
+#define VERSION "1.3.4+svn"
 
 /* The default server for this version */
-#define WESNOTH_DEFAULT_SERVER "server.wesnoth.org:15000"
+#define WESNOTH_DEFAULT_SERVER "server.wesnoth.org:14998"
 
diff --git a/configure.ac b/configure.ac
index 9a7a4101267..093026b7eb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,10 @@
 
 AC_PREREQ([2.57])
 
-define([WESNOTH_VERSION],[1.3.4])
+define([WESNOTH_VERSION],[1.3.4+svn])
 
 dnl define([DEFAULT_SERVER],[server.wesnoth.org])
-define([DEFAULT_SERVER],[server.wesnoth.org:15000])
+define([DEFAULT_SERVER],[server.wesnoth.org:14998])
 
 AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, [isaac@warp.es], [wesnoth])
 
diff --git a/data/_main.cfg b/data/_main.cfg
index d998b6a1580..f6322edb161 100644
--- a/data/_main.cfg
+++ b/data/_main.cfg
@@ -37,11 +37,11 @@
 [game_config]
     [server]
         name=_"Official Wesnoth Server"
-        address=server.wesnoth.org:15000
+        address=server.wesnoth.org:14998
     [/server]
     [server]
         name=_"Alternate Wesnoth Server"
-        address=games.tuxfamily.org:15000
+        address=games.tuxfamily.org:14998
     [/server]
 
     base_income=2
diff --git a/players_changelog b/players_changelog
index 8cbadcc5477..a8a93e5c0f9 100644
--- a/players_changelog
+++ b/players_changelog
@@ -2,6 +2,23 @@ This is meant to be a concise list of player-visible changes (very minor
 changes may be omitted). For a complete list of changes, see the main
 changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
 
+Version 1.3.4+svn:
+  * Campaigns
+
+  * Campaigns
+
+  * Language and translations
+      * Updated translations:
+
+  * Map editor
+
+  * User interface
+
+  * Unit changes and balancing
+
+  * Miscellaneous and bugfixes
+
+
 Version 1.3.4:
   * Campaigns
     * Two Brothers
@@ -17,19 +34,19 @@ Version 1.3.4:
         Sovereign and another one into a Slurbow for variety .
       * In "The Lost General", fixed the bug that made the undead leader unable
         to recruit.
-   * The Rise of Wesnoth
-     * The outlaws in the campaign (not elsewhere in the game) can now level up
-       to level 3.
-     * Added 2 extra turns to finish "Temple of the Deep" on all difficulties.
-   * Eastern Invasion
-     * The difficulty of "Northern Outpost" has been reduced by making the
-       villages spawn less outlaws.
-     * Changed the way Owaec joins the protagonist in "Two Paths". Now he keeps
-       all the XP he might get in "Northern Outpost".
-   * Descent into Darkness
-     * The unknown unit type (Royal Swordsman) bug in "Forever and ever, amen",
-       the bug that made the Foolish Heroes all have 30 hitpoints and a broken
-       dialog in the same scenario have all been fixed.
+    * The Rise of Wesnoth
+      * The outlaws in the campaign (not elsewhere in the game) can now level up
+        to level 3.
+      * Added 2 extra turns to finish "Temple of the Deep" on all difficulties.
+    * Eastern Invasion
+      * The difficulty of "Northern Outpost" has been reduced by making the
+        villages spawn less outlaws.
+      * Changed the way Owaec joins the protagonist in "Two Paths". Now he keeps
+        all the XP he might get in "Northern Outpost".
+    * Descent into Darkness
+      * The unknown unit type (Royal Swordsman) bug in "Forever and ever, amen",
+        the bug that made the Foolish Heroes all have 30 hitpoints and a broken
+        dialog in the same scenario have all been fixed.
 
   * Graphics
   	* Changed how the edges of the map are drawn, making small maps display
diff --git a/src/wesconfig.h b/src/wesconfig.h
index d564102ca3a..a3f63f48932 100644
--- a/src/wesconfig.h
+++ b/src/wesconfig.h
@@ -4,7 +4,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #else
-# define VERSION "1.3.4"
+# define VERSION "1.3.4+svn"
 # define PACKAGE "wesnoth"
 # ifndef LOCALEDIR
 #  define LOCALEDIR "translations"