From 21188de2606d036cd16166decc7e4127c1e6e0d4 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Mon, 29 Jan 2018 16:53:08 +0100
Subject: [PATCH 1/2] Makefile: correct dependencies to fix race condition

Before this commit, when building dunst in parallel, org.knopwob.dunst.service might get installed as an empty file. See https://bugs.debian.org/888760
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 492aba2..4f75a02 100644
--- a/Makefile
+++ b/Makefile
@@ -132,12 +132,12 @@ install-dunst: dunst doc
 install-doc:
 	install -Dm644 dunstrc ${DESTDIR}${PREFIX}/share/dunst/dunstrc
 
-install-service: service install-service-dbus
-install-service-dbus:
+install-service: install-service-dbus
+install-service-dbus: service-dbus
 	install -Dm644 org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service
 ifneq (0,${SYSTEMD})
 install-service: install-service-systemd
-install-service-systemd:
+install-service-systemd: service-systemd
 	install -Dm644 dunst.systemd.service ${DESTDIR}${SERVICEDIR_SYSTEMD}/dunst.service
 endif
 

From b40118bbe3c591ffdddfc4152e5901690a2c3d2e Mon Sep 17 00:00:00 2001
From: Nikos Tsipinakis <nikos@tsipinakis.com>
Date: Tue, 30 Jan 2018 11:06:17 +0200
Subject: [PATCH 2/2] Dunst v1.3.1

---
 CHANGELOG.md | 8 +++++++-
 Makefile     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32c31e1..30e6e63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Dunst changelog
 
-## 1.3.0 (2018-01-05)
+## 1.3.1 - 2018-01-30
+
+### Fixed
+
+- Race condition resulting in the service files being empty (#488)
+
+## 1.3.0 - 2018-01-05
 
 ### Added
 - `ellipsize` option to control how long lines should be ellipsized when `word_wrap` is set to `false` (#374)
diff --git a/Makefile b/Makefile
index 4f75a02..148e8ac 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-VERSION := "1.3.0 (2018-01-05)"
+VERSION := "1.3.1 (2018-01-30)"
 ifneq ($(wildcard ./.git/.),)
 VERSION := $(shell git describe --tags)
 endif