Run of fresh-releases for cbonsai

Merge these changes:

git pull https://janitor.debian.net/git/cbonsai fresh-releases/main
git pull https://janitor.debian.net/git/cbonsai fresh-releases/pristine-tar
git pull https://janitor.debian.net/git/cbonsai fresh-releases/upstream

Summary

Merged new upstream version: 1.3.1+ds (was: 1.2.1).

Diff

Branch: main

diff --git a/.gitignore b/.gitignore
index 11dcf01..4d77206 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cbonsai
+cbonsai.1
diff --git a/Makefile b/Makefile
index e88b09e..1d59e0d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,25 @@ PKG_CONFIG	?= pkg-config
 CFLAGS	+= -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -pedantic $(shell $(PKG_CONFIG) --cflags ncursesw panelw)
 LDLIBS	= $(shell $(PKG_CONFIG) --libs ncursesw panelw || echo "-lncursesw -ltinfo -lpanelw")
 PREFIX	= /usr/local
+MANDIR	= $(PREFIX)/share/man
 
 cbonsai: cbonsai.c
 
-install: cbonsai
+cbonsai.1: cbonsai.scd
+	scdoc <$< >$@
+
+install: cbonsai cbonsai.1
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	install -m 0755 cbonsai $(DESTDIR)$(PREFIX)/bin/cbonsai
+	install -m 0644 cbonsai.1 $(DESTDIR)$(MANDIR)/man1/cbonsai.1
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/cbonsai
+	rm -f $(DESTDIR)$(MANDIR)/man1/cbonsai.1
 
 clean:
 	rm -f cbonsai
+	rm -f cbonsai.1
 
 .PHONY: install uninstall clean
diff --git a/README.md b/README.md
index 0636277..06699d1 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,22 @@
     <img src="https://repology.org/badge/vertical-allrepos/cbonsai.svg" alt="Packaging status" align="right">
 </a>
 
-### Arch Linux (AUR)
+`cbonsai` is available in multiple repositories. Check the repology chart to the right to see if `cbonsai` is packaged for your system. A big thank you to all the people who packaged `cbonsai`!
 
