From fd2a9d07cae4b687bdb818b979978be8534a3a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20P=C3=B6hn?= <michael@poehn.at>
Date: Wed, 21 Aug 2019 22:11:02 +0200
Subject: [PATCH 1/2] format CHANGELOG.md to conform with _keep a changelog_
 v1.0.0

---
 CHANGELOG.md | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27fec605..f62bf17e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,49 +1,47 @@
+# Changelog
 
-### 1.1.4 (2019-08-15)
+All notable changes to this project will be documented in this file.
 
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+
+## [1.1.4] - 2019-08-15
+### Fixed
 * include bitcoin validation regex required by fdroiddata
-
 * merged Debian patches to fix test suite there
 
-### 1.1.3 (2019-07-03)
-
+## [1.1.3] - 2019-07-03
+### Fixed
 * fixed test suite when run from source tarball
-
 * fixed test runs in Debian
 
-### 1.1.2 (2019-03-29)
-
+## [1.1.2] - 2019-03-29
+### Fixed
 * fix bug while downloading repo index ([!636](https://gitlab.com/fdroid/fdroidserver/merge_requests/636))
 
-### 1.1.1 (2019-02-03)
-
+## [1.1.1] - 2019-02-03
+### Fixed
 * support APK Signature v2 and v3
-
 * all SDK Version values are output as integers in the index JSON
-
 * take graphics from Fastlane dirs using any valid RFC5646 locale
-
 * print warning if not running in UTF-8 encoding
-
 * fdroid build: hide --on-server cli flag
 
-### 1.1 (2019-01-28)
-
+## [1.1] - 2019-01-28
+### Fixed
 * a huge update with many fixes and new features:
   https://gitlab.com/fdroid/fdroidserver/milestones/7
-
 * can run without and Android SDK installed
-
 * much more reliable operation with large binary APK collections
-
 * sync all translations, including newly added languages: hu it ko pl pt_PT ru
-
 * many security fixes, based on the security audit
-
 * NoSourceSince automatically adds SourceGone Anti-Feature
-
 * aapt scraping works with all known aapt versions
-
 * smoother mirror setups
-
 * much faster `fdroid update` when using androguard
+
+[Unreleased]: https://gitlab.com/fdroid/fdroidserver/compare/1.1.4...master
+[1.1.4]: https://gitlab.com/fdroid/fdroidserver/compare/1.1.3...1.1.4
+[1.1.3]: https://gitlab.com/fdroid/fdroidserver/compare/1.1.2...1.1.3
+[1.1.2]: https://gitlab.com/fdroid/fdroidserver/compare/1.1.1...1.1.2
+[1.1.1]: https://gitlab.com/fdroid/fdroidserver/compare/1.1...1.1.1
+[1.1]: https://gitlab.com/fdroid/fdroidserver/tags/1.1

From 6b5fb27532407c717641fec96e75c36ce1d08a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20P=C3=B6hn?= <michael@poehn.at>
Date: Thu, 22 Aug 2019 01:48:58 +0200
Subject: [PATCH 2/2] add some missing items to CHANGELOG.md

---
 CHANGELOG.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f62bf17e..3deb6e79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [Unreleased]
+### Added
+* makebuildserver: added ndk r20
+  ([!663](https://gitlab.com/fdroid/fdroidserver/merge_requests/663))
+* added support for gradle 5.5.1
+  ([!656](https://gitlab.com/fdroid/fdroidserver/merge_requests/656))
+
+### Fixed
+* checkupdates: UpdateCheckIngore gets properly observed now
+  ([!659](https://gitlab.com/fdroid/fdroidserver/merge_requests/659),
+  [!660](https://gitlab.com/fdroid/fdroidserver/merge_requests/660))
+* import: `template.yml` now supports omitting values
+  ([!657](https://gitlab.com/fdroid/fdroidserver/merge_requests/657))
+* build: deploying buildlogs with rsync
+  ([!651](https://gitlab.com/fdroid/fdroidserver/merge_requests/651))
+
 ## [1.1.4] - 2019-08-15
 ### Fixed
 * include bitcoin validation regex required by fdroiddata
@@ -16,7 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [1.1.2] - 2019-03-29
 ### Fixed
-* fix bug while downloading repo index ([!636](https://gitlab.com/fdroid/fdroidserver/merge_requests/636))
+* fix bug while downloading repo index
+  ([!636](https://gitlab.com/fdroid/fdroidserver/merge_requests/636))
 
 ## [1.1.1] - 2019-02-03
 ### Fixed