diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-10-06 14:02:04 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-10-06 14:02:04 +0200 |
commit | 82a152928f820a6aeb02ef8cd9ebfa7d3bcaae48 (patch) | |
tree | 0dd1472607450fac076ef4986c654c537153a1e8 /debian/patches/nousbtest.patch | |
parent | 6e9c41a892ed0e0da326e0278b3221ce3f5713b8 (diff) | |
parent | ba8d09abe681600aad991f4a75e904615b7ed29f (diff) |
Merge tag 'upstream/1.0.24'debian/1.0.24-1.2
Upstream version 1.0.24
Diffstat (limited to 'debian/patches/nousbtest.patch')
-rw-r--r-- | debian/patches/nousbtest.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/debian/patches/nousbtest.patch b/debian/patches/nousbtest.patch deleted file mode 100644 index bf7deec..0000000 --- a/debian/patches/nousbtest.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: - Don't build the USB tests because they will fail on the autobuilders. -Author: Mark Buda <hermit@acm.org> - ---- a/testsuite/sanei/Makefile.am -+++ b/testsuite/sanei/Makefile.am -@@ -15,7 +15,7 @@ - PTHREAD_LIBS = @PTHREAD_LIBS@ - TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la ../../lib/libfelib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS) - --check_PROGRAMS = sanei_usb_test test_wire sanei_check_test sanei_config_test sanei_constrain_test -+check_PROGRAMS = test_wire sanei_check_test sanei_config_test sanei_constrain_test - TESTS = $(check_PROGRAMS) - - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -@@ -30,9 +30,6 @@ - sanei_check_test_SOURCES = sanei_check_test.c - sanei_check_test_LDADD = $(TEST_LDADD) - --sanei_usb_test_SOURCES = sanei_usb_test.c --sanei_usb_test_LDADD = $(TEST_LDADD) -- - test_wire_SOURCES = test_wire.c - test_wire_LDADD = $(TEST_LDADD) - ---- a/testsuite/sanei/Makefile.in -+++ b/testsuite/sanei/Makefile.in -@@ -77,7 +77,7 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --check_PROGRAMS = sanei_usb_test$(EXEEXT) test_wire$(EXEEXT) \ -+check_PROGRAMS = test_wire$(EXEEXT) \ - sanei_check_test$(EXEEXT) sanei_config_test$(EXEEXT) \ - sanei_constrain_test$(EXEEXT) - subdir = testsuite/sanei |