-Nicholas Boyd Isacsson has kindly packaged `cbonsai` in the [AUR](https://aur.archlinux.org/packages/cbonsai/).
+If no package exists for your system/distribution, you'll have to use the [manual](https://gitlab.com/jallbrit/cbonsai#manual) install instructions. Below are some more specific instructions for some distributions.
 
 ### Debian-based
 
-Robin Gustafsson has kindly packaged `cbonsai` as a `.deb` file over in [this repository](https://gitlab.com/rgson/debian_cbonsai/-/packages).
+`cbonsai` is only available in the Debian Unstable repository. However, if you're not on unstable, Robin Gustafsson has kindly packaged `cbonsai` as a `.deb` file over in [this repository](https://gitlab.com/rgson/debian_cbonsai/-/packages).
+
+### Fedora
+
+Mohammad Kefah has kindly packaged `cbonsai` in the [Fedora copr](https://copr.fedorainfracloud.org/), which is "similar to what the AUR is to Arch". On Fedora, it can be installed like so:
+
+```bash
+sudo dnf copr enable keefle/cbonsai
+sudo dnf install cbonsai
+```
 
 ### MacOS
 
@@ -38,6 +47,17 @@ For pkg-config to find ncurses you may need to set:
 
 You may need to follow these instructions before running `make install`.
 
+If you are having trouble installing on MacOS, try reading [this issue](https://gitlab.com/jallbrit/cbonsai/-/issues/10).
+
+#### MacPorts
+
+On macOS, you may also install `cbonsai` using [MacPorts](https://www.macports.org). Simply install MacPorts, then issue the following commands:
+
+```bash
+sudo port selfupdate
+sudo port install cbonsai
+```
+
 ### Manual
 
 You'll need to have a working `ncursesw` library. If you're on a `Debian`-based system, you can install `ncursesw` like so:
@@ -141,4 +161,4 @@ The algorithm is tweaked to look best at the default size, so larger sized trees
 
 ## Inspiration
 
-This project wouldn't be here if it weren't for its *roots*! `cbonsai` is a newer version of  [bonsai.sh](https://gitlab.com/jallbrit/bonsai.sh), which was written in `bash` and was itself a port of [this bonsai tree generator](https://avelican.github.io/bonsai/) written in `javascript`.
+This project wouldn't be here if it weren't for its *roots*! `cbonsai` is a newer version of [bonsai.sh](https://gitlab.com/jallbrit/bonsai.sh), which was written in `bash` and was itself a port of [this bonsai tree generator](https://avelican.github.io/bonsai/) written in `javascript`.
diff --git a/cbonsai.scd b/cbonsai.scd
new file mode 100644
index 0000000..a1e47ff
--- /dev/null
+++ b/cbonsai.scd
@@ -0,0 +1,69 @@
+cbonsai(1)
+
+# NAME
+
+cbonsai - grow bonsai trees in your terminal
+
+# SYNOPSIS
+
+cbonsai [OPTION]...
+
+# DESCRIPTION
+
+cbonsai is a beautifully random bonsai tree generator.
+
+# OPTIONS
+
+*-l*, *--live*
+	live mode: show each step of growth
+
+*-t*, *--time*=_TIME_
+	in live mode, wait TIME secs between steps of growth (must be larger than 0) [default: 0.03]
+
+*-i*, *--infinite*
+	infinite mode: keep growing trees
+
+*-w*, *--wait*=_TIME_
+	in infinite mode, wait TIME between each tree generation [default: 4.00]
+
+*-S*, *--screensaver*
+	screensaver mode; equivalent to -liWC and quit on any keypress
+
+*-m*, *--message*=_STR_
+	attach message next to the tree
+
+*-b*, *--base*=_INT_
+	ascii-art plant base to use, 0 is none
+
+*-c*, *--leaf*=_LIST_
+	list of comma-delimited strings randomly chosen for leaves
+
+*-M*, *--multiplier*=_INT_
+	branch multiplier; higher -> more branching (0-20) [default: 5]
+
+*-L*, *--life*=_INT_
+	life; higher -> more growth (0-200) [default: 32]
+
+*-p*, *--print*
+	print tree to terminal when finished
+
+*-s*, *--seed*=_INT_
+	seed random number generator
+
+*-W*, *--save*=_FILE_
+	save progress to file [default: ~/.cache/cbonsai]
+
+*-C*, *--load*=_FILE_
+	load progress from file [default: ~/.cache/cbonsai]
+
+*-v*, *--verbose*
+	increase output verbosity
+
+*-h*, *--help*
+	show help
+
+# AUTHORS
+
+Maintained by John Allbritten <me@johnallbritten.com>, who is assisted by other
+open source contributors. For more information about cbonsai development, see
+<https://gitlab.com/jallbrit/cbonsai>.
diff --git a/debian/changelog b/debian/changelog
index 6483d5a..b18dc74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cbonsai (1.3.1+ds-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 03 Sep 2022 22:45:56 -0000
+
 cbonsai (1.2.1-1) unstable; urgency=medium
 
   [ Helmut Grohne ]

Branch: pristine-tar

diff --git a/cbonsai_1.3.1+ds.orig.tar.xz.delta b/cbonsai_1.3.1+ds.orig.tar.xz.delta
new file mode 100644
index 0000000..e1b7471
Binary files /dev/null and b/cbonsai_1.3.1+ds.orig.tar.xz.delta differ
diff --git a/cbonsai_1.3.1+ds.orig.tar.xz.id b/cbonsai_1.3.1+ds.orig.tar.xz.id
new file mode 100644
index 0000000..2553bff
--- /dev/null
+++ b/cbonsai_1.3.1+ds.orig.tar.xz.id
@@ -0,0 +1 @@
+33531e393e68ba33463f3c15a1ac8f02e45b6c62

Branch: upstream

Tag: upstream/1.3.1+ds
diff --git a/.gitignore b/.gitignore
index 11dcf01..4d77206 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cbonsai
+cbonsai.1
diff --git a/Makefile b/Makefile
index e88b09e..1d59e0d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,25 @@ PKG_CONFIG	?= pkg-config
 CFLAGS	+= -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -pedantic $(shell $(PKG_CONFIG) --cflags ncursesw panelw)
 LDLIBS	= $(shell $(PKG_CONFIG) --libs ncursesw panelw || echo "-lncursesw -ltinfo -lpanelw")
 PREFIX	= /usr/local
+MANDIR	= $(PREFIX)/share/man
 
 cbonsai: cbonsai.c
 
-install: cbonsai
+cbonsai.1: cbonsai.scd
+	scdoc <$< >$@
+
+install: cbonsai cbonsai.1
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	install -m 0755 cbonsai $(DESTDIR)$(PREFIX)/bin/cbonsai
+	install -m 0644 cbonsai.1 $(DESTDIR)$(MANDIR)/man1/cbonsai.1
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/cbonsai
+	rm -f $(DESTDIR)$(MANDIR)/man1/cbonsai.1
 
 clean:
 	rm -f cbonsai
+	rm -f cbonsai.1
 
 .PHONY: install uninstall clean
diff --git a/README.md b/README.md
index 0636277..06699d1 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,22 @@
     <img src="https://repology.org/badge/vertical-allrepos/cbonsai.svg" alt="Packaging status" align="right">
 </a>
 
-### Arch Linux (AUR)
+`cbonsai` is available in multiple repositories. Check the repology chart to the right to see if `cbonsai` is packaged for your system. A big thank you to all the people who packaged `cbonsai`!
 
-Nicholas Boyd Isacsson has kindly packaged `cbonsai` in the [AUR](https://aur.archlinux.org/packages/cbonsai/).
+If no package exists for your system/distribution, you'll have to use the [manual](https://gitlab.com/jallbrit/cbonsai#manual) install instructions. Below are some more specific instructions for some distributions.
 
 ### Debian-based
 
-Robin Gustafsson has kindly packaged `cbonsai` as a `.deb` file over in [this repository](https://gitlab.com/rgson/debian_cbonsai/-/packages).
+`cbonsai` is only available in the Debian Unstable repository. However, if you're not on unstable, Robin Gustafsson has kindly packaged `cbonsai` as a `.deb` file over in [this repository](https://gitlab.com/rgson/debian_cbonsai/-/packages).
+
+### Fedora
+
+Mohammad Kefah has kindly packaged `cbonsai` in the [Fedora copr](https://copr.fedorainfracloud.org/), which is "similar to what the AUR is to Arch". On Fedora, it can be installed like so:
+
+```bash
+sudo dnf copr enable keefle/cbonsai
+sudo dnf install cbonsai
+```
 
 ### MacOS
 
@@ -38,6 +47,17 @@ For pkg-config to find ncurses you may need to set:
 
 You may need to follow these instructions before running `make install`.
 
+If you are having trouble installing on MacOS, try reading [this issue](https://gitlab.com/jallbrit/cbonsai/-/issues/10).
+
+#### MacPorts
+
+On macOS, you may also install `cbonsai` using [MacPorts](https://www.macports.org). Simply install MacPorts, then issue the following commands:
+
+```bash
+sudo port selfupdate
+sudo port install cbonsai
+```
+
 ### Manual
 
 You'll need to have a working `ncursesw` library. If you're on a `Debian`-based system, you can install `ncursesw` like so:
@@ -141,4 +161,4 @@ The algorithm is tweaked to look best at the default size, so larger sized trees
 
 ## Inspiration
 
-This project wouldn't be here if it weren't for its *roots*! `cbonsai` is a newer version of  [bonsai.sh](https://gitlab.com/jallbrit/bonsai.sh), which was written in `bash` and was itself a port of [this bonsai tree generator](https://avelican.github.io/bonsai/) written in `javascript`.
+This project wouldn't be here if it weren't for its *roots*! `cbonsai` is a newer version of [bonsai.sh](https://gitlab.com/jallbrit/bonsai.sh), which was written in `bash` and was itself a port of [this bonsai tree generator](https://avelican.github.io/bonsai/) written in `javascript`.
diff --git a/cbonsai.scd b/cbonsai.scd
new file mode 100644
index 0000000..a1e47ff
--- /dev/null
+++ b/cbonsai.scd
@@ -0,0 +1,69 @@
+cbonsai(1)
+
+# NAME
+
+cbonsai - grow bonsai trees in your terminal
+
+# SYNOPSIS
+
+cbonsai [OPTION]...
+
+# DESCRIPTION
+
+cbonsai is a beautifully random bonsai tree generator.
+
+# OPTIONS
+
+*-l*, *--live*
+	live mode: show each step of growth
+
+*-t*, *--time*=_TIME_
+	in live mode, wait TIME secs between steps of growth (must be larger than 0) [default: 0.03]
+
+*-i*, *--infinite*
+	infinite mode: keep growing trees
+
+*-w*, *--wait*=_TIME_
+	in infinite mode, wait TIME between each tree generation [default: 4.00]
+
+*-S*, *--screensaver*
+	screensaver mode; equivalent to -liWC and quit on any keypress
+
+*-m*, *--message*=_STR_
+	attach message next to the tree
+
+*-b*, *--base*=_INT_
+	ascii-art plant base to use, 0 is none
+
+*-c*, *--leaf*=_LIST_
+	list of comma-delimited strings randomly chosen for leaves
+
+*-M*, *--multiplier*=_INT_
+	branch multiplier; higher -> more branching (0-20) [default: 5]
+
+*-L*, *--life*=_INT_
+	life; higher -> more growth (0-200) [default: 32]
+
+*-p*, *--print*
+	print tree to terminal when finished
+
+*-s*, *--seed*=_INT_
+	seed random number generator
+
+*-W*, *--save*=_FILE_
+	save progress to file [default: ~/.cache/cbonsai]
+
+*-C*, *--load*=_FILE_
+	load progress from file [default: ~/.cache/cbonsai]
+
+*-v*, *--verbose*
+	increase output verbosity
+
+*-h*, *--help*
+	show help
+
+# AUTHORS
+
+Maintained by John Allbritten <me@johnallbritten.com>, who is assisted by other
+open source contributors. For more information about cbonsai development, see
+<https://gitlab.com/jallbrit/cbonsai>.

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 1257, max open: 300)
  • ☑ change set f56247a4-ca1b-4617-8140-5993b7291378 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases cbonsai-dbgsymapt install -t fresh-releases cbonsai

Lintian Result

Full worker log Full build log