release 2.1.12.1.1

4 files changed, 68 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5580f5..279d51b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.9)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-set(PROJECT_VERSION "2.1.0")
+set(PROJECT_VERSION "2.1.1")
 set(PACKAGE ${CMAKE_PROJECT_NAME})
 
 option (enable_tests "Build the package's automatic tests." ON)
diff --git a/ChangeLog b/ChangeLog
index 6ac91eb..7f0df80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,56 @@
-2020-08-17 22:31:34 +0200 Mike Gabriel
+2020-09-10 21:35:22 +0200 Mike Gabriel
 
-	* release 2.1.0 (HEAD -> master, tag: 2.1.0)
+	* release 2.1.1 (HEAD -> master, tag: 2.1.1)
+
+2020-09-07 19:07:31 +0000 Tundzhay Mollov (c41b3b6)
+
+	* Translated using Weblate (Bulgarian)
+
+2020-09-06 06:37:04 +0000 Baka Gaijin (6e03179)
+
+	* Translated using Weblate (Japanese)
+
+2020-09-05 22:23:52 +0200 Robert Tari (30d1a7d)
+
+	* Merge branch 'sunweaver-pr/break-ubuntu-indicator' into master
+          Attributes GH PR
+          #16:https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/16
+
+2020-09-04 10:59:59 +0000 antuketot76 (d0d8857)
+
+	* Translated using Weblate (Malay)
+
+2020-09-04 10:59:59 +0000 antuketot76 (5bb3145)
+
+	* Translated using Weblate (Malay)
+
+2020-09-05 12:53:07 +0200 Mike Gabriel (859c780)
+
+	* debian/control: Add B:/R: indicator-power.
+
+2020-09-04 21:24:20 +0200 Mike Gabriel (2820cb8)
+
+	* Merge branch 'tari01-pr/power-settings-crash'
+
+2020-09-03 19:24:58 +0200 Robert Tari (d6a07da)
+
+	* Do not call the power settings handler if the command is unknown
+
+2020-09-04 21:17:12 +0200 Mike Gabriel (527bbe4)
+
+	* Merge branch 'tari01-pr/deprecations-warnings'
+
+2020-09-03 18:43:57 +0200 Robert Tari (147130a)
+
+	* Fix deprecations and build warnings.
+
+2020-09-03 18:40:39 +0200 Robert Tari (2849569)
+
+	* Whitespace fix
+
+2020-08-17 22:31:34 +0200 Mike Gabriel (ca5a779)
+
+	* release 2.1.0 (tag: 2.1.0)
 
 2020-08-11 20:23:11 +0200 Mike Gabriel (592a667)
 
diff --git a/NEWS b/NEWS
index cf04562..aa056db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 Overview of changes in ayatana-indicator-power 2.1.0
 
+  - Do not call the power settings handler if the command is unknown.
+    Fixes crash after zenity dialog call.
+  - Fix deprecations and other build warnings.
+  - DEB packaging: Break: and Replace: indicator-power.
+  - Translation updates.
+
+Overview of changes in ayatana-indicator-power 2.1.0
+
   - Rename 'x-canonical-type' attribute to 'x-ayatana-type'
     (and others) to allow using system indicators from
     Ayatana Indicators on Ubuntu.
diff --git a/debian/changelog b/debian/changelog
index 9af0e3f..8ec02e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ayatana-indicator-power (2.1.1-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-power.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 10 Sep 2020 21:30:52 +0200
+
 ayatana-indicator-power (2.1.0-1) unstable; urgency=medium
 
   * Upstream-provided Debian package for ayatana-indicator-power.