# HG changeset patch
# User Chris Cannam
# Date 1428929525 -3600
# Node ID 6750a9502191435684e744ecda2527ff66071a24
# Parent  3e285a309c740b063f38066e524b517d4cc2162b
Revert to -Werror in debug only

diff -r 3e285a309c74 -r 6750a9502191 .hgsubstate
--- a/.hgsubstate	Mon Apr 13 13:43:53 2015 +0100
+++ b/.hgsubstate	Mon Apr 13 13:52:05 2015 +0100
@@ -2,6 +2,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 0ea1d1b67396e6fea7988ed4523ba8835461564d pyin
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-da520a68595a983bd206c01463549858e3389286 svapp
-24c48323c662a3631ba004f4701a328cbf753893 svcore
-fcbfc7fad1f2bb3af17de67d546ecff16dbdeef4 svgui
+b36042cb972a7c857b556517b11ba1088cd13b2f svapp
+135c5899a71f6dff31a3c847b660045c018ea36b svcore
+788b7623bfcae2b974c683313682a088c864588e svgui
diff -r 3e285a309c74 -r 6750a9502191 configure
--- a/configure	Mon Apr 13 13:43:53 2015 +0100
+++ b/configure	Mon Apr 13 13:52:05 2015 +0100
@@ -4363,8 +4363,8 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-   	CXXFLAGS_ANY="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
-        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
+   	CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -Werror -g"
    	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
    	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
 fi
diff -r 3e285a309c74 -r 6750a9502191 configure.ac
--- a/configure.ac	Mon Apr 13 13:43:53 2015 +0100
+++ b/configure.ac	Mon Apr 13 13:52:05 2015 +0100
@@ -53,8 +53,8 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-   	CXXFLAGS_ANY="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
-        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
+   	CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -Werror -g"
    	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
    	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
 fi
diff -r 3e285a309c74 -r 6750a9502191 deploy/linux/docker/Dockerfile
--- a/deploy/linux/docker/Dockerfile	Mon Apr 13 13:43:53 2015 +0100
+++ b/deploy/linux/docker/Dockerfile	Mon Apr 13 13:52:05 2015 +0100
@@ -7,4 +7,4 @@
 RUN apt-get install -y libsndfile1-dev libsamplerate0-dev libfftw3-dev libbz2-dev libjack-dev libjack0 libpulse-dev libmad0-dev libid3tag0-dev liboggz2-dev libfishsound1-dev libasound2-dev liblo-dev liblrdf0-dev libsord-dev libserd-dev
 RUN apt-get install -y vamp-plugin-sdk librubberband-dev
 RUN apt-get install -y lintian
-RUN hg clone -u v1.0 https://code.soundsoftware.ac.uk/hg/tony
+RUN hg clone -u v1.0-linuxbuild https://code.soundsoftware.ac.uk/hg/tony
diff -r 3e285a309c74 -r 6750a9502191 version.h
--- a/version.h	Mon Apr 13 13:43:53 2015 +0100
+++ b/version.h	Mon Apr 13 13:52:05 2015 +0100
@@ -1,1 +1,1 @@
-#define TONY_VERSION "1.0"
+#define TONY_VERSION "0.6"