[memtailor] 08/14: debian/patches: Remove directory; patches applied upstream.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository memtailor.

commit 99413948c9dc586af7664fd6394008eed0dcbb65
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Wed Mar 2 23:23:02 2016 -0500

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/find_gtest.patch   | 37 -------------------------------------
 debian/patches/link_pthread.patch | 15 ---------------
 debian/patches/series             |  2 --
 3 files changed, 54 deletions(-)

diff --git a/debian/patches/find_gtest.patch b/debian/patches/find_gtest.patch
deleted file mode 100644
index f7db533..0000000
--- a/debian/patches/find_gtest.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Find gtest source files.
- Upstream defaults to downloading a gtest tarball and using that for build.
- Instead, we use the libgtest-dev package.  We need to tell the build system
- how to find these files.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-03-18
-
---- a/src/test/gtestInclude.cpp
-+++ b/src/test/gtestInclude.cpp
-@@ -7,4 +7,4 @@
- 
- // the .. goes back from the include/ directory of gtest so we can
- // enter the src directory.
--#include <../src/gtest-all.cc>
-+#include <src/gtest-all.cc>
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,7 +57,7 @@
-   [AC_MSG_ERROR([invalid value $with_gtest for with_gtest.])]
- )
- AS_IF([test "x$with_gtest" == "xyes"],
--  [GTEST_CFLAGS="-I`cd $GTEST_PATH/gtest/include; echo $PWD` -I`cd $GTEST_PATH/gtest/; echo $PWD`"]);
-+  [GTEST_CFLAGS="-I/usr/include/gtest -I`cd $GTEST_PATH/gtest/; echo $PWD`"]);
- AM_CONDITIONAL(with_gtest, test "x$with_gtest" == "xyes")
- 
- DEPS_CFLAGS="$GTEST_CFLAGS"
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,7 +3,7 @@
- ACLOCAL_AMFLAGS = -I build/autotools/m4
- 
- # Options passed to the C PreProcessor (CPP), NOT the C Plus Plus compiler.
--AM_CPPFLAGS = -I${top_srcdir}/
-+AM_CPPFLAGS = -I${top_srcdir}/  $(DEPS_CFLAGS)
- 
- # tell Libtool what the name of the library is.
- lib_LTLIBRARIES = libmemtailor.la
diff --git a/debian/patches/link_pthread.patch b/debian/patches/link_pthread.patch
deleted file mode 100644
index 8dad158..0000000
--- a/debian/patches/link_pthread.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Link against pthread.
- Avoid FTBFS due to several "undefined reference to `pthread_*' errors.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-0318
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -47,6 +47,7 @@
- unittest_SOURCES=src/test/ArenaTest.cpp src/test/BufferPoolTest.cpp	\
-   src/test/MemoryBlocksTest.cpp src/test/testMain.cpp				\
-   src/test/gtestInclude.cpp
-+unittest_LDADD = -lpthread
- 
- else
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 834899f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-find_gtest.patch
-link_pthread.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/memtailor.git