From d742ab25b1bb30d8019e91592ce4991619921db5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 14 Feb 2015 00:57:23 +0100
Subject: [PATCH 1/2] Makefile: FIx manifest builds

---
 Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 451c302..4e23a29 100644
--- a/Makefile
+++ b/Makefile
@@ -26,20 +26,17 @@ all: gluon-clean
 build: gluon-prepare
 	${GLUON_MAKE}
 
-images: build
-	${MAKE} images-clean
+manifest: build
+	${GLUON_MAKE} manifest
 	mv ${GLUON_BUILD_DIR}/images .
 
-manifest: images
-	${GLUON_MAKE} manifest
-
-sign: gluon-prepare manifest
+sign: manifest
 	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
 
 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
 
-gluon-prepare: ${GLUON_BUILD_DIR}
+gluon-prepare: images-clean ${GLUON_BUILD_DIR}
 	(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
 	${GLUON_MAKE} update

From 599a01ca7fc5f4c2a5d5919fd773524b8810cce7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 17 Feb 2015 07:37:32 +0100
Subject: [PATCH 2/2] v2015.1 released

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58a39e9..503c669 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Freifunk München Firmware Changelog
 
-## 2015.1 (NOT RELEASED YET)
+## v2015.1
  - Updated to Gluon 2014.4 release
  - Autoupdater
    - Now enabled per default