--- cppunit-1.12.1.orig/cppunit-config.1 +++ cppunit-1.12.1/cppunit-config.1 @@ -12,7 +12,7 @@ macros for GNU autoconf that are included with \fIcppunit\fP. . .SH OPTIONS -.l + \fIcppunit-config\fP accepts the following options: .TP 8 .B \-\-version --- 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 dll #CONFIG += qt warn_on release dll +# Debian settings +CONFIG = qt warn_on thread release dll QTRUNNER_LIB = qttestrunner # Name of the library @@ -84,16 +86,15 @@ MOC_DIR = .moc UI_DIR = .moc DESTDIR = ../../lib + LIBS += -L../../src/cppunit/.libs -lcppunit dll { debug { - TARGET = $${QTRUNNER_LIB}d_shared + TARGET = $${QTRUNNER_LIB}d OBJECTS_DIR = .obj_debug_shared - LIBS += -L../../lib -lcppunit } release { - TARGET = $${QTRUNNER_LIB}_shared + TARGET = $${QTRUNNER_LIB} OBJECTS_DIR = .obj_release_shared - LIBS += -L../../lib -lcppunit } } staticlib { --- cppunit-1.12.1.orig/src/cppunit/Makefile.in +++ cppunit-1.12.1/src/cppunit/Makefile.in @@ -36,6 +36,8 @@ 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 @@ -88,6 +90,9 @@ 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.@am__isrc@ -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -109,8 +114,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libcppunit_la_SOURCES) -DIST_SOURCES = $(libcppunit_la_SOURCES) +SOURCES = $(libcppunit_la_SOURCES) $(t_link_SOURCES) +DIST_SOURCES = $(libcppunit_la_SOURCES) $(t_link_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -300,8 +305,10 @@ libcppunit_la_LDFLAGS = \ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) + -release $(LT_RELEASE) @LIBADD_DL@ +t_link_SOURCES = t_link.cpp +t_link_LDADD = libcppunit.la all: all-am .SUFFIXES: @@ -365,6 +372,16 @@ 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) @@ -420,6 +437,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlElement.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlOutputter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlOutputterHook.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_link.Po@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -495,6 +513,79 @@ 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'`; \ @@ -522,6 +613,8 @@ fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: @@ -554,8 +647,8 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am +clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -613,19 +706,20 @@ .MAKE: install-am install-strip -.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 +.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 # 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. --- cppunit-1.12.1.orig/src/cppunit/t_link.cpp +++ 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_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 --- cppunit-1.12.1.orig/debian/patch03.qttestrunner-libname-linkage +++ cppunit-1.12.1/debian/patch03.qttestrunner-libname-linkage @@ -0,0 +1,36 @@ +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 @@ + #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 + +@@ -84,16 +86,15 @@ + MOC_DIR = .moc + UI_DIR = .moc + DESTDIR = ../../lib ++ LIBS += -L../../src/cppunit/.libs -lcppunit + dll { + debug { +- TARGET = $${QTRUNNER_LIB}d_shared ++ TARGET = $${QTRUNNER_LIB}d + OBJECTS_DIR = .obj_debug_shared +- LIBS += -L../../lib -lcppunit + } + release { +- TARGET = $${QTRUNNER_LIB}_shared ++ TARGET = $${QTRUNNER_LIB} + OBJECTS_DIR = .obj_release_shared +- LIBS += -L../../lib -lcppunit + } + } + staticlib { --- cppunit-1.12.1.orig/debian/patch04.assert-doubles-equal +++ cppunit-1.12.1/debian/patch04.assert-doubles-equal @@ -0,0 +1,48 @@ +? 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::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::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::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::toString(expected), + assertion_traits::toString(actual), + sourceLine, --- cppunit-1.12.1.orig/debian/libcppunit-dev.README.Debian +++ cppunit-1.12.1/debian/libcppunit-dev.README.Debian @@ -0,0 +1,14 @@ + Using CppUnit with autotools + ---------------------------- + +CppUnit ships an autoconf macro that is used to detect whether the +library is available. The usage is + + AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) + +Note that the minimum version of CppUnit is mandatory. + +Install package libcppunit-doc for documentation and example code. + + + -- Steve M. Robbins , Sun Jan 15 22:03:49 2006 --- cppunit-1.12.1.orig/debian/libcppunit-doc.doc-base +++ cppunit-1.12.1/debian/libcppunit-doc.doc-base @@ -0,0 +1,9 @@ +Document: cppunit +Title: CppUnit Cookbook +Author: Michael Feathers and others +Abstract: A short cookbook to help the user getting started with CppUnit. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcppunit-doc/html/index.html +Files: /usr/share/doc/libcppunit-doc/html/*.html --- cppunit-1.12.1.orig/debian/patch02.cppunit-link-test +++ cppunit-1.12.1/debian/patch02.cppunit-link-test @@ -0,0 +1,20 @@ +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 --- cppunit-1.12.1.orig/debian/compat +++ cppunit-1.12.1/debian/compat @@ -0,0 +1 @@ +8 --- cppunit-1.12.1.orig/debian/patch01.testresult-include-string +++ cppunit-1.12.1/debian/patch01.testresult-include-string @@ -0,0 +1,15 @@ +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 + #include + #include + --- cppunit-1.12.1.orig/debian/Notes +++ cppunit-1.12.1/debian/Notes @@ -0,0 +1,10 @@ + Build Notes + ----------- + +Up-to-date versions of the following files copied from autotools-dev: + + config/config.guess + config/config.sub + + + --- cppunit-1.12.1.orig/debian/copyright +++ cppunit-1.12.1/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Christian Leutloff on +Sat, 21 Apr 2001 16:47:23 +0200. + +It was downloaded from the official CppUnit Homepage at: +http://cppunit.sourceforge.net + +Upstream Authors: + +Michael Feathers +Jerome Lacoste +E. Sommerlade +J.E. Hoffmann +Baptiste Lepilleur +Bastiaan Bakker +Steve Robbins + +Copyright: LGPL 2.1 (see /usr/share/common-licenses/LGPL-2.1) + + +License: + + Copyright 2000-2008, Michael Feathers et al. + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License version 2.1,as published by the Free Software Foundation. + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + --- cppunit-1.12.1.orig/debian/control +++ cppunit-1.12.1/debian/control @@ -0,0 +1,45 @@ +Source: cppunit +Homepage: http://cppunit.sourceforge.net/ +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/cppunit/trunk/?op=log +Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/cppunit/trunk +Section: devel +Priority: optional +Maintainer: Steve M. Robbins +Build-Depends: debhelper (>= 8), doxygen +Standards-Version: 3.9.1 + +Package: libcppunit-1.12-1 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Unit Testing Library for C++ + CppUnit is a simple Framework for incorporating test cases in + your C++ code. It is similar to, and inspired by, xUnit and + JUnit. + +Package: libcppunit-dev +Section: devel +Architecture: any +Depends: libcppunit-1.12-1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libqttestrunner1c2a (= ${binary:Version}), libcppunit-doc +Replaces: cppunit (<< 1.10.0-3) +Description: Unit Testing Library for C++ + CppUnit is a simple Framework for incorporating test cases in + your C++ code. It is similar to, and inspired by, xUnit and + JUnit. + . + Package libqttestrunner1 is required for using the Qt-based + test runner GUI. + +Package: libcppunit-doc +Section: doc +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: cppunit (<< 1.10.0-3), libcppunit-dev (<< 1.10.2-6) +Replaces: cppunit (<< 1.10.0-3), libcppunit-dev (<< 1.10.2-6) +Description: Unit Testing Library for C++ + CppUnit is a simple Framework for incorporating test cases in + your C++ code. It is similar to, and inspired by, xUnit and + JUnit. + . + Package libqttestrunner1 is required for using the Qt-based + test runner GUI. --- cppunit-1.12.1.orig/debian/changelog +++ cppunit-1.12.1/debian/changelog @@ -0,0 +1,274 @@ +cppunit (1.12.1-3) unstable; urgency=low + + * compat: + * control: Use debhelper 8. + + * rules: + * control: Remove libqttestrunner1c2a. Closes: #604345. + + * control: Update Standards-Version, add ${misc:Depends} + * copyright: Refer to versioned LGPL. + * libcppunit-doc.doc-base: Change to section Programming. + * rules: don't ignore errors on clean/distclean. Replace dh_clean -k by + dh_prep. + + -- Steve M. Robbins Fri, 11 Feb 2011 23:57:07 -0600 + +cppunit (1.12.1-2) unstable; urgency=low + + * Acknowledge NMU (thanks, Nobuhiro Iwamatsu). Closes: #531584. + + * Move to collab-maint. + + -- Steve M. Robbins Fri, 11 Feb 2011 22:21:33 -0600 + +cppunit (1.12.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Add support Renesas SH(sh4). Closes: #531584. + - Add -mieee option to CXXFLAGS in debian/rules. + + -- Nobuhiro Iwamatsu Tue, 25 Jan 2011 12:55:46 +0900 + +cppunit (1.12.1-1) unstable; urgency=low + + * New upstream release. + - No longer uses Qt3 compatibility headers. + - Builds with g++-4.3. Closes: #441521. + + * debian/control: Remove build-dep libqt3-compat-headers. Closes: #464248. + Change from package libcppunit-1.12-0 to libcppunit-1.12-1. + + * debian/rules: Change from package libcppunit-1.12-0 to + libcppunit-1.12-1. + + * debian/copyright: Add explicit license text. Closes: #437526. + + * Fix lintian warnings: + - cppunit-config.1: Remove unknown markup ".l". + - debian/control: Add Homepage header; remove homepage from long + description. Change deprecated ${Source-Version} to ${binary:Version}. + Bump standards-version to 3.7.3.0 (no changes required). + - debian/libcppunit-doc.doc-base: Remove dangerous whitespace. + - debian/rules: Remove .cvsignore files. Remove execute bit from + example run.bat file. + + -- Steve M. Robbins Wed, 20 Feb 2008 22:43:21 -0600 + +cppunit (1.12.0-3) unstable; urgency=low + + * debian/rules: Build with -O0 on alpha. This should work around + FTBFS on alpha (#410537). + + -- Steve M. Robbins Wed, 28 Feb 2007 23:54:41 -0600 + +cppunit (1.12.0-2) unstable; urgency=low + + * src/cppunit/TestAssert.cpp: + * examples/cppunittest/TestAssertTest.cpp: Fix CPPUNIT_ASSERT_DOUBLES_EQUAL() to work + properly with NaN values (debian/patch04.assert-doubles-equal). Closes: #396865. + + * debian/rules: + * debian/examples: Add all example code to libcppunit-doc. Closes: #379968. + + -- Steve M. Robbins Fri, 10 Nov 2006 22:50:17 -0600 + +cppunit (1.12.0-1) unstable; urgency=low + + * New upstream version. Closes: #376122. + - debian/control: new lib package libcppunit-1.12-0 + - debian/rules: explicitly use qmake-qt3; tweak clean rule; + update runtime package name; add -L and -l options to dh_shlibdeps + - debian/cppunit-1.10.2-nostandalone.patch remove; incorporated upstream. + + * include/cppunit/TestResult.h: Include + - patch in debian/patch01.testresult-include-string + + * src/cppunit/Makefile.am: Link libcppunit with -ldl, add test case (this + is the fix of #338252) + - patch in debian/patch02.cppunit-link-test + + * src/qttestrunner/qttestrunnerlib.pro: Set CONFIG to build a release shared + lib; remove "_shared" from shared lib name; link against libcppunit in + directory src/cppunit/.libs + - patch in debian/patch03.qttestrunner-libname-linkage + + -- Steve M. Robbins Thu, 20 Jul 2006 23:48:51 -0400 + +cppunit (1.10.2-8) unstable; urgency=low + + * debian/control: Fix section of -doc package. + + * examples/money/MoneyTest.cpp: + * examples/money/MoneyTest.h: Replace deprecated CPPUNIT_TEST_EXCEPTION + by CPPUNIT_ASSERT_THROW. Fixes build failure on alpha. + + -- Steve M. Robbins Sat, 28 Jan 2006 15:59:30 -0500 + +cppunit (1.10.2-7) unstable; urgency=low + + * Apply sourceforge patch [997006] to enable non-standalone XML output. + Closes: #348727. + + -- Steve M. Robbins Sat, 28 Jan 2006 02:08:36 -0500 + +cppunit (1.10.2-6) unstable; urgency=low + + * Apply Roger Leigh's patch to generate a pkconfig file. Closes: + #345925. + + * debian/control: + * debian/rules: Split docs out of libcppunit-dev into libcppunit-doc. + Closes: #345924. Currently the installed size is 8M for -doc and 1M for -dev. + + * Update standards-version to 3.6.2.0 + - debian/rules: build using CFLAGS="-g -D_REENTRANT -Wl,-z,defs" by default; + honour DEB_BUILD_OPTIONS=noopt to disable optimization + + -- Steve M. Robbins Fri, 13 Jan 2006 23:43:46 -0500 + +cppunit (1.10.2-5) unstable; urgency=low + + * src/cppunit/Makefile.am: Link libcppunit with -ldl (thanks, Aurelien + Jarno). Add test case to check linking. Closes: #338252. + + * debian/rules: Run "make check" as part of build. + + * examples/hierarchy/ChessTest.h: Qualify access to base-class variable + m_game with "this->". + + * debian/control: Rename library packages to use "c2a" suffix, due to + libstdc++ allocator change. Declare conflicts & replaces with the + previous "c2" packages. Closes: #339158. + + -- Steve M. Robbins Tue, 22 Nov 2005 22:12:05 -0500 + +cppunit (1.10.2-4) unstable; urgency=low + + * GCC 4 transition. Closes: #322557. + + * debian/control: Remove obsolete "cppunit" transition package. + Closes: #321906. + + -- Steve M. Robbins Mon, 25 Jul 2005 22:01:04 -0400 + +cppunit (1.10.2-3) unstable; urgency=low + + * Rebuild i386 packages on system NOT contaminated by + experimental GCC 4.0. Closes: #303302. + + -- Steve M. Robbins Wed, 6 Apr 2005 18:29:49 -0400 + +cppunit (1.10.2-2) unstable; urgency=low + + * Rename library package to reflect the SONAME change. Package + libcppunit-1.10-2 conflicts and replaces libcppunit-1.10-0 (version + 1.10.2-1). Closes: #297026. + + -- Steve M. Robbins Sun, 3 Apr 2005 15:44:09 -0400 + +cppunit (1.10.2-1) unstable; urgency=low + + * New upstream version. + * include/cppunit/ui/qt/Config.h: Add end of file newline. Closes: #296798. + + -- Steve M. Robbins Thu, 24 Feb 2005 22:33:02 -0500 + +cppunit (1.10.0-5) unstable; urgency=high + + * cppunit.m4: Quote macro name. Closes: #264995. + + -- Steve M. Robbins Mon, 11 Oct 2004 21:14:07 -0400 + +cppunit (1.10.0-4) unstable; urgency=low + + * debian/control: Package libcppunit-dev replaces cppunit + package prior to version 1.10.0-3. Closes: #257767. + + -- Steve M. Robbins Wed, 7 Jul 2004 22:50:47 -0400 + +cppunit (1.10.0-3) unstable; urgency=low + + * debian/rules: Build shared libraries and qttestrunner (closes: #226578). + + * debian/control: Add libqt3-mt-dev and libqt3-compat-headers as + build dependencies, in order to build qttestrunner. + - New package libcppunit-1.10-0 for the shared library. + - New package libqttestrunner1 for the Qt test runner shared library. + - Files formerly in package cppunit now in libcppunit-dev. + - Package cppunit becomes a dummy package that simply depends on libcppunit-dev + for the transition. + + * config/ltmain.sh: Copy up-to-date version from /usr/share/libtool. + + -- Steve M. Robbins Thu, 24 Jun 2004 18:11:32 -0400 + +cppunit (1.10.0-2) unstable; urgency=low + + * debian/rules: Don't try to build qttestrunner. + + -- Steve M. Robbins Thu, 24 Jun 2004 16:34:06 -0400 + +cppunit (1.10.0-1) unstable; urgency=low + + * New upstream version. + - Copy up-to-date version of config.{guess,sub} from autotools-dev. + - Run "autoreconf"; this bloats the diffs, I'm afraid. + + * debian/control: Add "Depends: ${shlibs:Depends}" to get proper + dependency information. Closes: #181445. + + * debian/examples/Makefile.am: Update list of sources so that it + corresponds to those of examples/hierarchy and examples/cppunittest. + + -- Steve M. Robbins Sun, 20 Jun 2004 23:52:17 -0400 + +cppunit (1.8.0-3) unstable; urgency=low + + * Update config.guess & config.sub. Closes: #176498. + + -- Steve M. Robbins Mon, 13 Jan 2003 22:04:43 -0500 + +cppunit (1.8.0-2) unstable; urgency=low + + * Transition to GCC 3.2. + - Enable use of typeid(). Closes: #163959. + + * Document that AM_PATH_CPPUNIT requires the minimum-version argument. + Closes: #155683. + + -- Steve M. Robbins Sun, 12 Jan 2003 13:48:07 -0500 + +cppunit (1.8.0-1) unstable; urgency=low + + * New upstream release. Closes: #130788. + * Include configure.ac and Makefile.am to build the examples. + Closes: #107288. + + -- Steve M. Robbins Sat, 13 Apr 2002 11:44:23 -0400 + +cppunit (1.6.1-1) unstable; urgency=low + + * New upstream release. + * New maintainer. + * Include updated config.guess and config.sub. Closes: #104686. + * Do not supply shared library. + * Remove cppunit-config.1; upstream now installs manpage. + + -- Steve M. Robbins Sun, 30 Sep 2001 23:52:05 -0400 + +cppunit (1.5.4-2) unstable; urgency=low + + * added autoconf to build-depends (thanks to Rick Younie + ) + + -- Christian Leutloff Tue, 8 May 2001 21:43:09 +0200 + +cppunit (1.5.4-1) unstable; urgency=low + + * Initial Release (closes: #94762). + * Added manpage for cppunit-config and added --help to cppunit-config. + + -- Christian Leutloff Mon, 23 Apr 2001 19:57:19 +0200 + + --- cppunit-1.12.1.orig/debian/libcppunit-doc.README.Debian +++ cppunit-1.12.1/debian/libcppunit-doc.README.Debian @@ -0,0 +1,16 @@ + Using CppUnit with autotools + ---------------------------- + +CppUnit ships an autoconf macro that is used to detect whether the +library is available. The usage is + + AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) + +Note that the minimum version of CppUnit is mandatory. + +In /usr/share/doc/libcppunit-doc/examples, see the files README, +configure.ac, and Makefile.am for a template to follow. + + + + -- Steve M. Robbins , Sun Jan 15 22:19:00 2006 --- cppunit-1.12.1.orig/debian/rules +++ cppunit-1.12.1/debian/rules @@ -0,0 +1,107 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# This file is public domain software, originally written by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CXXFLAGS = -g -D_REENTRANT -Wl,-z,defs +export CXXFLAGS + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CXXFLAGS += -O0 +else + ifeq (m68k,$(DEB_HOST_ARCH)) + CXXFLAGS += -O0 + else ifeq (alpha,$(DEB_HOST_ARCH)) + CXXFLAGS += -O0 + else ifeq (sh4,$(DEB_HOST_ARCH)) + CXXFLAGS += -O2 -mieee + else + CXXFLAGS += -O2 + endif +endif + +build: build-stamp +build-stamp: + dh_testdir + + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + $(MAKE) + + $(MAKE) check + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + find src -name '*.o' | xargs rm -f + rm -f config.log + rm -rf lib + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) DESTDIR=`pwd`/debian/tmp \ + htmldir=/usr/share/doc/libcppunit-doc/html \ + install + + # Runtime library package + dh_install -plibcppunit-1.12-1 --autodest debian/tmp/usr/lib/lib*.so.* + + # Developer package + dh_install -plibcppunit-dev --autodest debian/tmp/usr/bin/DllPlugInTester + dh_install -plibcppunit-dev --autodest debian/tmp/usr/bin/cppunit-config + + dh_install -plibcppunit-dev --autodest debian/tmp/usr/lib/lib*.so + dh_install -plibcppunit-dev usr/lib/lib*.so usr/lib + dh_install -plibcppunit-dev --autodest debian/tmp/usr/lib/lib*.a + dh_install -plibcppunit-dev --autodest debian/tmp/usr/lib/lib*.la + dh_install -plibcppunit-dev --autodest debian/tmp/usr/lib/pkgconfig + dh_install -plibcppunit-dev --autodest debian/tmp/usr/include + + dh_installman -plibcppunit-dev debian/tmp/usr/share/man/man*/* + dh_install -plibcppunit-dev --autodest debian/tmp/usr/share/aclocal + + # Documentation package + $(MAKE) -C examples clean + dh_install -plibcppunit-doc --autodest debian/tmp/usr/share/doc + dh_installexamples -plibcppunit-doc examples/* debian/examples/* + chmod 644 debian/libcppunit-doc/usr/share/doc/libcppunit-doc/examples/qt/run.bat + find debian -name .cvsignore | xargs rm + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installmenu + dh_installcron + dh_installinfo + dh_installchangelogs + dh_link + dh_strip + dh_compress -XMakefile + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps -L libcppunit-1.12-1 -l debian/libcppunit-1.12-1/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- cppunit-1.12.1.orig/debian/examples/configure.ac +++ cppunit-1.12.1/debian/examples/configure.ac @@ -0,0 +1,24 @@ +AC_INIT(cppunit-test-example,1.0) +AM_INIT_AUTOMAKE + +AC_PROG_CXX +AC_PROG_LIBTOOL + +# Locate CppUnit (minimum version 1.8.0) for testing. +AM_PATH_CPPUNIT(1.8.0) + +# You can set up an automake conditional and use it to conditionally +# build cppunit-using test programs. +AM_CONDITIONAL(HAVE_CPPUNIT, test "$CPPUNIT_LIBS") + +AC_CONFIG_FILES([ +Makefile +ClockerPlugIn/Makefile +DumperPlugIn/Makefile +cppunittest/Makefile +hierarchy/Makefile +money/Makefile +simple/Makefile +]) +AC_OUTPUT + --- cppunit-1.12.1.orig/debian/examples/setup.sh +++ cppunit-1.12.1/debian/examples/setup.sh @@ -0,0 +1,19 @@ +#! /bin/sh + +set -e + +if ! test -d ClockerPlugIn; then + echo >&2 "Cannot find ClockerPlugIn -- run from root of examples directory." + exit 1 +fi + +gzip --force README +find . -name '*.gz' -print0 | xargs -0 gunzip -f + +mkdir -p src/cppunit +ln -f -s /usr/lib/libcppunit.la src/cppunit + +aclocal +libtoolize --automake +automake --add-missing --foreign +autoconf --- cppunit-1.12.1.orig/debian/examples/README +++ cppunit-1.12.1/debian/examples/README @@ -0,0 +1,23 @@ +This directory contains some examples of using CppUnit. + +The test "hierarchy" is a small example, demonstrating +CPPUNIT_TEST_SUITE / CPPUNIT_TEST / CPPUNIT_TEST_SUITE_END family of +macros. The "testResetShouldFail" test is included only to show the +output when a failure happens. Normally one only tests for successes. + +The test "cppunittestmain" is a test suite for CppUnit itself. +As you might expect, it is rather large. + + +You should be able to build these examples using the following +sequence of commands. + + sh setup.sh + ./configure + make check + +The CppUnit Cookbook is a good place to start -- look at +http://localhost/doc/cppunit/html/index.html. If someone +would type in this code, I'll be happy to include it in the +next release. +