From ca5a779dc20a5d33249a9298eb1ec834e63ecdee Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 17 Aug 2020 22:31:34 +0200
Subject: release 2.1.0

---
 CMakeLists.txt   |  2 +-
 ChangeLog        | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 NEWS             | 10 ++++++++
 debian/changelog |  7 ++++++
 4 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bc10bf..2a18bc0 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.0.95")
+set(PROJECT_VERSION "2.1.0")
 set(PACKAGE ${CMAKE_PROJECT_NAME})
 
 option (enable_tests "Build the package's automatic tests." ON)
diff --git a/ChangeLog b/ChangeLog
index ad8759d..6ac91eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,72 @@
-2020-07-25 13:22:28 +0200 Mike Gabriel
+2020-08-17 22:31:34 +0200 Mike Gabriel
 
-	* release 2.0.95 (HEAD -> master, tag: 2.0.95)
+	* release 2.1.0 (HEAD -> master, tag: 2.1.0)
+
+2020-08-11 20:23:11 +0200 Mike Gabriel (592a667)
+
+	* Merge branch 'tari01-pr/replace-x-canonical-attributes'
+
+2020-08-11 20:02:44 +0200 Robert Tari (20f7780)
+
+	* Replace x-canonical attributes
+
+2020-08-11 08:03:20 +0200 Robert Tari (2fe548a)
+
+	* Merge branch 'sunweaver-pr/drop-upstart-support' Attributes GH PR
+          #8:
+          https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/8
+
+2020-08-10 12:38:38 +0200 Mike Gabriel (1fb52f0)
+
+	* Drop all references to upstart.
+
+2020-08-10 08:52:17 +0200 Mike Gabriel (d37997e)
+
+	* debian/ayatana-indicator-power.links: Add FIXME/reminder to drop
+          manual symlinking of systemd user service file once DH
+          compat level is raised to a level above 12.
+
+2020-08-10 08:49:59 +0200 Mike Gabriel (b1ad978)
+
+	* Merge branch 'ubports-fix-systemd'
+
+2020-08-09 22:00:36 +0200 Marius Gripsgard (c011884)
+
+	* Start indicator in systemd when ayatana-indicators.target is
+          started
+
+2020-08-06 20:58:44 +0000 Nazim-ua (09e8477)
+
+	* Translated using Weblate (Ukrainian)
+
+2020-07-15 18:14:26 +0200 Florian Leeber (4aaddc4)
+
+	* Try to detect if flash needs to be enabled (latched) separately
+
+2020-02-16 20:08:48 +0100 Alfred Neumayer (215c6dd)
+
+	* flashlight: Add more brightness file paths
+
+2019-08-29 13:40:58 +0800 BirdZhang (9d40332)
+
+	* Do not divide by battery size if percent less than 0.01
+
+2020-08-06 15:02:25 +0200 Mike Gabriel (960b4ec)
+
+	* debian/control: Drop from B-D: python:any. In fact, a totally
+          superfluous B-D.
+
+2020-08-03 18:37:27 +0000 Abbas Baharforoosh (4ddb778)
+
+	* Translated using Weblate (Persian)
+
+2020-07-29 10:34:31 +0000 Ács Zoltán (6b9cb69)
+
+	* Translated using Weblate (Hungarian)
+
+2020-07-25 13:22:28 +0200 Mike Gabriel (6974c37)
+
+	* release 2.0.95 (tag: 2.0.95)
 
 2020-07-25 13:17:52 +0200 Mike Gabriel (42600ab)
 
diff --git a/NEWS b/NEWS
index 76f9f21..cf04562 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+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.
+  - Start the indicator with the ayatana-indicators.target.
+  - Drop upstart support.
+  - Flashlight improvements ported from UBports.
+  - Translation updates.
+
 Overview of changes in ayatana-indicator-power 2.0.95
 
     - Allow one to disable unit tests at build time.
diff --git a/debian/changelog b/debian/changelog
index 97328e5..9af0e3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ayatana-indicator-power (2.1.0-1) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-power.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 17 Aug 2020 22:27:57 +0200
+
 ayatana-indicator-power (2.0.95-0) unstable; urgency=medium
 
   * Upstream-provided Debian package for ayatana-indicator-power.
-- 
cgit v1.2.3