From cbb50937cde0956379c934e61c72bd66383fa7d4 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Wed, 3 Oct 2012 23:30:18 +0200
Subject: [PATCH] Update ChangeLog and bump version.

New release, 1.5! :)

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 ChangeLog | 3 ++-
 Makefile  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 084dde98..fc34f292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-1.5 (UNRELEASED)
+1.5 (20121003)
 	- Use bootmisc plugin to setup standard FHS 2.3 structure in /var
 	- Added FLOG_WARN() syslog macro, for plugins
+	- Add plugin dependency resolver. Checks plugin_t for .depends
 
 1.4 (20121002)
 	- Fix I/O plugin watcher and load plugins earlier for a new hook
diff --git a/Makefile b/Makefile
index 7111ce0f..192a7cb5 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@
 ROOTDIR     = $(shell pwd)
 
 #VERSION    ?= $(shell git tag -l | tail -1)
-VERSION    ?= 1.4
+VERSION    ?= 1.5
 NAME        = finit
 PKG         = $(NAME)-$(VERSION)
 DEV         = $(NAME)-dev