From dc26801cd3b84d747dc9e87397621f5793e99804 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 1 Jan 2016 19:49:04 +0100
Subject: release v2.10

---
 CHANGELOG         | 28 ++++++++++++++++++++++++++++
 Makefile          |  2 +-
 man/asciidoc.conf |  2 +-
 man/i3status.man  |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6980197..22088af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,31 @@
+2016-01-01 i3status 2.10
+
+ • man: fix typo in battery example
+ • Pass the "instance" JSON property key for tztime blocks
+ • Fix build (and build warnings) on FreeBSD
+ • Fix build on OpenBSD
+ • path_exists, run_watch: add format_down
+ • volume: add PulseAudio support. This significantly reduces battery
+   consumption on systems that use PulseAudio, which is the default on any
+   modern Linux desktop.
+ • wireless/OpenBSD: use the maximum rssi, not the scaled percentage for the
+   signal level.
+ • make: Add support for differing PREFIX and MANPREFIX.
+ • battery: make output HH:MM across all platforms.
+ • battery: clamp the percentage at 100% when last_full_capacity is enabled.
+ • Use format_not_mounted if the directory for a disk_info block does not
+   exist.
+ • disk_info/OS X: Fix build.
+ • volume/OpenBSD: use SndIO.
+ • eth, wireless: Use "color_degraded" when interface has no IP.
+ • eth, wireless/FreeBSD: Fix for recent FreeBSD versions.
+ • wireless/Linux: switch from libiw to libnl. This allows you to run i3status
+   on kernels which don’t have the wext compatibility module enabled.
+ • battery/FreeBSD: properly detect charging status
+ • eth: first_eth_interface: ignore MAC addresses, look for IPv4/IPv6 addresses
+ • Implement support for Pango markup.
+ • format detection: recognise swaybar
+
 2015-03-22 i3status 2.9
 
  • meta: i3status is now on GitHub and uses clang-format
diff --git a/Makefile b/Makefile
index dca4f71..f0b1e19 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ install:
 release:
 	[ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}
 	mkdir i3status-${VERSION}
-	find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|h\)" -or -name "README" -or -name "Makefile" -or -name "LICENSE" -or -name "CHANGELOG" \) -exec cp '{}' i3status-${VERSION} \;
+	find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|h\)" -or -name "README.md" -or -name "Makefile" -or -name "LICENSE" -or -name "CHANGELOG" \) -exec cp '{}' i3status-${VERSION} \;
 	mkdir i3status-${VERSION}/src
 	mkdir i3status-${VERSION}/man
 	find src -maxdepth 1 -type f \( -regex ".*\.\(c\|h\)" \) -exec cp '{}' i3status-${VERSION}/src \;
diff --git a/man/asciidoc.conf b/man/asciidoc.conf
index 5b467ca..0d23d6f 100644
--- a/man/asciidoc.conf
+++ b/man/asciidoc.conf
@@ -7,7 +7,7 @@ template::[header-declarations]
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
 <refmiscinfo class="source">i3status</refmiscinfo>
-<refmiscinfo class="version">v2.9</refmiscinfo>
+<refmiscinfo class="version">v2.10</refmiscinfo>
 <refmiscinfo class="manual">i3 Manual</refmiscinfo>
 </refmeta>
 <refnamediv>
diff --git a/man/i3status.man b/man/i3status.man
index 0b5b367..836cac5 100644
--- a/man/i3status.man
+++ b/man/i3status.man
@@ -1,7 +1,7 @@
 i3status(1)
 ===========
 Michael Stapelberg <michael@i3wm.org>
-v2.9, March 2015
+v2.10, January 2016
 
 == NAME
 
-- 
cgit v1.2.3