From b86af20f678d8fc5fb4634343002fd5212c1c7c2 Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Mon, 20 Dec 2021 09:10:31 -0500 Subject: [PATCH] release 1.1.1rc2 --- ChangeLog | 1 + ChangeLog.md | 4 +++- docs/_config.yml | 2 +- lib/solaar/__init__.py | 2 +- release.sh | 2 +- setup.py | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) create mode 120000 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 120000 index 00000000..89f45902 --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +ChangeLog.md \ No newline at end of file diff --git a/ChangeLog.md b/ChangeLog.md index 49e1d658..385291e8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,7 @@ -# 1.1.1rc1 +# 1.1.1rc2 +* Display battery percentage estimates from battery voltage +* Add minimal support for Logitech PRO X Wireless Gaming Headset * Push settings when device requests software reconfiguration * Fix read for key/button diversion setting * Add modalias information to Solaar metainfo diff --git a/docs/_config.yml b/docs/_config.yml index 49c8d928..644fa113 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -4,7 +4,7 @@ tagline: Linux Device Manager for Logitech Unifying Receivers and Devices. owner: pwr-Solaar owner_url: https://github.com/pwr-Solaar repository: pwr-Solaar/Solaar -version: 1.1.1rc1 +version: 1.1.1rc2 show_downloads: false encoding: utf-8 theme: jekyll-theme-slate diff --git a/lib/solaar/__init__.py b/lib/solaar/__init__.py index 004a25e6..1e87a97c 100644 --- a/lib/solaar/__init__.py +++ b/lib/solaar/__init__.py @@ -16,5 +16,5 @@ ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -__version__ = '1.1.1rc1' +__version__ = '1.1.1rc2' NAME = 'Solaar' diff --git a/release.sh b/release.sh index f6896901..fa64d7ff 100755 --- a/release.sh +++ b/release.sh @@ -107,7 +107,7 @@ git ls-remote $remote | grep "refs/tags/$version$" >/dev/null [ $? -eq 0 ] && echo -e '\nError: Tag already exists on remote' && exit 1 # Check if version is in the changelog -grep "^$version:" ChangeLog.md >/dev/null +grep '^# '"$version" ChangeLog.md >/dev/null [ $? -ne 0 ] && echo 'Error: Version is not present in the changelog' && exit 1 echo diff --git a/setup.py b/setup.py index 32146788..d8fc4b34 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ except ImportError: from distutils.core import setup # from solaar import NAME, __version__ -__version__ = '1.1.1rc1' +__version__ = '1.1.1rc2' NAME = 'Solaar'