[graphite2] 23/38: Import Debian changes 1.12.1-4
Rene Engelhard
rene at moszumanska.debian.org
Sun May 14 10:53:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch experimental
in repository graphite2.
commit a23df86b2c39eded384ccb7755d9460b86af86c0
Author: Steve M. Robbins <smr at debian.org>
Date: Sun Dec 11 00:26:51 2011 -0600
Import Debian changes 1.12.1-4
cppunit (1.12.1-4) unstable; urgency=low
* source/format: Switch to format 3.0 (quilt).
* patches: New. Contains all upstream modifications formerly in the
debian diff.
* patches/gcc-symbol-demangle.patch: New. Closes: #650033.
* rules: Clear dependency_libs from .la files. Use dh_autoreconf /
dh_autoreconf_clean to accommodate patches gcc-symbol-demangle and
link-with-dl.patch that modify autoconfigure inputs.
* patches/test-progress-flush.patch: New. Upstream change sets to avoid
losing test runner messages. Closes: #400867.
---
cppunit-config.1 | 2 +-
debian/changelog | 17 +++
debian/control | 4 +-
debian/patch01.testresult-include-string | 15 ---
debian/patch02.cppunit-link-test | 20 ----
debian/patch04.assert-doubles-equal | 48 --------
debian/patches/cppunit-config-manpage.patch | 17 +++
debian/patches/gcc-symbol-demangle.patch | 31 +++++
debian/patches/link-with-dl.patch | 34 ++++++
.../qttestrunner-libname-linkage.patch} | 24 ++--
debian/patches/series | 4 +
debian/patches/test-progress-flush.patch | 48 ++++++++
debian/rules | 4 +
debian/source/format | 1 +
debian/watch | 2 +
src/cppunit/Makefile.am | 8 +-
src/cppunit/Makefile.in | 130 +++------------------
src/cppunit/t_link.cpp | 8 --
src/qttestrunner/qttestrunnerlib.pro | 9 +-
19 files changed, 199 insertions(+), 227 deletions(-)
diff --git a/cppunit-config.1 b/cppunit-config.1
index 6f829fc..baa8b58 100644
--- a/cppunit-config.1
+++ b/cppunit-config.1
@@ -12,7 +12,7 @@ programs that use \fIcppunit\fP. It is also used internally to the .m4
macros for GNU autoconf that are included with \fIcppunit\fP.
.
.SH OPTIONS
-
+.l
\fIcppunit-config\fP accepts the following options:
.TP 8
.B \-\-version
diff --git a/debian/changelog b/debian/changelog
index ee4e331..fe667f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+cppunit (1.12.1-4) unstable; urgency=low
+
+ * source/format: Switch to format 3.0 (quilt).
+ * patches: New. Contains all upstream modifications formerly in the
+ debian diff.
+
+ * patches/gcc-symbol-demangle.patch: New. Closes: #650033.
+
+ * rules: Clear dependency_libs from .la files. Use dh_autoreconf /
+ dh_autoreconf_clean to accommodate patches gcc-symbol-demangle and
+ link-with-dl.patch that modify autoconfigure inputs.
+
+ * patches/test-progress-flush.patch: New. Upstream change sets to avoid
+ losing test runner messages. Closes: #400867.
+
+ -- Steve M. Robbins <smr at debian.org> Sun, 11 Dec 2011 00:26:51 -0600
+
cppunit (1.12.1-3) unstable; urgency=low
* compat:
diff --git a/debian/control b/debian/control
index d928c1b..b750902 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/cppunit/trunk
Section: devel
Priority: optional
Maintainer: Steve M. Robbins <smr at debian.org>
-Build-Depends: debhelper (>= 8), doxygen
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8), dh-autoreconf, doxygen
+Standards-Version: 3.9.2
Package: libcppunit-1.12-1
Architecture: any
diff --git a/debian/patch01.testresult-include-string b/debian/patch01.testresult-include-string
deleted file mode 100644
index 0d9aee1..0000000
--- a/debian/patch01.testresult-include-string
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: include/cppunit/TestResult.h
-===================================================================
-RCS file: /home/steve/lib/cvs/debian/cppunit/include/cppunit/TestResult.h,v
-retrieving revision 1.1.1.3
-diff -u -b -B -r1.1.1.3 TestResult.h
---- include/cppunit/TestResult.h 29 Aug 2002 22:26:01 -0000 1.1.1.3
-+++ include/cppunit/TestResult.h 20 Jul 2006 06:03:53 -0000
-@@ -8,6 +8,7 @@
- #pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z
- #endif
-
-+#include <string>
- #include <cppunit/SynchronizedObject.h>
- #include <cppunit/portability/CppUnitDeque.h>
-
diff --git a/debian/patch02.cppunit-link-test b/debian/patch02.cppunit-link-test
deleted file mode 100644
index 9e310cc..0000000
--- a/debian/patch02.cppunit-link-test
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/cppunit/Makefile.am
-===================================================================
-RCS file: /home/steve/lib/cvs/debian/cppunit/src/cppunit/Makefile.am,v
-retrieving revision 1.3
-diff -u -b -B -r1.3 Makefile.am
---- src/cppunit/Makefile.am 20 Jul 2006 05:35:04 -0000 1.3
-+++ src/cppunit/Makefile.am 20 Jul 2006 05:42:28 -0000
-@@ -63,5 +63,11 @@
-
- libcppunit_la_LDFLAGS= \
- -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) @LIBADD_DL@
-
-+TESTS = t_link
-+
-+check_PROGRAMS = t_link
-+
-+t_link_SOURCES = t_link.cpp
-+t_link_LDADD = libcppunit.la
diff --git a/debian/patch04.assert-doubles-equal b/debian/patch04.assert-doubles-equal
deleted file mode 100644
index 568e8c1..0000000
--- a/debian/patch04.assert-doubles-equal
+++ /dev/null
@@ -1,48 +0,0 @@
-? cppunit.pc
-Index: examples/cppunittest/TestAssertTest.cpp
-===================================================================
-RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/TestAssertTest.cpp,v
-retrieving revision 1.9
-diff -u -b -B -r1.9 TestAssertTest.cpp
---- examples/cppunittest/TestAssertTest.cpp 5 Nov 2004 22:47:21 -0000 1.9
-+++ examples/cppunittest/TestAssertTest.cpp 11 Nov 2006 04:39:10 -0000
-@@ -167,6 +167,17 @@
-
- CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.1, 1.2, 0.09 ) );
- CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.2, 1.1, 0.09 ) );
-+
-+ double inf = std::numeric_limits<double>::infinity();
-+ CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( inf, 0.0, 1.0 ) );
-+ CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, inf, 1.0 ) );
-+ CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT_DOUBLES_EQUAL( inf, inf, 1.0 ) );
-+
-+ double nan = std::numeric_limits<double>::quiet_NaN();
-+ CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( nan, 0.0, 1.0 ) );
-+ CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( nan, nan, 1.0 ) );
-+ CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( nan, inf, 1.0 ) );
-+ CPPUNIT_ASSERT_ASSERTION_FAIL( CPPUNIT_ASSERT_DOUBLES_EQUAL( inf, nan, 1.0 ) );
- }
-
-
-Index: src/cppunit/TestAssert.cpp
-===================================================================
-RCS file: /cvsroot/cppunit/cppunit/src/cppunit/TestAssert.cpp,v
-retrieving revision 1.12
-diff -u -b -B -r1.12 TestAssert.cpp
---- src/cppunit/TestAssert.cpp 5 Nov 2004 22:47:20 -0000 1.12
-+++ src/cppunit/TestAssert.cpp 11 Nov 2006 04:39:10 -0000
-@@ -21,7 +21,13 @@
- assertion_traits<double>::toString(delta) );
- msg.addDetail( AdditionalMessage(message) );
-
-- Asserter::failNotEqualIf( fabs( expected - actual ) > delta,
-+ bool equal;
-+ if ( isfinite(expected) && isfinite(actual) )
-+ equal = fabs( expected - actual ) <= delta;
-+ else
-+ equal = expected == actual;
-+
-+ Asserter::failNotEqualIf( !equal,
- assertion_traits<double>::toString(expected),
- assertion_traits<double>::toString(actual),
- sourceLine,
diff --git a/debian/patches/cppunit-config-manpage.patch b/debian/patches/cppunit-config-manpage.patch
new file mode 100644
index 0000000..fa1f0e8
--- /dev/null
+++ b/debian/patches/cppunit-config-manpage.patch
@@ -0,0 +1,17 @@
+Description: Fix manpage cppunit-config.1
+ Remove unknown markup ".l".
+Author: Steve M. Robbins <smr at debian.org>
+Forwarded: no
+Last-Update: 2011-12-09
+
+--- cppunit-1.12.1.orig/cppunit-config.1
++++ cppunit-1.12.1/cppunit-config.1
+@@ -12,7 +12,7 @@ programs that use \fIcppunit\fP. It is a
+ macros for GNU autoconf that are included with \fIcppunit\fP.
+ .
+ .SH OPTIONS
+-.l
++
+ \fIcppunit-config\fP accepts the following options:
+ .TP 8
+ .B \-\-version
diff --git a/debian/patches/gcc-symbol-demangle.patch b/debian/patches/gcc-symbol-demangle.patch
new file mode 100644
index 0000000..16b3730
--- /dev/null
+++ b/debian/patches/gcc-symbol-demangle.patch
@@ -0,0 +1,31 @@
+Description: Enable symbol demangling for gcc 4.3
+ Upstream change set 582:
+ * config/ax_cxx_gcc_abi_demangle.m4:
+ * src/cppunit/TypeInfoHelper.cpp: Fixed demangling of symbols on gcc 4.3 (bug #2796543).
+
+ Note: patch requires autoreconf before building.
+Author: Baptiste Lepilleur
+Applied-Upstream: commit 582
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=650033
+Last-Update: 2011-12-09
+
+--- cppunit-1.12.1.orig/config/ax_cxx_gcc_abi_demangle.m4
++++ cppunit-1.12.1/config/ax_cxx_gcc_abi_demangle.m4
+@@ -15,6 +15,7 @@
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <typeinfo>
+ #include <cxxabi.h>
++#include <malloc.h>
+ #include <string>
+
+ template<typename TYPE>
+--- cppunit-1.12.1.orig/src/cppunit/TypeInfoHelper.cpp
++++ cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp
+@@ -6,6 +6,7 @@
+ #include <string>
+
+ #if CPPUNIT_HAVE_GCC_ABI_DEMANGLE
++#include <malloc.h>
+ #include <cxxabi.h>
+ #endif
+
diff --git a/debian/patches/link-with-dl.patch b/debian/patches/link-with-dl.patch
new file mode 100644
index 0000000..876a56e
--- /dev/null
+++ b/debian/patches/link-with-dl.patch
@@ -0,0 +1,34 @@
+Description: Link against -ldl
+ Link libcppunit with -ldl (thanks, Aurelien Jarno).
+ Add test case to check linking.
+Author: Steve M. Robbins <smr at debian.org>
+Bug-Debian: http://bugs.debian.org/338252
+Forwarded: no
+Last-Update: 2011-12-09
+
+--- /dev/null
++++ cppunit-1.12.1/src/cppunit/t_link.cpp
+@@ -0,0 +1,8 @@
++/* This program simply tests that we can link against
++ * libcppunit.
++ */
++
++int main( int ac, char* av[] )
++{
++ return 0;
++}
+--- cppunit-1.12.1.orig/src/cppunit/Makefile.am
++++ cppunit-1.12.1/src/cppunit/Makefile.am
+@@ -63,5 +63,11 @@ libcppunit_la_SOURCES = \
+
+ libcppunit_la_LDFLAGS= \
+ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- -release $(LT_RELEASE)
++ -release $(LT_RELEASE) @LIBADD_DL@
+
++TESTS = t_link
++
++check_PROGRAMS = t_link
++
++t_link_SOURCES = t_link.cpp
++t_link_LDADD = libcppunit.la
diff --git a/debian/patch03.qttestrunner-libname-linkage b/debian/patches/qttestrunner-libname-linkage.patch
similarity index 56%
rename from debian/patch03.qttestrunner-libname-linkage
rename to debian/patches/qttestrunner-libname-linkage.patch
index ee90462..147145a 100644
--- a/debian/patch03.qttestrunner-libname-linkage
+++ b/debian/patches/qttestrunner-libname-linkage.patch
@@ -1,11 +1,17 @@
-Index: src/qttestrunner/qttestrunnerlib.pro
-===================================================================
-RCS file: /home/steve/lib/cvs/debian/cppunit/src/qttestrunner/qttestrunnerlib.pro,v
-retrieving revision 1.1.1.1
-diff -u -b -B -r1.1.1.1 qttestrunnerlib.pro
---- src/qttestrunner/qttestrunnerlib.pro 12 Dec 2005 07:40:09 -0000 1.1.1.1
-+++ src/qttestrunner/qttestrunnerlib.pro 20 Jul 2006 15:18:13 -0000
-@@ -21,6 +21,8 @@
+Description: Fix libnames for qttestrunner
+ Set CONFIG to build a release shared lib; remove "_shared" from
+ shared lib name; link against libcppunit in directory
+ src/cppunit/.libs
+
+ Note: patch not currently used, as libqttestrunner1c2a package was removed
+ to close bug #604345.
+Author: Steve M. Robbins <smr at debian.org>
+Forwarded: no
+Last-Update: 2011-12-09
+
+--- cppunit-1.12.1.orig/src/qttestrunner/qttestrunnerlib.pro
++++ cppunit-1.12.1/src/qttestrunner/qttestrunnerlib.pro
+@@ -21,6 +21,8 @@ CONFIG += qt warn_on debug staticlib
#CONFIG += qt warn_on debug dll
#CONFIG += qt warn_on release dll
@@ -14,7 +20,7 @@ diff -u -b -B -r1.1.1.1 qttestrunnerlib.pro
QTRUNNER_LIB = qttestrunner # Name of the library
-@@ -84,16 +86,15 @@
+@@ -84,16 +86,15 @@ unix {
MOC_DIR = .moc
UI_DIR = .moc
DESTDIR = ../../lib
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4e43161
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+link-with-dl.patch
+cppunit-config-manpage.patch
+gcc-symbol-demangle.patch
+test-progress-flush.patch
diff --git a/debian/patches/test-progress-flush.patch b/debian/patches/test-progress-flush.patch
new file mode 100644
index 0000000..a927420
--- /dev/null
+++ b/debian/patches/test-progress-flush.patch
@@ -0,0 +1,48 @@
+Description: Ensure test runner output flushed appropriately.
+ commit 570: Flush stdout, stderr in progress listener to ensure progress displayed.
+ commit 576: Flush stdout, stderr in test result destructor to prevent message loss
+ Upstream change sets 570 and 576.
+Author: Baptiste Lepilleur
+Applied-Upstream: commit 570 (bug #1649369)
+Applied-Upstream: commit 576 (bug #2832029)
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=400867
+Last-Update: 2011-12-11
+
+
+--- cppunit-1.12.1.orig/src/cppunit/TextTestProgressListener.cpp
++++ cppunit-1.12.1/src/cppunit/TextTestProgressListener.cpp
+@@ -20,6 +20,7 @@
+ TextTestProgressListener::startTest( Test *test )
+ {
+ stdCOut() << ".";
++ stdCOut().flush();
+ }
+
+
+@@ -27,6 +28,7 @@
+ TextTestProgressListener::addFailure( const TestFailure &failure )
+ {
+ stdCOut() << ( failure.isError() ? "E" : "F" );
++ stdCOut().flush();
+ }
+
+
+--- cppunit-1.12.1.orig/src/cppunit/TestResult.cpp
++++ cppunit-1.12.1/src/cppunit/TestResult.cpp
+@@ -3,6 +3,7 @@
+ #include <cppunit/TestListener.h>
+ #include <cppunit/TestResult.h>
+ #include <cppunit/tools/Algorithm.h>
++#include <cppunit/portability/Stream.h>
+ #include <algorithm>
+ #include "DefaultProtector.h"
+ #include "ProtectorChain.h"
+@@ -22,6 +23,8 @@
+
+ TestResult::~TestResult()
+ {
++ stdCOut().flush();
++ stdCErr().flush();
+ delete m_protectorChain;
+ }
+
diff --git a/debian/rules b/debian/rules
index 3bf28df..a622f8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ build: build-stamp
build-stamp:
dh_testdir
+ dh_autoreconf
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
$(MAKE)
@@ -43,6 +44,7 @@ clean:
rm -f config.log
rm -rf lib
+ dh_autoreconf_clean
dh_clean
install: build
@@ -55,6 +57,8 @@ install: build
htmldir=/usr/share/doc/libcppunit-doc/html \
install
+ sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+
# Runtime library package
dh_install -plibcppunit-1.12-1 --autodest debian/tmp/usr/lib/lib*.so.*
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a48c427
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/cppunit/cppunit-([\d\.]+)\.tar\.gz
diff --git a/src/cppunit/Makefile.am b/src/cppunit/Makefile.am
index 17996ba..d5a60bf 100644
--- a/src/cppunit/Makefile.am
+++ b/src/cppunit/Makefile.am
@@ -63,11 +63,5 @@ libcppunit_la_SOURCES = \
libcppunit_la_LDFLAGS= \
-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) @LIBADD_DL@
+ -release $(LT_RELEASE)
-TESTS = t_link
-
-check_PROGRAMS = t_link
-
-t_link_SOURCES = t_link.cpp
-t_link_LDADD = libcppunit.la
diff --git a/src/cppunit/Makefile.in b/src/cppunit/Makefile.in
index 188e1d4..aa68cb0 100644
--- a/src/cppunit/Makefile.in
+++ b/src/cppunit/Makefile.in
@@ -36,8 +36,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-TESTS = t_link$(EXEEXT)
-check_PROGRAMS = t_link$(EXEEXT)
subdir = src/cppunit
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -90,9 +88,6 @@ libcppunit_la_OBJECTS = $(am_libcppunit_la_OBJECTS)
libcppunit_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libcppunit_la_LDFLAGS) $(LDFLAGS) -o $@
-am_t_link_OBJECTS = t_link.$(OBJEXT)
-t_link_OBJECTS = $(am_t_link_OBJECTS)
-t_link_DEPENDENCIES = libcppunit.la
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/config
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -114,8 +109,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(libcppunit_la_SOURCES) $(t_link_SOURCES)
-DIST_SOURCES = $(libcppunit_la_SOURCES) $(t_link_SOURCES)
+SOURCES = $(libcppunit_la_SOURCES)
+DIST_SOURCES = $(libcppunit_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -305,10 +300,8 @@ libcppunit_la_SOURCES = \
libcppunit_la_LDFLAGS = \
-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) @LIBADD_DL@
+ -release $(LT_RELEASE)
-t_link_SOURCES = t_link.cpp
-t_link_LDADD = libcppunit.la
all: all-am
.SUFFIXES:
@@ -372,16 +365,6 @@ clean-libLTLIBRARIES:
libcppunit.la: $(libcppunit_la_OBJECTS) $(libcppunit_la_DEPENDENCIES)
$(libcppunit_la_LINK) -rpath $(libdir) $(libcppunit_la_OBJECTS) $(libcppunit_la_LIBADD) $(LIBS)
-clean-checkPROGRAMS:
- @list='$(check_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
-t_link$(EXEEXT): $(t_link_OBJECTS) $(t_link_DEPENDENCIES)
- @rm -f t_link$(EXEEXT)
- $(CXXLINK) $(t_link_OBJECTS) $(t_link_LDADD) $(LIBS)
-
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -437,7 +420,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XmlElement.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XmlOutputter.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XmlOutputterHook.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_link.Po at am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -513,79 +495,6 @@ GTAGS:
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
- elif test -f $$tst; then dir=; \
- else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
- ;; \
- *) \
- echo "PASS: $$tst"; \
- ;; \
- esac; \
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
- echo "FAIL: $$tst"; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
- echo "SKIP: $$tst"; \
- fi; \
- done; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
- banner="All $$all tests passed"; \
- else \
- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all tests failed"; \
- else \
- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
- report=""; \
- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- report="Please report to $(PACKAGE_BUGREPORT)"; \
- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes"; \
- test "$$failed" -eq 0; \
- else :; fi
-
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -613,8 +522,6 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
- $(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
@@ -647,8 +554,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -706,20 +613,19 @@ uninstall-am: uninstall-libLTLIBRARIES
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- clean-libtool ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-libLTLIBRARIES \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-libLTLIBRARIES
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/cppunit/t_link.cpp b/src/cppunit/t_link.cpp
deleted file mode 100644
index c3c7dcb..0000000
--- a/src/cppunit/t_link.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-/* This program simply tests that we can link against
- * libcppunit.
- */
-
-int main( int ac, char* av[] )
-{
- return 0;
-}
diff --git a/src/qttestrunner/qttestrunnerlib.pro b/src/qttestrunner/qttestrunnerlib.pro
index 50ae993..18870ee 100644
--- a/src/qttestrunner/qttestrunnerlib.pro
+++ b/src/qttestrunner/qttestrunnerlib.pro
@@ -21,8 +21,6 @@ CONFIG += qt warn_on debug staticlib
#CONFIG += qt warn_on debug dll
#CONFIG += qt warn_on release dll
-# Debian settings
-CONFIG = qt warn_on thread release dll
QTRUNNER_LIB = qttestrunner # Name of the library
@@ -86,15 +84,16 @@ unix {
MOC_DIR = .moc
UI_DIR = .moc
DESTDIR = ../../lib
- LIBS += -L../../src/cppunit/.libs -lcppunit
dll {
debug {
- TARGET = $${QTRUNNER_LIB}d
+ TARGET = $${QTRUNNER_LIB}d_shared
OBJECTS_DIR = .obj_debug_shared
+ LIBS += -L../../lib -lcppunit
}
release {
- TARGET = $${QTRUNNER_LIB}
+ TARGET = $${QTRUNNER_LIB}_shared
OBJECTS_DIR = .obj_release_shared
+ LIBS += -L../../lib -lcppunit
}
}
staticlib {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
More information about the Pkg-openoffice-commits
mailing list