[SCM] Command-line driven interactive plotting program branch, master, updated. debian/0_20120508.git5719ce8-1-7-g2082bf6

[Anton Gladky]

The following commit has been merged in the master branch:
commit 4454719632ac88e38b9ff30a4da1e412873df656
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed May 8 20:59:15 2013 +0200

    Enable some more tests.

diff --git a/debian/patches/enable_some_more_tests.patch b/debian/patches/enable_some_more_tests.patch
new file mode 100644
index 0000000..e926673
--- /dev/null
+++ b/debian/patches/enable_some_more_tests.patch
@@ -0,0 +1,40 @@
+Description: enable additional tests and set hardening flags.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-05-08
+
+--- a/Makefile
++++ b/Makefile
+@@ -26,8 +26,8 @@
+ 
+ # The -O0 option speeds up the compile, which is good for testing.  This should
+ # never be used for production since the generated code is extremely slow!
+-CXXFLAGS+=-Wall -Wextra -O0 -g
+-LDFLAGS+=-lutil -lboost_iostreams -lboost_system -lboost_filesystem
++CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS) 
++LDFLAGS+= $(shell dpkg-buildflags --get CXXFLAGS) -lutil -lboost_iostreams -lboost_system -lboost_filesystem
+ 
+ # This makes the examples and tests more complete, but only works if you have the corresponding
+ # libraries installed.
+--- a/legacy/Makefile
++++ b/legacy/Makefile
+@@ -1,7 +1,7 @@
+ CXXFLAGS+=-Wall -Wextra -I.. -O0 -g
+ # Don't warn about the fact that we use the deprecated send() function.
+-CXXFLAGS+=-Wno-deprecated-declarations
+-LDFLAGS+=-lutil -lboost_iostreams -lboost_system -lboost_filesystem
++CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS)
++LDFLAGS+= $(shell dpkg-buildflags --get LDFLAGS) -lutil -lboost_iostreams -lboost_system -lboost_filesystem
+ 
+ EVERYTHING=examples examples-blitz examples-interactive
+ 
+--- gnuplot-iostream-0~20130424.gita9d3e31.orig/Makefile
++++ gnuplot-iostream-0~20130424.gita9d3e31/Makefile
+@@ -31,7 +31,7 @@ LDFLAGS+= $(shell dpkg-buildflags --get
+ 
+ # This makes the examples and tests more complete, but only works if you have the corresponding
+ # libraries installed.
+-#CXXFLAGS+=--std=c++11 -DUSE_ARMA=1 -DUSE_BLITZ=1
++CXXFLAGS+=--std=c++11 -DUSE_ARMA=1 -DUSE_BLITZ=1
+ 
+ ALL_EXAMPLES=example-misc example-data-1d example-data-2d example-interactive
+ TEST_BINARIES=test-noncopyable test-outputs
diff --git a/debian/patches/remove_hardcoded_buildflags.patch b/debian/patches/remove_hardcoded_buildflags.patch
deleted file mode 100644
index 3f3b838..0000000
--- a/debian/patches/remove_hardcoded_buildflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: remove hardcoded buildflags 
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2012-02-27
-
---- gnuplot-iostream-0~20120508.git5719ce8.orig/CMakeLists.txt
-+++ gnuplot-iostream-0~20120508.git5719ce8/CMakeLists.txt
-@@ -9,7 +9,7 @@ find_package(Blitz)
- 
- # TODO
- # what Boost version do we rely on?
--find_package(Boost 1.35 COMPONENTS iostreams system filesystem REQUIRED)
-+find_package(Boost COMPONENTS iostreams system filesystem REQUIRED)
- include_directories(${Boost_INCLUDE_DIR})
- 
- include(CheckFunctionExists)
-@@ -18,9 +18,6 @@ include(CheckFunctionExists)
- set(CMAKE_REQUIRED_LIBRARIES ${Boost_LIBRARIES} util)
- check_function_exists(openpty HAVE_OPENPTY)
- 
--# common flags
--SET(CMAKE_CXX_FLAGS "-Wall -Wextra -O0 -g")
--
- #add_library(gnuplot-iostream SHARED gnuplot-iostream.cc)
- ## util is for openpty
- #target_link_libraries(gnuplot-iostream ${Boost_LIBRARIES} ${CMAKE_REQUIRED_LIBRARIES})
diff --git a/debian/patches/series b/debian/patches/series
index d51a527..5df710d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-remove_hardcoded_buildflags.patch
+enable_some_more_tests.patch

-- 
Command-line driven interactive plotting program