Bump version to v1.5 for release1.5

6 files changed, 10 insertions, 12 deletions

diff --git a/Arduino.mk b/Arduino.mk
index b5b2064..22a8167 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -19,7 +19,7 @@
 #
 # Original Arduino adaptation by mellis, eighthave, oli.keller
 #
-# Current version: 1.3.4
+# Current version: 1.5
 #
 # Refer to HISTORY.md file for complete history of changes
 #
@@ -1134,7 +1134,7 @@ endif
 
 ########################################################################
 # Tools version info
-ARDMK_VERSION = 1.3.4
+ARDMK_VERSION = 1.5
 $(call show_config_variable,ARDMK_VERSION,[COMPUTED])
 
 CC_VERSION := $(shell $(CC) -dumpversion)
diff --git a/HISTORY.md b/HISTORY.md
index 15ab502..9a94eef 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -4,7 +4,7 @@ A Makefile for Arduino Sketches
 The following is the rough list of changes that went into different versions.
 I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
 
-### In development
+### 1.5 (2015-04-07)
 - New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)
 - New: Add support for 1.5.x vendor/hardware architecture library location (Issue #276) (https://github.com/lukasz-e)
 - New: Added test suite and integration with travis CI. (https://github.com/peplin)
@@ -17,7 +17,6 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 - New: Support for PuTTY under Windows (https://github.com/PeterMosmans)
 - New: Add support for installation using homebrew(https://github.com/ladislas)
 - New: Add support and example for flashing on a remote RPi. (https://github.com/Gaboose)
-
 - Tweak: Update Makefile-example.mk with STD flags (https://github.com/ladislas)
 - Tweak: Allow remove of any OBJDIR with `$(REMOVE) $(OBJDIR)`. (https://github.com/ladislas)
 - Tweak: Add cpp to extensions supported by "make generate_assembly". (https://github.com/sej7278)
@@ -33,7 +32,6 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 - Tweak: Add = to PARSE_BOARD regex to make it less greedy and not match vid.0, vid.1 and vid (https://github.com/sej7278)
 - Tweak: Added note about clock submenu's being used as F_CPU (https://github.com/sej7278)
 - Tweak: Better autodetection of ARDUINO_SKETCHBOOK and ARDUINO_DIR on OSX (https://github.com/sej7278)
-
 - Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans)
 - Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas)
 - Fix: Make avr-g++ use CXXFLAGS instead of CFLAGS. (https://github.com/sej7278)
diff --git a/README.md b/README.md
index 5a372cc..edddbbe 100644
--- a/README.md
+++ b/README.md
@@ -236,7 +236,7 @@ See examples/BlinkTeensy for example usage.
 
 ## Versioning
 
-The current version of the makefile is `1.3.4`. You can find the full history in the [HISTORY.md](HISTORY.md) file
+The current version of the makefile is `1.5`. You can find the full history in the [HISTORY.md](HISTORY.md) file
 
 This project adheres to Semantic [Versioning 2.0](http://semver.org/).
 
diff --git a/ard-reset-arduino.1 b/ard-reset-arduino.1
index da264f6..d7b2eb1 100644
--- a/ard-reset-arduino.1
+++ b/ard-reset-arduino.1
@@ -1,4 +1,4 @@
-.TH ARD-RESET-ARDUINO "1" "April 2014" "ard-reset-arduino 1.3.4" "Arduino CLI Reset"
+.TH ARD-RESET-ARDUINO "1" "April 2015" "ard-reset-arduino 1.5" "Arduino CLI Reset"
 
 .SH NAME
 ard-reset-arduino - Reset Arduino board
@@ -8,7 +8,7 @@ ard-reset-arduino - Reset Arduino board
 [OPTION]... [PORT]
 
 .SH DESCRIPTION
-To reset Arduinos, we either pulse the DTR line or open the USB port 
+To reset Arduinos, we either pulse the DTR line or open the USB port
 at 1200 baud and close it again.
 
 .SH OPTIONS
@@ -29,7 +29,7 @@ ard-reset-arduino \-\-verbose \-\-period=0.1 /dev/cu.usb*
 ard-reset-arduino \-\-verbose \-\-caterina /dev/ttyUSB0
 
 .SH BUGS
-There are no known bugs in this application. Please report problems 
+There are no known bugs in this application. Please report problems
 to the author. Patches are welcome.
 
 .SH AUTHOR
diff --git a/packaging/fedora/README.md b/packaging/fedora/README.md
index 1c2185e..acda0ac 100644
--- a/packaging/fedora/README.md
+++ b/packaging/fedora/README.md
@@ -6,7 +6,7 @@ First install the dependencies as root:
 
 From the top-level Arduino-Makefile directory you've checked out of github, run the following (as unprivileged user) to create a compressed tarball using the naming conventions required by rpmbuild:
 
-    git archive HEAD --prefix=arduino-mk-1.3.4/ -o ../arduino-mk-1.3.4.tar.gz
+    git archive HEAD --prefix=arduino-mk-1.5/ -o ../arduino-mk-1.5.tar.gz
 
 If you don't already have a rpmbuild setup (e.g. you've not installed the SRPM) you will need to create the directories:
 
@@ -14,7 +14,7 @@ If you don't already have a rpmbuild setup (e.g. you've not installed the SRPM)
 
 Then copy the tarball and specfile into those directories:
 
-    cp ../arduino-mk-1.3.4.tar.gz ~/rpmbuild/SOURCES/
+    cp ../arduino-mk-1.5.tar.gz ~/rpmbuild/SOURCES/
     cp packaging/fedora/arduino-mk.spec ~/rpmbuild/SPECS/
 
 Then compile. This will create a binary and source RPM:
diff --git a/packaging/fedora/arduino-mk.spec b/packaging/fedora/arduino-mk.spec
index 716b409..ef870bb 100644
--- a/packaging/fedora/arduino-mk.spec
+++ b/packaging/fedora/arduino-mk.spec
@@ -1,5 +1,5 @@
 Name:			arduino-mk
-Version:		1.3.4
+Version:		1.5
 Release:		1%{dist}
 Summary:		Program your Arduino from the command line
 Packager:		Simon John <git@the-jedi.co.uk>