From bcc233b542cdb5140399fae07eb7af6e360d32f4 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sun, 27 Dec 2020 17:45:13 -0800 Subject: [PATCH] Bump ver to 0.9.26; Expanded release steps Expanded the steps for making and posting releases (docs/RELEASE.txt). Bumped version to 0.9.26. --- Makefile | 4 +- docs/CHANGES.txt | 5 ++ docs/RELEASE.txt | 64 ++++++++++++++++++++++--- docs/en/ADVANCED-STAMPS-HOWTO.txt | 2 +- docs/en/EXTENDING.txt | 2 +- docs/en/FAQ.txt | 2 +- docs/en/OPTIONS.txt | 2 +- docs/en/README.txt | 2 +- docs/en/html/ADVANCED-STAMPS-HOWTO.html | 2 +- docs/en/html/EXTENDING.html | 2 +- docs/en/html/FAQ.html | 2 +- docs/en/html/OPTIONS.html | 2 +- docs/en/html/README.html | 2 +- macos/Info.plist | 4 +- src/manpage/tuxpaint.1 | 2 +- tuxpaint.spec | 5 +- win32/resources.rc | 8 ++-- 17 files changed, 86 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 484f0d3e2..1acc993d6 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,12 @@ # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - October 15, 2020 +# June 14, 2002 - December 27, 2020 # The version number, for release: -VER_VERSION:=0.9.25 +VER_VERSION:=0.9.26 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") else diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 6edf0a39a..3b8181e18 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,6 +8,11 @@ http://www.tuxpaint.org/ $Id$ +2020.December.27 (0.9.26) + * Documentation updates + --------------------- + * Expanded the steps for making and posting releases. + 2020.December.27 (0.9.25) * New Features ------------ diff --git a/docs/RELEASE.txt b/docs/RELEASE.txt index 0088fa727..a9b219d5d 100644 --- a/docs/RELEASE.txt +++ b/docs/RELEASE.txt @@ -1,5 +1,8 @@ Release checklist for Tux Paint -Last updated 2020-07-27 -bjk +Last updated 2020-12-27 -bjk + +Preparing +--------- Do these things _prior_ to cutting a release -- that is, prior to tagging in the source code repository, running "make release" to roll @@ -10,29 +13,28 @@ a .tar.gz source tarball, and making the tarball available for download. Places to make sure version # and release date gets updated, * Makefile - + * Build description files: * tuxpaint.spec (Linux RPM package) * macos/Info.plist (macOS build) * win32/resources.rc (Windows mingw/msys build) - + * Documentation (For HTML variants, be sure to run "make" in "docs/", to produce plaintext alternatives!) - + * docs/CHANGES.txt * docs/en/html/README.html * docs/en/html/FAQ.html * docs/en/html/OPTIONS.html * docs/en/html/EXTENDING.html * docs/en/html/ADVANCED-STAMPS-HOWTO.html - + * Manual page (manpage) * src/manpage/tuxpaint.1 * Tidy the HTML documentation - Using (Be sure to run "make" in "docs/", to produce plaintext alternatives!) tidy -i --markup yes --vertical-space yes --indent yes --indent-attributes yes INFILE.html > OUTFILE.html @@ -43,3 +45,53 @@ a .tar.gz source tarball, and making the tarball available for download. * Don't forget to commit the changes! (git add ... / git commit / git push) + +Time to release: +---------------- + + * Tag & roll a release tarball (example here was from 0.9.25): + + $ git pull + $ make clean + $ git tag tuxpaint-0_9_25-2020-12-27 + $ git push origin tuxpaint-0_9_25-2020-12-27 # or --tags + $ make release + + * Upload each project's ".tar.gz" file from their "build/" subdirs + to ftp.tuxpaint.org. + + * Place them in the appropriate subdirectories (source/, config/, + and stamps/) under "unix/x/tuxpaint/". + + * Copy "docs/CHANGES.txt" from each project onto the FTP site + (Tux Paint's goes in the toplevel, the others go in config/ and + stamps/). + + * Create a new PAD file (e.g. `pads/tuxpaint-0.9.25.xml`) on the + FTP site. + + * Replace the "pads/tuxpaint-LATEST.xml" symlink on the FTP site with + a new one that points to the new PAD file. + + * At SourceForge, go to "Files" and use "Add Folder" under each project + to create new release file subdirectories. (e.g., "0.9.25" under + https://sourceforge.net/projects/tuxpaint/files/tuxpaint/) + + * Upload the files! Either from local copies, via a web browser, + or by SCP, Rsync, or SFTP (see + https://sourceforge.net/p/forge/documentation/Release%20Files%20for%20Download/#scp) + + e.g.: + + $ sftp wkendrick@frs.sourceforge.net + sftp> cd /home/frs/project/tuxpaint/ + + sftp> cd tuxpaint/0.9.25/ + sftp> lcd source + sftp> put tuxpaint-0.9.25.tar.gz + + sftp> cd ../.. + sftp> lcd .. + + [repeat for tuxpaint-config and tuxpaint-stamps] + diff --git a/docs/en/ADVANCED-STAMPS-HOWTO.txt b/docs/en/ADVANCED-STAMPS-HOWTO.txt index 0d067ddf1..d7ae8a4a2 100644 --- a/docs/en/ADVANCED-STAMPS-HOWTO.txt +++ b/docs/en/ADVANCED-STAMPS-HOWTO.txt @@ -1,5 +1,5 @@ Tux Paint - version 0.9.25 + version 0.9.26 Advanced Stamps HOWTO Copyright 2006-2008 by Albert Cahalan for the Tux Paint project diff --git a/docs/en/EXTENDING.txt b/docs/en/EXTENDING.txt index 9db42a882..80a4973e8 100644 --- a/docs/en/EXTENDING.txt +++ b/docs/en/EXTENDING.txt @@ -1,6 +1,6 @@ Extending Tux Paint - version 0.9.25 + version 0.9.26 Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt http://www.tuxpaint.org/ diff --git a/docs/en/FAQ.txt b/docs/en/FAQ.txt index 6b60da779..0fb75eabf 100644 --- a/docs/en/FAQ.txt +++ b/docs/en/FAQ.txt @@ -1,5 +1,5 @@ Tux Paint - version 0.9.25 + version 0.9.26 Frequently Asked Questions Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt index 008c28fbb..59607cdcb 100644 --- a/docs/en/OPTIONS.txt +++ b/docs/en/OPTIONS.txt @@ -1,5 +1,5 @@ Tux Paint - version 0.9.25 + version 0.9.26 Options Documentation diff --git a/docs/en/README.txt b/docs/en/README.txt index 1af9ea1c6..d58480b04 100644 --- a/docs/en/README.txt +++ b/docs/en/README.txt @@ -1,5 +1,5 @@ Tux Paint - version 0.9.25 + version 0.9.26 A simple drawing program for children diff --git a/docs/en/html/ADVANCED-STAMPS-HOWTO.html b/docs/en/html/ADVANCED-STAMPS-HOWTO.html index 7a1c13b68..28475367e 100644 --- a/docs/en/html/ADVANCED-STAMPS-HOWTO.html +++ b/docs/en/html/ADVANCED-STAMPS-HOWTO.html @@ -20,7 +20,7 @@ width="205" height="210" alt="Tux Paint">
- version 0.9.25
+ version 0.9.26
Advanced Stamps HOWTO diff --git a/docs/en/html/EXTENDING.html b/docs/en/html/EXTENDING.html index b0fd6b80e..5472ce7ad 100644 --- a/docs/en/html/EXTENDING.html +++ b/docs/en/html/EXTENDING.html @@ -21,7 +21,7 @@ width="205" height="210" alt="Tux Paint">
- version 0.9.25 + version 0.9.26

