notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2020-12-30 19:57:26 +01:00
commit 2a159dd049
19 changed files with 110 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/CHANGES.txt
View file

@ -8,6 +8,14 @@ http://www.tuxpaint.org/
$Id$
2020.December.27 (0.9.26)
* Documentation updates
---------------------
* Expanded the steps for making and posting releases.
* Mended some broken relative links in README.html that
pointed to other parts of the docs.
2020.December.27 (0.9.25)
* New Features
------------

66
docs/RELEASE.txt
View file

@ -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,55 @@ 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]
* Copy latest release's documentation to the tuxpaint.org website.

2
docs/en/ADVANCED-STAMPS-HOWTO.txt
View file

@ -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

6
docs/en/EXTENDING.txt
View file

@ -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/
@ -123,7 +123,7 @@ Where Files Go
C:\Documents and Settings\(username)\Application Data\TuxPaint\
Mac OS X
macOS
Your personal Tux Paint folder is stored in your "Application
Support" folder:
@ -652,7 +652,7 @@ Translations
msgstr "Haz clic y arrastra para dibujar ladrillos grandes."
A graphical tool, called poEdit (http://www.poedit.net/), is available
for Linux, Windows and Mac OS X.
for Linux, Windows and macOS.
Note: It is best to always work off of the latest Tux Paint text catalog
template ("tuxpaint.pot"), since new text is added, and old text is

4
docs/en/FAQ.txt
View file

@ -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
@ -267,7 +267,7 @@ Saving
e.g., C:\Documents and Settings\Username\Application
Data\TuxPaint\saved
Mac OS X
macOS
In the user's "Application Support" folder:
e.g., /Users/Username/Library/Applicaton
Support/TuxPaint/saved/

6
docs/en/OPTIONS.txt
View file

@ -1,5 +1,5 @@
Tux Paint
version 0.9.25
version 0.9.26
Options Documentation
@ -48,7 +48,7 @@ Linux and Unix Users
--nosysconfig
Mac OS X Users
macOS Users
The file you should create is called "tuxpaint.cfg" and it should be
placed in your home folder, under the sub-folder: Library/Application
@ -179,7 +179,7 @@ Windows Users
the 'Print' button is clicked while the [Alt] modifier key is
being held. (This is typically used for providing a print
dialog, similar to when pressing [Alt]+'Print' in Windows and
Mac OS X.)
macOS.)
If this option is not specifically not set, the default command
is KDE's graphical print dialog:

2
docs/en/README.txt
View file

@ -1,5 +1,5 @@
Tux Paint
version 0.9.25
version 0.9.26
A simple drawing program for children

2
docs/en/html/ADVANCED-STAMPS-HOWTO.html
View file

@ -20,7 +20,7 @@
width="205"
height="210"
alt="Tux&nbsp;Paint"><br>
version 0.9.25<br>
version 0.9.26<br>
Advanced Stamps HOWTO
</h1>

6
docs/en/html/EXTENDING.html
View file

@ -21,7 +21,7 @@
width="205"
height="210"
alt="Tux Paint"><br>
version 0.9.25
version 0.9.26
</h1>
<p>
@ -355,7 +355,7 @@
</blockquote>
<h4>
Mac OS X
macOS
</h4>
<blockquote>
@ -1471,7 +1471,7 @@
<p>
A graphical tool, called <i><b>poEdit</b></i> (<a href=
"http://www.poedit.net/">http://www.poedit.net/</a>), is
available for Linux, Windows and Mac&nbsp;OS&nbsp;X.
available for Linux, Windows and macOS.
</p>
<p>

4
docs/en/html/FAQ.html
View file

@ -20,7 +20,7 @@
width="205"
height="210"
alt="Tux&nbsp;Paint"><br>
version 0.9.25<br>
version 0.9.26<br>
Frequently Asked Questions
</h1>
@ -538,7 +538,7 @@
</dd>
<dt>
Mac OS X
macOS
</dt>
<dd>

6
docs/en/html/OPTIONS.html
View file

@ -17,7 +17,7 @@
<center>
<h1>
Tux&nbsp;Paint<br>
version 0.9.25
version 0.9.26
</h1>
<h2>
@ -115,7 +115,7 @@
</blockquote>
<h2>
Mac&nbsp;OS&nbsp;X Users
macOS Users
</h2>
<blockquote>
@ -389,7 +389,7 @@
the <b>[Alt]</b> modifier key is being held. (This is
typically used for providing a print dialog, similar to
when pressing <b>[Alt]</b>+'Print' in Windows and
Mac&nbsp;OS&nbsp;X.)
macOS.)
</p>
<p>

10
docs/en/html/README.html
View file

@ -20,7 +20,7 @@
width="205"
height="210"
alt="Tux&nbsp;Paint"><br>
version 0.9.25
version 0.9.26
</h1>
<h3>
@ -2093,24 +2093,24 @@
"<code>docs</code>" folder/directory) include:
<ul>
<li>
<a href="../magic-docs/html/">"Magic" Tool Documentation
<a href="../magic-docs/html/index.html">"Magic" Tool Documentation
("magic-docs")</a><br>
Documentation for each of the currently-installed "Magic"
tools.
</li>
<li>
<a href="../AUTHORS.txt">AUTHORS.txt</a><br>
<a href="../../AUTHORS.txt">AUTHORS.txt</a><br>
List of authors and contributors.
</li>
<li>
<a href="../CHANGES.txt">CHANGES.txt</a><br>
<a href="../../CHANGES.txt">CHANGES.txt</a><br>
Summary of changed between releases.
</li>
<li>
<a href="../COPYING.txt">COPYING.txt</a><br>
<a href="../../COPYING.txt">COPYING.txt</a><br>
Copying license (The GNU General Public License).
</li>