From 15e06b197aad2faa66b5081d74bb96c60a5c329a Mon Sep 17 00:00:00 2001 From: Thomas Jensen Date: Sun, 31 Dec 2023 14:23:40 +0100 Subject: [PATCH] Cherry-pick the v2.2.1 version declarations from the release_2.2.1 branch to master --- Makefile | 2 +- boxes-pkg.openwrt | 4 ++-- boxes.portable.nuspec | 10 +++++----- doc/boxes.1.in | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 657546c..c92b97a 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # The following line (GLOBALCONF) is the only line you should need to edit! GLOBALCONF = /usr/share/boxes GIT_STATUS = $(shell git describe --dirty --always 2>/dev/null || echo "n/a") -BVERSION = 2.2.0 +BVERSION = 2.2.1 ALL_FILES = LICENSE README.md boxes-config DOC_FILES = doc/boxes.1 doc/boxes.el diff --git a/boxes-pkg.openwrt b/boxes-pkg.openwrt index 6054c19..dbf9a2b 100644 --- a/boxes-pkg.openwrt +++ b/boxes-pkg.openwrt @@ -29,12 +29,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=boxes -PKG_VERSION:=2.2.0 +PKG_VERSION:=2.2.1 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(PKG_NAME)-$(PKG_VERSION).$(PKG_RELEASE) -PKG_SOURCE:=v2.2.0.tar.gz +PKG_SOURCE:=v2.2.1.tar.gz PKG_SOURCE_URL:=https://github.com/ascii-boxes/boxes/archive/refs/tags/ include $(INCLUDE_DIR)/package.mk diff --git a/boxes.portable.nuspec b/boxes.portable.nuspec index 2360dc6..0cc1cce 100644 --- a/boxes.portable.nuspec +++ b/boxes.portable.nuspec @@ -3,12 +3,12 @@ boxes.portable boxes (Portable) - 2.2.0 + 2.2.1 Thomas Jensen and the boxes contributors Command Line ASCII Boxes Unlimited! @@ -65,10 +65,10 @@ Details on where boxes looks for configuration files can be found ascii ascii-art box boxes command-line cli https://boxes.thomasjensen.com/images/boxes-sq-256.png - https://raw.githubusercontent.com/ascii-boxes/boxes/v2.2.0/LICENSE + https://raw.githubusercontent.com/ascii-boxes/boxes/v2.2.1/LICENSE en false - https://boxes.thomasjensen.com/2022/09/boxes-v2.2.0-released.html + https://boxes.thomasjensen.com/2023/08/boxes-v2.2.1-released.html https://github.com/ascii-boxes/boxes https://github.com/ascii-boxes/boxes/blob/master/boxes.portable.nuspec https://boxes.thomasjensen.com/ diff --git a/doc/boxes.1.in b/doc/boxes.1.in index 433e280..c4bff94 100644 --- a/doc/boxes.1.in +++ b/doc/boxes.1.in @@ -1,6 +1,6 @@ -.\" @(#)boxes.1 2.2.0 09/20/2022 +.\" @(#)boxes.1 2.2.1 08/24/2023 .\" -.TH boxes 1 "June 14 2021" +.TH boxes 1 "August 24 2023" .UC 4 .SH NAME boxes \- text mode box and comment drawing filter