diff --git a/docs/en/html/FAQ.html b/docs/en/html/FAQ.html index 942086857..75dde1bae 100644 --- a/docs/en/html/FAQ.html +++ b/docs/en/html/FAQ.html @@ -20,7 +20,7 @@ width="205" height="210" alt="Tux Paint">
- version 0.9.25
+ version 0.9.26
Frequently Asked Questions diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html index b94c98806..f5b149334 100644 --- a/docs/en/html/OPTIONS.html +++ b/docs/en/html/OPTIONS.html @@ -17,7 +17,7 @@

Tux Paint
- version 0.9.25 + version 0.9.26

diff --git a/docs/en/html/README.html b/docs/en/html/README.html index 18f0c9a13..b77c35f14 100644 --- a/docs/en/html/README.html +++ b/docs/en/html/README.html @@ -20,7 +20,7 @@ width="205" height="210" alt="Tux Paint">
- version 0.9.25 + version 0.9.26

diff --git a/macos/Info.plist b/macos/Info.plist index c2b6180b5..9d8e03fc6 100644 --- a/macos/Info.plist +++ b/macos/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable tuxpaint CFBundleGetInfoString - 0.9.25, Copyright 2009-2020, Tux Paint Development Team + 0.9.26, Copyright 2009-2020, Tux Paint Development Team CFBundleIconFile tuxpaint.icns CFBundleIdentifier @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.25 + 0.9.26 CFBundleSignature TXPT CFBundleVersion diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index 786187ddf..ff300f787 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -1,5 +1,5 @@ .\" tuxpaint.1 - 2020.12.27 -.TH TUXPAINT 1 "27 December 2020" "0.9.25" "Tux Paint" +.TH TUXPAINT 1 "27 December 2020" "0.9.26" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. diff --git a/tuxpaint.spec b/tuxpaint.spec index 56ce4e4fa..050b30be1 100644 --- a/tuxpaint.spec +++ b/tuxpaint.spec @@ -1,6 +1,6 @@ Summary: A drawing program for young children Name: tuxpaint -Version: 0.9.25 +Version: 0.9.26 Release: 1 License: GPL Group: Multimedia/Graphics @@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/tp-magic-config.* %changelog +* Sun Dec 27 2020 - +- Set version number 0.9.26 + * Mon Jun 22 2020 - - Set version number 0.9.25 diff --git a/win32/resources.rc b/win32/resources.rc index 998439bc3..c4e0a0252 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,25,0 - PRODUCTVERSION 0,9,25,0 + FILEVERSION 0,9,26,0 + PRODUCTVERSION 0,9,26,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.25\0" + VALUE "FileVersion", "0.9.26\0" VALUE "InternalName", "Tux Paint\0" VALUE "LegalCopyright", "Copyright (C) 2008-2020 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.25\0" + VALUE "ProductVersion", "0.9.26\0" VALUE "SpecialBuild", "win32 build by TOYAMA Shin-ichi\0" END END