From 9ab50d468e4f7778bbb6aeca3bec8add7430aab5 Mon Sep 17 00:00:00 2001
From: trisyoungs <trisyoungs@googlemail.com>
Date: Wed, 4 Dec 2013 14:09:14 +0000
Subject: [PATCH] Configure script now performs better checks for ncurses lib,
 helping builds on xUbuntu. Updated buildobs script.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86d5ef6d4..8106fb1b0 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 "855")
+set(VERSION_MINOR "856")
 set(VERSION_PATCH "1")
 
 set(CMAKE_BUILD_TYPE "Release")
diff --git a/aten.spec b/aten.spec
index b1dd4cec1..d0eac0b7f 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.855
+Version: 1.856
 Release: 1
 License: GPL
 %define fullname %{name}-%{version}
diff --git a/buildobs b/buildobs
index 99add7de8..3d584dcf4 100755
--- a/buildobs
+++ b/buildobs
@@ -48,16 +48,6 @@ tar -zxvf $DISTFILE
 zip -9r $ZIPDISTFILE aten-${ATENVERSION}
 rm -rf aten-${ATENVERSION}
 
-# FTP source tgz and zip to website
-pftp -i ftp.projectaten.net << EOF
-cd Beta
-binary
-mdelete aten*tar.gz
-mdelete aten*zip
-put $DISTFILE
-put $ZIPDISTFILE
-EOF
-
 # Update tarfile info in ./extra/aten.dsc
 echo ""
 echo "Updating extra/aten.dsc..."
@@ -98,9 +88,6 @@ DATE=`date`
 osc commit -m "Committing version $ATENVERSION (release=$RELEASE) on $DATE."
 cd ../../
 
-# Cleanup
-rm $DISTFILE $ZIPDISTFILE
-
 exit 0
 
 
diff --git a/configure.ac b/configure.ac
index c9bed7157..50ee7171c 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.855])
+m4_define([ATEN_VERSION],[1.856])
 AC_INIT(aten,ATEN_VERSION,tris@projectaten.net)
 AC_CONFIG_SRCDIR([src/main.cpp])
 
@@ -88,10 +88,12 @@ if test "$with_qt" != "framework"; then
   PKG_PROG_PKG_CONFIG
 fi
 
-
 # Check for other dependencies
 AC_CHECK_HEADER([$RLINCDIR/readline.h],,[AC_MSG_ERROR([Cannot find headers for readline.])])
 
+# Determine whether to link against libncurses or libncurses5
+AC_SEARCH_LIBS(tgetent, [ncurses ncurses5 curses termcap])
+
 # Set up compilation for Qt GUI
 if test "$with_qt" = "framework"; then
   QTGUI_LIBS="-framework QtGui -framework QtOpenGL -framework QtCore"
@@ -109,7 +111,7 @@ if test "x$with_qt" = "x"; then
   PKG_CHECK_MODULES(QTGUI, QtGui >= 4.1.0)
   PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.1.0)
 fi
-GUI_LDLIBS="$QTGUI_LIBS $QTOPENGL_LIBS -lreadline -lncurses -lGL"
+GUI_LDLIBS="$QTGUI_LIBS $QTOPENGL_LIBS -lreadline -lGL"
 GUI_CFLAGS="$QTGUI_CFLAGS -I$RLINCDIR"
 
 
diff --git a/extra/aten.dsc b/extra/aten.dsc
index 1c5cd38d1..c1f70797a 100644
--- a/extra/aten.dsc
+++ b/extra/aten.dsc
@@ -1,9 +1,9 @@
 Format: 1.0
 Source: aten
-Version: 1.855
+Version: 1.856
 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: 
- c9261a9523963a7d298046de12c9b803 4307358 aten-1.855.tar.gz
+ 0f7cda0fc1d5e6e2ca1c6247eb944c61 4309758 aten-1.856.tar.gz
diff --git a/src/main/version.h b/src/main/version.h
index dd75370cf..78d44d900 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.855"
-#define ATENREVISION "1855"
+#define ATENVERSION "1.856"
+#define ATENREVISION "1856"
 #define ATENDATE "Thu 28 Jun - 13:36"
 #define ATENURL "http://aten.googlecode.com/svn/trunk"