From fbfd609665aa94813edfffa73e1f45b0e762b2a6 Mon Sep 17 00:00:00 2001
From: Bill Kendrick <nbs@sonic.net>
Date: Tue, 14 Jun 2022 00:15:58 -0700
Subject: [PATCH] Bumping version to 0.9.29; doc'ing recent additions

Some things snuck in to 0.9.28 binary builds, or were added
recently; making sure they're doc'd in CHANGES.txt
---
 Makefile           |  4 ++--
 docs/CHANGES.txt   | 29 +++++++++++++++++++++++++++++
 macos/Info.plist   |  6 +++---
 tuxpaint.spec      |  5 ++++-
 win32/resources.rc |  8 ++++----
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 4b615105c..0a1fa8b25 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,12 @@
 # Various contributors (see AUTHORS.txt)
 # http://www.tuxpaint.org/
 
-# June 14, 2002 - June 4, 2022
+# June 14, 2002 - June 14, 2022
 
 
 # The version number, for release:
 
-VER_VERSION:=0.9.28
+VER_VERSION:=0.9.29
 VER_FLAVOR:="-sdl1"
 ifdef SOURCE_DATE_EPOCH
   VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index d949bb3b3..de6e9f631 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -7,6 +7,35 @@ Various contributors (see below, and AUTHORS.txt)
 http://www.tuxpaint.org/
 
 
+2022.June.14 (0.9.29)
+  * Other Improvements:
+    -------------------
+    * Automatic button size option ("buttonsize=auto"), to scale button
+      size reasonably based on window size / fullscreen resolution.
+      (For https://sourceforge.net/p/tuxpaint/feature-requests/218/)
+      Pere Pujal i Carabantes <perepujal@gmail.com>
+
+    * Using SDL linear scaling hint to reduce jaggedness when displaying
+      in full screen at a different resolution than the display's
+      native size.  (SDL2.0)
+      TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
+
+  * Ports & Building:
+    -----------------
+    * Change name of Tux Paint config. files from ".conf" to ".cfg"
+      on Windows.
+      TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
+
+  * Documentation updates:
+    ---------------------
+    * Update macOS build instructions for SDL2.0.
+      Mark Kim <markuskimius@gmail.com>
+
+  * Localization Updates:
+    ---------------------
+    * Catalan translation
+      Pere Pujal i Carabantes <perepujal@gmail.com>
+
 2022.June.4 (0.9.28)
   * Improvements to "Paint" and "Lines" tools:
     ------------------------------------------
diff --git a/macos/Info.plist b/macos/Info.plist
index 3c46cffa8..580c3354b 100644
--- a/macos/Info.plist
+++ b/macos/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>tuxpaint</string>
 	<key>CFBundleGetInfoString</key>
-	<string>0.9.28, Copyright 2002-2022, Tux Paint Development Team</string>
+	<string>0.9.29, Copyright 2002-2022, Tux Paint Development Team</string>
 	<key>CFBundleIconFile</key>
 	<string>tuxpaint.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,10 +19,10 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.28</string>
+	<string>0.9.29</string>
 	<key>CFBundleSignature</key>
 	<string>TXPT</string>
 	<key>CFBundleVersion</key>
-	<string>2022-06-04</string>
+	<string>2022-06-14</string>
 </dict>
 </plist>
diff --git a/tuxpaint.spec b/tuxpaint.spec
index 6b98e8fe5..d7c042a48 100644
--- a/tuxpaint.spec
+++ b/tuxpaint.spec
@@ -1,6 +1,6 @@
 Summary: A drawing program for young children
 Name: tuxpaint
-Version: 0.9.28
+Version: 0.9.29
 Release: 1
 License: GPL
 Group: Multimedia/Graphics
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/tp-magic-config.*
 
 %changelog
+* Tue Jun 14 2022 <nbs@sonic.net> -
+- Set version number 0.9.29
+
 * Wed Dec 01 2021 <nbs@sonic.net> -
 - Set version number 0.9.28
 
diff --git a/win32/resources.rc b/win32/resources.rc
index 492053a5f..10214a102 100644
--- a/win32/resources.rc
+++ b/win32/resources.rc
@@ -26,8 +26,8 @@ IDI_ICON1               ICON    DISCARDABLE     "data/images/icon-win32.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,28,0
- PRODUCTVERSION 0,9,28,0
+ FILEVERSION 0,9,29,0
+ PRODUCTVERSION 0,9,29,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -45,14 +45,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "New Breed Software\0"
             VALUE "FileDescription", "Tux Paint - Interactive Paint Program.\0"
-            VALUE "FileVersion", "0.9.28\0"
+            VALUE "FileVersion", "0.9.29\0"
             VALUE "InternalName", "Tux Paint\0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2022 by Bill Kendrick, et al\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "TuxPaint.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Tux Paint\0"
-            VALUE "ProductVersion", "0.9.28\0"
+            VALUE "ProductVersion", "0.9.29\0"
             VALUE "SpecialBuild", "win32 build by TOYAMA Shin-ichi\0"
         END
     END