Control: tags 895707 + patch Control: tags 895707 + pending Dear maintainer,
I've prepared an NMU for gumbo-parser (versioned as 0.10.1+dfsg-2.2) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru gumbo-parser-0.10.1+dfsg/debian/changelog gumbo-parser-0.10.1+dfsg/debian/changelog --- gumbo-parser-0.10.1+dfsg/debian/changelog 2015-12-30 12:45:37.000000000 -0600 +++ gumbo-parser-0.10.1+dfsg/debian/changelog 2018-04-14 18:20:28.000000000 -0500 @@ -1,3 +1,10 @@ +gumbo-parser (0.10.1+dfsg-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Tweak 00-tests.patch to ignore system libgtest (Closes: #895707) + + -- Steve M. Robbins <s...@debian.org> Sat, 14 Apr 2018 18:20:28 -0500 + gumbo-parser (0.10.1+dfsg-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru gumbo-parser-0.10.1+dfsg/debian/patches/00-tests.patch gumbo-parser-0.10.1+dfsg/debian/patches/00-tests.patch --- gumbo-parser-0.10.1+dfsg/debian/patches/00-tests.patch 2015-12-30 12:22:04.000000000 -0600 +++ gumbo-parser-0.10.1+dfsg/debian/patches/00-tests.patch 2018-04-14 15:52:03.000000000 -0500 @@ -3,11 +3,15 @@ Forwarded: not-needed Last-Update: 2014-10-13 ---- a/Makefile.am -+++ b/Makefile.am -@@ -9,31 +9,17 @@ +--- gumbo-parser-0.10.1+dfsg.orig/Makefile.am ++++ gumbo-parser-0.10.1+dfsg/Makefile.am +@@ -7,35 +7,17 @@ - if !HAVE_SHARED_LIBGTEST + ACLOCAL_AMFLAGS = -I m4 + +-if !HAVE_SHARED_LIBGTEST ++# Using Debian's libgtest-dev for tests ++GTEST_DIR = /usr/src/gtest -# Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS -# because then "make check" would also build and run all of gtest's own tests, @@ -34,9 +38,6 @@ - echo "Making clean in gtest"; \ - cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \ - fi -+# Using Debian's libgtest-dev for tests -+GTEST_DIR = /usr/src/gtest -+ +tests/gtest-all.o: + $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \ + $(GTEST_DIR)/src/gtest-all.cc -o tests/gtest-all.o @@ -44,19 +45,25 @@ +tests/gtest_main.o: + $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \ + $(GTEST_DIR)/src/gtest_main.cc -o tests/gtest_main.o -+ - endif !HAVE_SHARED_LIBGTEST +-endif !HAVE_SHARED_LIBGTEST + + gentags: src/tag.in + @python gentags.py $< +@@ -97,13 +79,9 @@ + gumbo_test_DEPENDENCIES = libgumbo.la + gumbo_test_LDADD = libgumbo.la -@@ -101,8 +87,9 @@ - # FIXME(bnoordhuis) Should be configurable by the user. - gumbo_test_LDADD += -lgtest -lgtest_main - else +-if HAVE_SHARED_LIBGTEST +-# FIXME(bnoordhuis) Should be configurable by the user. +-gumbo_test_LDADD += -lgtest -lgtest_main +-else -gumbo_test_DEPENDENCIES += check-local -gumbo_test_LDADD += gtest/lib/libgtest.la gtest/lib/libgtest_main.la +-endif +gumbo_test_DEPENDENCIES += tests/gtest-all.o tests/gtest_main.o +gumbo_test_LDADD += tests/gtest-all.o tests/gtest_main.o +gumbo_test_LDFLAGS = -pthread - endif noinst_PROGRAMS = clean_text find_links get_title positions_of_class benchmark serialize prettyprint + LDADD = libgumbo.la
signature.asc
Description: PGP signature
