[mathic] 15/30: 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 mathic.

commit c8df6e25d613d666e3208c9b2ecf247953d45d88
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sun Mar 20 12:27:31 2016 -0400

    debian/patches: Remove directory; patches applied upstream.
---
 debian/patches/find_gtest.patch   | 28 --------------------------
 debian/patches/fix_test.patch     | 41 ---------------------------------------
 debian/patches/link_pthread.patch | 16 ---------------
 debian/patches/series             |  3 ---
 4 files changed, 88 deletions(-)

diff --git a/debian/patches/find_gtest.patch b/debian/patches/find_gtest.patch
deleted file mode 100644
index 3bbb183..0000000
--- a/debian/patches/find_gtest.patch
+++ /dev/null
@@ -1,28 +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-19
-
---- a/src/test/gtestInclude.cpp
-+++ b/src/test/gtestInclude.cpp
-@@ -5,6 +5,4 @@
- // the compiler flags are the same, which is the whole point of the
- // recommendation to build gtest for each program.
- 
--// 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
-@@ -51,7 +51,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="$MEMTAILOR_CFLAGS $GTEST_CFLAGS"
diff --git a/debian/patches/fix_test.patch b/debian/patches/fix_test.patch
deleted file mode 100644
index f9f1484..0000000
--- a/debian/patches/fix_test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix failing PairQueue.Ordering test.
-Origin: https://github.com/Macaulay2/M2/commit/9b010dc
-Last-Update: 2015-03-19
-
---- a/src/test/PairQueue.cpp
-+++ b/src/test/PairQueue.cpp
-@@ -114,6 +114,7 @@
-   // distinguish all pairs and that, according to the pairdata,
-   //   (11,0) < (11,10) = (111,0) < (11,5)
-   // so the order that pairs are extracted mix up columns 11 and 111.
-+
-   for (size_t col = 0; col < 112; ++col) {
- 	Index const* begin = 0;
- 	Index const* end = 0;
-@@ -121,20 +122,24 @@
- 	  Index const rows[] = {0};
- 	  begin = rows;
- 	  end = rows + sizeof(rows) / sizeof(rows[0]);
-+      pq.addColumnDescending(begin, end);
- 	} else if (col == 11) {
- 	  Index const rows[] = {0, 10, 5};
- 	  begin = rows;
- 	  end = rows + sizeof(rows) / sizeof(rows[0]);
-+      pq.addColumnDescending(begin, end);
- 	} else if (col == 13) {
- 	  Index const rows[] = {12, 3, 7};
- 	  begin = rows;
- 	  end = rows + sizeof(rows) / sizeof(rows[0]);
-+      pq.addColumnDescending(begin, end);
- 	} else if (col == 111) {
- 	  Index const rows[] = {0, 100};
- 	  begin = rows;
- 	  end = rows + sizeof(rows) / sizeof(rows[0]);
--	}
--	pq.addColumnDescending(begin, end);
-+      pq.addColumnDescending(begin, end);
-+	} else
-+      pq.addColumnDescending(begin, end);
-   }
-   std::ostringstream out;
-   std::string lastPd;
diff --git a/debian/patches/link_pthread.patch b/debian/patches/link_pthread.patch
deleted file mode 100644
index c54aef1..0000000
--- a/debian/patches/link_pthread.patch
+++ /dev/null
@@ -1,16 +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-03-19
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -87,7 +87,7 @@
- 
- unittest_CPPFLAGS = $(DEPS_CFLAGS)
- unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++0x
--unittest_LDADD = $(DEPS_LIBS)
-+unittest_LDADD = $(DEPS_LIBS) -lpthread
- unittest_LDFLAGS= $(top_builddir)/libmathic.la
- 
- test_LIBS=
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 23f167a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-find_gtest.patch
-link_pthread.patch
-fix_test.patch

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