[mathicgb] 02/10: debian/patches: Remove files; patches applied upstream.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sun Sep 6 00:38:18 UTC 2015


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

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

commit 3fa50a5d696a8bba14299a59a5edb9e4d4328ae3
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Fri Sep 4 00:14:12 2015 -0400

    debian/patches: Remove files; patches applied upstream.
---
 debian/patches/find_gtest.patch                   | 28 -------------------
 debian/patches/fix_archs_with_unsigned_char.patch | 34 -----------------------
 debian/patches/link_pthread.patch                 | 16 -----------
 debian/patches/series                             |  3 --
 4 files changed, 81 deletions(-)

diff --git a/debian/patches/find_gtest.patch b/debian/patches/find_gtest.patch
deleted file mode 100644
index 0ab0fa9..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-04-01
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -60,7 +60,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")
- 
- dnl ----- The TBB dependency
---- a/src/test/gtestInclude.cpp
-+++ b/src/test/gtestInclude.cpp
-@@ -12,6 +12,4 @@
- namespace mgb {}
- using namespace mgb;
- 
--// 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>
diff --git a/debian/patches/fix_archs_with_unsigned_char.patch b/debian/patches/fix_archs_with_unsigned_char.patch
deleted file mode 100644
index 60d2708..0000000
--- a/debian/patches/fix_archs_with_unsigned_char.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Fix failing tests for architectures which default to unsigned char.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Last-Update: 2015-07-18
-
---- a/src/test/PrimeField.cpp
-+++ b/src/test/PrimeField.cpp
-@@ -59,9 +59,9 @@
-     toString(pf.toElement(std::numeric_limits<int>::min())));
- 
-   // Fewer number of bits (8)
--  ASSERT_EQ("127", toString(pf.toElement(std::numeric_limits<char>::max())));
-+  ASSERT_EQ("127", toString(pf.toElement(std::numeric_limits<signed char>::max())));
-   ASSERT_EQ("4294967163",
--    toString(pf.toElement(std::numeric_limits<char>::min())));
-+    toString(pf.toElement(std::numeric_limits<signed char>::min())));
- 
-   ASSERT_EQ("255",
-     toString(pf.toElement(std::numeric_limits<unsigned char>::max())));
---- a/src/test/Scanner.cpp
-+++ b/src/test/Scanner.cpp
-@@ -102,10 +102,10 @@
-   ASSERT_EQ(0, in.readInteger<unsigned char>());
-   ASSERT_EQ(0, in.readInteger<char>());
-   ASSERT_EQ(1, in.readInteger<char>());
--  ASSERT_EQ(-1, in.readInteger<char>());
-+  ASSERT_EQ(-1, in.readInteger<signed char>());
-   ASSERT_EQ(127, in.readInteger<char>());
--  ASSERT_EQ(-128, in.readInteger<char>());
--  ASSERT_EQ(-128, in.readInteger<char>(true));
-+  ASSERT_EQ(-128, in.readInteger<signed char>());
-+  ASSERT_EQ(-128, in.readInteger<signed char>(true));
- }
- 
- TEST(Scanner, WhiteAndLineCount) {
diff --git a/debian/patches/link_pthread.patch b/debian/patches/link_pthread.patch
deleted file mode 100644
index b942137..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-04-01
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -93,7 +93,7 @@
- TESTS=unittest
- check_PROGRAMS=$(TESTS)
- 
--unittest_LDADD = $(DEPS_LIBS) $(top_builddir)/libmathicgb.la
-+unittest_LDADD = $(DEPS_LIBS) $(top_builddir)/libmathicgb.la -lpthread
- 
- test_LIBS=
- unittest_SOURCES=src/test/Range.cpp src/test/gtestInclude.cpp			\
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b2e2a98..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-find_gtest.patch
-link_pthread.patch
-fix_archs_with_unsigned_char.patch

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



More information about the debian-science-commits mailing list