From 62c51796533140a58ce621603d0aab35e783a697 Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Tue, 26 Mar 2019 09:40:07 +1100
Subject: [PATCH 1/2] Update Makefile (#439)

* Use make clean to clean up version, not .PHONY which causes rebuild during 'make install'
* Update build instructions to use 'make clean' before 'make'
---
 Makefile  | 7 ++-----
 README.md | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 95ee09d6..1fe85e58 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ endif
 all: onedrive onedrive.service onedrive.1
 
 clean:
-	rm -f onedrive onedrive.o onedrive.service onedrive@.service onedrive.1
+	rm -f onedrive onedrive.o onedrive.service onedrive@.service onedrive.1 version
 
 onedrive: version $(SOURCES)
 	$(DC) $(DFLAGS) $(SOURCES)
@@ -140,7 +140,4 @@ ifeq ($(gitversion),1)
 	echo $(shell git describe --tags) > version
 else
 	echo $(RELEASEVER) > version
-endif
-
-.PHONY: version
-
+endif
\ No newline at end of file
diff --git a/README.md b/README.md
index 4ed09cb2..6c81e34c 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ Without performing this step, the compilation process will fail.
 ```text
 git clone https://github.com/abraunegg/onedrive.git
 cd onedrive
-make
+make clean; make;
 sudo make install
 ```
 
@@ -203,7 +203,7 @@ information, useful (for example) to get `perf`-issued figures.
 ```text
 git clone https://github.com/abraunegg/onedrive.git
 cd onedrive
-make DC=/usr/bin/ldc2
+make clean; make DC=/usr/bin/ldc2
 sudo make install
 ```
 
@@ -211,7 +211,7 @@ sudo make install
 ```text
 git clone https://github.com/abraunegg/onedrive.git
 cd onedrive
-make DC=~/ldc2-1.13.0-linux-armhf/bin/ldmd2
+make clean; make DC=~/ldc2-1.13.0-linux-armhf/bin/ldmd2
 sudo make install
 ```
 
@@ -219,7 +219,7 @@ sudo make install
 ```text
 git clone https://github.com/abraunegg/onedrive.git
 cd onedrive
-make DC=~/ldc2-1.14.0-linux-aarch64/bin/ldmd2
+make clean; make DC=~/ldc2-1.14.0-linux-aarch64/bin/ldmd2
 sudo make install
 ```
 

From de0f36007e9e7a4362e9716a0647fbb088aeb0c8 Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Tue, 26 Mar 2019 10:28:40 +1100
Subject: [PATCH 2/2] Update release files for 2.3.1 (#440)

* Update release files for 2.3.1
---
 CHANGELOG.md                                                | 6 ++++++
 Makefile                                                    | 2 +-
 .../gentoo/{onedrive-2.3.0.ebuild => onedrive-2.3.1.ebuild} | 0
 onedrive.1.in                                               | 2 +-
 pacman/PKGBUILD                                             | 2 +-
 spec/onedrive.spec                                          | 2 +-
 6 files changed, 10 insertions(+), 4 deletions(-)
 rename contrib/gentoo/{onedrive-2.3.0.ebuild => onedrive-2.3.1.ebuild} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b1cbe34..16af9935 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.3.1 - 2019-03-26
+### Fixed
+*   Resolve 'make install' issue where rebuild of application would occur due to 'version' being flagged as .PHONY
+*   Update readme build instructions to include 'make clean;' before build to ensure that 'version' is cleanly removed and can be updated correctly
+*   Update Debian Travis CI build URL's
+
 ## 2.3.0 - 2019-03-25
 ### Fixed
 *   Resolve application crash if no 'size' value is returned when uploading a new file
diff --git a/Makefile b/Makefile
index 1fe85e58..baf71286 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 DC ?= dmd
-RELEASEVER = v2.3.0
+RELEASEVER = v2.3.1
 pkgconfig := $(shell if [ $(PKGCONFIG) ] && [ "$(PKGCONFIG)" != 0 ] ; then echo 1 ; else echo "" ; fi)
 notifications := $(shell if [ $(NOTIFICATIONS) ] && [ "$(NOTIFICATIONS)" != 0 ] ; then echo 1 ; else echo "" ; fi)
 gitversion := $(shell if [ -f .git/HEAD ] ; then echo 1 ; else echo "" ; fi)
diff --git a/contrib/gentoo/onedrive-2.3.0.ebuild b/contrib/gentoo/onedrive-2.3.1.ebuild
similarity index 100%
rename from contrib/gentoo/onedrive-2.3.0.ebuild
rename to contrib/gentoo/onedrive-2.3.1.ebuild
diff --git a/onedrive.1.in b/onedrive.1.in
index 7ac16253..cc118199 100644
--- a/onedrive.1.in
+++ b/onedrive.1.in
@@ -1,4 +1,4 @@
-.TH ONEDRIVE "1" "March 2019" "2.3.0" "User Commands"
+.TH ONEDRIVE "1" "March 2019" "2.3.1" "User Commands"
 .SH NAME
 onedrive \- folder synchronization with OneDrive
 .SH SYNOPSIS
diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
index 08fc48c9..4c85f39d 100644
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=onedrive
-pkgver=2.3.0
+pkgver=2.3.1
 pkgrel=1 #patch-level (Increment this when patch is applied)
 pkgdesc="A free OneDrive Client for Linux. This is a fork of the https://github.com/skilion/onedrive repository"
 license=("unknown")
diff --git a/spec/onedrive.spec b/spec/onedrive.spec
index 2def8266..7e345c99 100644
--- a/spec/onedrive.spec
+++ b/spec/onedrive.spec
@@ -6,7 +6,7 @@
 %endif
 
 Name:       onedrive
-Version:    2.3.0
+Version:    2.3.1
 Release:    1%{?dist}
 Summary:    Microsoft OneDrive Client
 Group:      System Environment/Network