From ecb62bcb8689f3d18e719c4387294e9c85734ace Mon Sep 17 00:00:00 2001
From: Bryan Tan <techniux@gmail.com>
Date: Sun, 10 Nov 2019 23:44:00 -0800
Subject: [PATCH] Update versioning and changelog

---
 CHANGELOG.md                                  | 24 ++++++++++++-------
 CMakeLists.txt                                | 12 ++++++----
 ...com.github.xournalpp.xournalpp.appdata.xml |  1 +
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ea31e19..82fead32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +1,30 @@
 # Changelog
 
-## Nightlies
+## 1.1.0 / Nightly (Unreleased)
 
+* **Breaking changes**:
+    * The code has been updated to use C++17 and must now be compiled using a
+      supported compiler version, such as GCC 7 or Clang 5 (or newer).
 * Audio playback
-    * Added seeking functionality
-    * Fixed race condition in audio system leading to crashes
+    * Added seeking functionality during playback
+    * Fixed crashes caused by race conditions in the audio system
     * Fixed bug where gaps in the audio stream could appear while recording
+    * Added an error message popup which displays when a recording fails to load
+      or play.
 * Input System
-    * Previous experimental input system is now default. Should errors occur
-      please file a bug report and deactivate it in the settings.
+    * The new input system is now enabled by default. Should errors occur please
+      file a bug report and deactivate it in the settings.
     * Zoom gesture reimplemented for better compatibility
 * LaTeX
     * Added support for `\newline`
 * Misc
-    * Updated to C++17
-    * Cleaned up the codebase (see ticket 1279 for details)
+    * Non-visible refactoring and code cleanup (see #1279 for details)
     * Updated translations
-    * Introduced Flatpak Image
+
+## 1.0.16
+
+* Fixed currently editing textboxes not exporting to PDF.
+* Fixed line tool breaking when snap-to-grid is disabled.
 
 ## 1.0.15
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b85fcb64..23c1c164 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,11 +5,12 @@ project ("Xournal++" CXX C)
 ## Project related Variables
 ## Also update changelog in debian folder!
 set (CPACK_PACKAGE_VERSION_MAJOR "1")
-set (CPACK_PACKAGE_VERSION_MINOR "0")
-set (CPACK_PACKAGE_VERSION_PATCH "15")
-set(CPACK_DEBIAN_PACKAGE_RELEASE 1)
-set (PROJECT_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(PROJECT_PACKAGE "xournalpp")
+set (CPACK_PACKAGE_VERSION_MINOR "1")
+set (CPACK_PACKAGE_VERSION_PATCH "0")
+set (CPACK_DEBIAN_PACKAGE_RELEASE 1)
+set (VERSION_SUFFIX "+dev")
+set (PROJECT_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}${VERSION_SUFFIX}")
+set (PROJECT_PACKAGE "xournalpp")
 set (PROJECT_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
 set (PROJECT_URL "https://github.com/xournalpp/xournalpp")
 
@@ -326,6 +327,7 @@ target_architecture(PACKAGE_ARCH)
 set (CPACK_PACKAGE_FILE_NAME "xournalpp-${PROJECT_VERSION}-${DISTRO_NAME}-${DISTRO_CODENAME}-${PACKAGE_ARCH}")
 
 # .deb package options
+set (CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PROJECT_VERSION}")
 set (CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PACKAGE_URL})
 set (CPACK_DEBIAN_PACKAGE_MAINTAINER "Andreas Butti <andreasbutti@gmail.com>")
 set (CPACK_DEBIAN_PACKAGE_SECTION "graphics")
diff --git a/desktop/com.github.xournalpp.xournalpp.appdata.xml b/desktop/com.github.xournalpp.xournalpp.appdata.xml
index 6dab43ac..392e8633 100644
--- a/desktop/com.github.xournalpp.xournalpp.appdata.xml
+++ b/desktop/com.github.xournalpp.xournalpp.appdata.xml
@@ -79,6 +79,7 @@
     <!-- Could be automated more:
 	 `git tag --list | grep "^[0-9]*\.[0-9]*\.[0-9]*$`"
     -->
+    <release date="2019-11-10" version="1.0.16"/>
     <release date="2019-10-15" version="1.0.15"/>
     <release date="2019-10-12" version="1.0.14"/>
     <release date="2019-05-26" version="1.0.12"/>