From b949ad6dcb6817ef6c9dbd4842e00cc2dfca0001 Mon Sep 17 00:00:00 2001
From: trisyoungs <trisyoungs@googlemail.com>
Date: Fri, 6 Dec 2013 13:31:41 +0000
Subject: [PATCH] Fixing minor bug in previous buildobs script.

---
 CMakeLists.txt     | 2 +-
 aten.spec          | 2 +-
 buildobs           | 1 -
 configure.ac       | 2 +-
 extra/aten.dsc     | 4 ++--
 src/main/version.h | 4 ++--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16ef8d140..bd8761d9c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(Aten)
 set(DESCRIPTION "Aten - Atomic configuration builder and editor")
 set(AUTHOR "Tristan Youngs")
 set(VERSION_MAJOR "1")
-set(VERSION_MINOR "859")
+set(VERSION_MINOR "860")
 set(VERSION_PATCH "1")
 
 set(CMAKE_BUILD_TYPE "Release")
diff --git a/aten.spec b/aten.spec
index 0c8e6dd48..c3546903f 100644
--- a/aten.spec
+++ b/aten.spec
@@ -4,7 +4,7 @@
 # Name, brief description, and version 
 Summary: Aten - Atomic configuration builder and editor
 Name: %{shortname}
-Version: 1.859
+Version: 1.860
 Release: 1
 License: GPL
 %define fullname %{name}-%{version}
diff --git a/buildobs b/buildobs
index ed43b3306..9a40b94fd 100755
--- a/buildobs
+++ b/buildobs
@@ -10,7 +10,6 @@ then
   RELEASE="true"
   echo "Committing release version."
 fi
-exit 0
 
 # Set proxy for 'osc'
 export HTTPS_PROXY="http://wwwcache.rl.ac.uk:8080"
diff --git a/configure.ac b/configure.ac
index bf60ba09b..281e02c5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 AC_PREREQ(2.60)
 
 # Set program name, version, bug-address and source directory
-m4_define([ATEN_VERSION],[1.859])
+m4_define([ATEN_VERSION],[1.860])
 AC_INIT(aten,ATEN_VERSION,tris@projectaten.net)
 AC_CONFIG_SRCDIR([src/main.cpp])
 
diff --git a/extra/aten.dsc b/extra/aten.dsc
index 12f40b202..ffe7c6c8d 100644
--- a/extra/aten.dsc
+++ b/extra/aten.dsc
@@ -1,9 +1,9 @@
 Format: 1.0
 Source: aten
-Version: 1.859
+Version: 1.860
 Binary: aten
 Maintainer: Tristan Youngs <tris@projectaten.net>
 Architecture: any
 Build-Depends: debhelper (>= 4.1.16), libqt4-dev | libqt4-core, libqt4-opengl-dev, libreadline5-dev | libreadline-dev, libgl1-mesa-dev, pkgconfig | pkg-config, libncurses5
 Files: 
- 0f7cda0fc1d5e6e2ca1c6247eb944c61 4309758 aten-1.859.tar.gz
+ 0f7cda0fc1d5e6e2ca1c6247eb944c61 4309758 aten-1.860.tar.gz
diff --git a/src/main/version.h b/src/main/version.h
index cf4dc8ca8..44dc2c037 100644
--- a/src/main/version.h
+++ b/src/main/version.h
@@ -22,8 +22,8 @@
 #ifndef ATEN_VERSION_H
 #define ATEN_VERSION_H
 
-#define ATENVERSION "1.859"
-#define ATENREVISION "1859"
+#define ATENVERSION "1.860"
+#define ATENREVISION "1860"
 #define ATENDATE "Thu 28 Jun - 13:36"
 #define ATENURL "http://aten.googlecode.com/svn/trunk"