From 75a73b33cb4928ad20f31be5267de52349d21837 Mon Sep 17 00:00:00 2001
From: trisyoungs <trisyoungs@googlemail.com>
Date: Fri, 6 Dec 2013 13:31:15 +0000
Subject: [PATCH] Reverted buildobs script to upload files to beta directory on
 PA.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06c35fd0c..16ef8d140 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 "858")
+set(VERSION_MINOR "859")
 set(VERSION_PATCH "1")
 
 set(CMAKE_BUILD_TYPE "Release")
diff --git a/aten.spec b/aten.spec
index 89a48f672..0c8e6dd48 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.858
+Version: 1.859
 Release: 1
 License: GPL
 %define fullname %{name}-%{version}
diff --git a/buildobs b/buildobs
index 3d584dcf4..ed43b3306 100755
--- a/buildobs
+++ b/buildobs
@@ -1,10 +1,16 @@
 #!/bin/bash
 
 # Submit current source to OpenSuSE Build Service
-# Usage is: 'buildobs'
+# Usage is: 'buildobs [release]'
 
 # Variables
 RELEASE="false"
+if [ "$1" = "release" ]
+then
+  RELEASE="true"
+  echo "Committing release version."
+fi
+exit 0
 
 # Set proxy for 'osc'
 export HTTPS_PROXY="http://wwwcache.rl.ac.uk:8080"
@@ -48,6 +54,19 @@ tar -zxvf $DISTFILE
 zip -9r $ZIPDISTFILE aten-${ATENVERSION}
 rm -rf aten-${ATENVERSION}
 
+# FTP source tgz and zip to website (only if beta version)
+if [ "$RELEASE" = "false" ]
+then
+pftp -i ftp.projectaten.net << EOF
+cd projects/aten/downloads/current
+binary
+mdelete aten*tar.gz
+mdelete aten*zip
+put $DISTFILE
+put $ZIPDISTFILE
+EOF
+fi
+
 # Update tarfile info in ./extra/aten.dsc
 echo ""
 echo "Updating extra/aten.dsc..."
@@ -90,6 +109,3 @@ cd ../../
 
 exit 0
 
-
-
-
diff --git a/configure.ac b/configure.ac
index 492757dba..bf60ba09b 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.858])
+m4_define([ATEN_VERSION],[1.859])
 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 2601c9175..12f40b202 100644
--- a/extra/aten.dsc
+++ b/extra/aten.dsc
@@ -1,9 +1,9 @@
 Format: 1.0
 Source: aten
-Version: 1.858
+Version: 1.859
 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.858.tar.gz
+ 0f7cda0fc1d5e6e2ca1c6247eb944c61 4309758 aten-1.859.tar.gz
diff --git a/src/main/version.h b/src/main/version.h
index 9b92cb8da..cf4dc8ca8 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.858"
-#define ATENREVISION "1858"
+#define ATENVERSION "1.859"
+#define ATENREVISION "1859"
 #define ATENDATE "Thu 28 Jun - 13:36"
 #define ATENURL "http://aten.googlecode.com/svn/trunk"