[cppunit] 25/38: Import Debian changes 1.13.0-1

Rene Engelhard rene at moszumanska.debian.org
Sun May 14 10:57:38 UTC 2017


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

rene pushed a commit to branch experimental
in repository cppunit.

commit 9f3a5f8c2721422f4c1157b9d82f28085637a7cb
Merge: a23df86 63f0533
Author: Steve M. Robbins <smr at debian.org>
Date:   Sat Sep 15 23:01:26 2012 -0500

    Import Debian changes 1.13.0-1
    
    cppunit (1.13.0-1) experimental; urgency=low
    
      * New upstream.
        - Switch to new upstream maintainers at freedesktop.org.
    
      * patches/link-with-dl.patch:
      * patches/gcc-symbol-demangle.patch:
      * patches/test-progress-flush.patch: Remove.  Applied upstream.
    
      * rules: Rewrite to use 'dh' at debhelper level 9.  Install into
        multi-arch directories.  Do not ship libtool .la file.
    
      * control: Update for multi-arch, new upstream version.

 ChangeLog                                          |    82 +
 CodingGuideLines.txt                               |    13 +
 INSTALL-unix                                       |     6 +-
 Makefile.in                                        |   420 +-
 NEWS                                               |    41 +
 README                                             |    10 +-
 aclocal.m4                                         |  6981 +---
 config/ac_create_prefix_config_h.m4                |     2 +-
 config/ac_cxx_have_sstream.m4                      |     2 +-
 config/ac_cxx_namespaces.m4                        |     2 +-
 config/ac_cxx_rtti.m4                              |     2 +-
 config/ax_cxx_gcc_abi_demangle.m4                  |     3 +-
 config/config.guess                                |   363 +-
 config/config.h.in                                 |     7 +
 config/config.sub                                  |    91 +-
 config/depcomp                                     |    87 +-
 config/install-sh                                  |     5 +-
 config/libtool.m4                                  |  7831 +++++
 config/ltmain.sh                                   | 14818 +++++----
 config/ltoptions.m4                                |   369 +
 config/ltsugar.m4                                  |   123 +
 config/ltversion.m4                                |    23 +
 config/lt~obsolete.m4                              |    98 +
 config/missing                                     |    49 +-
 configure                                          | 32242 ++++++++-----------
 configure.in                                       |    50 +-
 cppunit.spec                                       |     2 +-
 debian/changelog                                   |    16 +
 debian/compat                                      |     2 +-
 debian/control                                     |    22 +-
 debian/patches/gcc-symbol-demangle.patch           |    31 -
 debian/patches/link-with-dl.patch                  |    34 -
 debian/patches/qttestrunner-libname-linkage.patch  |    42 -
 debian/patches/series                              |     3 -
 debian/patches/test-progress-flush.patch           |    48 -
 debian/rules                                       |   102 +-
 doc/Makefile.am                                    |     7 +-
 doc/Makefile.in                                    |   122 +-
 doc/cookbook.dox                                   |     2 +-
 doc/footer.html                                    |    11 +-
 doc/header.html                                    |     5 +-
 examples/ClockerPlugIn/Makefile.in                 |    75 +-
 examples/DumperPlugIn/Makefile.in                  |    75 +-
 examples/Makefile.in                               |   169 +-
 examples/cppunittest/Makefile.am                   |     7 +-
 examples/cppunittest/Makefile.in                   |   235 +-
 examples/cppunittest/MockTestCase.cpp              |     2 +-
 examples/cppunittest/OrthodoxTest.h                |     4 +-
 examples/cppunittest/TestAssertTest.cpp            |     4 +
 examples/cppunittest/XmlOutputterTest.cpp          |    22 +-
 examples/cppunittest/assertion_traitsTest.cpp      |     2 +-
 examples/hierarchy/Makefile.am                     |     5 +-
 examples/hierarchy/Makefile.in                     |   235 +-
 examples/hierarchy/main.cpp                        |     2 +-
 examples/money/Makefile.am                         |     6 +-
 examples/money/Makefile.in                         |   256 +-
 examples/money/MoneyApp.cpp                        |     2 +-
 examples/money/MoneyTest.cpp                       |     2 +-
 examples/money/MoneyTest.h                         |     2 +-
 examples/msvc6/.cvsignore                          |     1 -
 examples/msvc6/CppUnitTestApp/.cvsignore           |     3 -
 .../msvc6/CppUnitTestApp/CppUnitTestApp.vcproj     |  1164 +
 examples/msvc6/HostApp/.cvsignore                  |     5 -
 examples/msvc6/HostApp/HostApp.vcproj              |  1115 +
 examples/msvc6/HostApp/res/.cvsignore              |     1 -
 examples/msvc6/TestPlugIn/.cvsignore               |     1 -
 examples/qt/.cvsignore                             |     1 -
 examples/simple/Main.cpp                           |     2 +-
 examples/simple/Makefile.am                        |     5 +-
 examples/simple/Makefile.in                        |   182 +-
 include/Makefile.in                                |   169 +-
 include/cppunit/Makefile.in                        |   208 +-
 include/cppunit/Message.h                          |     2 +
 include/cppunit/Portability.h                      |    10 +-
 include/cppunit/TestAssert.h                       |    15 +
 include/cppunit/config/Makefile.in                 |   139 +-
 include/cppunit/config/config-msvc6.h              |     3 +
 .../extensions/ExceptionTestCaseDecorator.h        |     2 +-
 include/cppunit/extensions/HelperMacros.h          |    22 +-
 include/cppunit/extensions/Makefile.in             |   139 +-
 include/cppunit/extensions/TestCaseDecorator.h     |     9 +-
 include/cppunit/extensions/TestDecorator.h         |     2 +-
 include/cppunit/plugin/Makefile.in                 |   139 +-
 include/cppunit/plugin/TestPlugIn.h                |     8 +-
 include/cppunit/plugin/TestPlugInDefaultImpl.h     |     9 +
 include/cppunit/portability/FloatingPoint.h        |     5 +
 include/cppunit/portability/Makefile.in            |   139 +-
 include/cppunit/tools/Makefile.in                  |   139 +-
 include/cppunit/ui/Makefile.in                     |   169 +-
 include/cppunit/ui/mfc/Makefile.in                 |   139 +-
 include/cppunit/ui/qt/Makefile.in                  |   139 +-
 include/cppunit/ui/text/Makefile.in                |   139 +-
 include/msvc6/.cvsignore                           |     0
 src/DllPlugInTester/CommandLineParserTest.cpp      |     3 +-
 src/DllPlugInTester/DllPlugInTesterTest.cpp        |     2 +-
 src/DllPlugInTester/Makefile.am                    |    10 +-
 src/DllPlugInTester/Makefile.in                    |   303 +-
 src/Makefile.in                                    |   169 +-
 src/cppunit/BriefTestProgressListener.cpp          |     2 +-
 src/cppunit/Makefile.am                            |     5 +-
 src/cppunit/Makefile.in                            |   214 +-
 src/cppunit/Message.cpp                            |     4 +
 src/cppunit/TestFactoryRegistry.cpp                |     2 +-
 src/cppunit/TestPlugInDefaultImpl.cpp              |    12 +-
 src/cppunit/TestResult.cpp                         |     3 +
 src/cppunit/TestSuccessListener.cpp                |     2 +-
 src/cppunit/TextTestProgressListener.cpp           |     8 +-
 src/cppunit/TypeInfoHelper.cpp                     |     1 +
 src/cppunit/XmlOutputterHook.cpp                   |    22 +-
 src/msvc6/DSPlugIn/.cvsignore                      |     7 -
 src/msvc6/DllPlugInTester/.cvsignore               |     5 -
 src/msvc6/testpluginrunner/.cvsignore              |     6 -
 src/msvc6/testpluginrunner/TestPlugInRunner.vcproj |  1114 +
 .../testpluginrunner/TestPlugInRunner.vcxproj      |   276 +
 src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp |     2 +-
 src/msvc6/testrunner/.cvsignore                    |     5 -
 src/msvc6/testrunner/MsDevCallerListCtrl.cpp       |     8 +-
 src/msvc6/testrunner/TestRunner.vcproj             |  1597 +
 src/msvc6/testrunner/TestRunner.vcxproj            |   412 +
 src/qttestrunner/.cvsignore                        |    10 -
 src/qttestrunner/Makefile                          |   315 -
 src/qttestrunner/MostRecentTests.h~                |    62 -
 src/qttestrunner/TestRunnerModel.h~                |   154 -
 123 files changed, 40705 insertions(+), 33529 deletions(-)

diff --cc debian/changelog
index fe667f5,0000000..940702c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,291 -1,0 +1,307 @@@
++cppunit (1.13.0-1) experimental; urgency=low
++
++  * New upstream.
++    - Switch to new upstream maintainers at freedesktop.org.
++
++  * patches/link-with-dl.patch:
++  * patches/gcc-symbol-demangle.patch:
++  * patches/test-progress-flush.patch: Remove.  Applied upstream.
++  
++  * rules: Rewrite to use 'dh' at debhelper level 9.  Install into
++    multi-arch directories.  Do not ship libtool .la file.
++  
++  * control: Update for multi-arch, new upstream version.
++
++ -- Steve M. Robbins <smr at debian.org>  Sat, 15 Sep 2012 23:01:26 -0500
++
 +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:
 +  * 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 <smr at debian.org>  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 <smr at debian.org>  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 <iwamatsu at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <string>
 +    - 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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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 <smr at debian.org>  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
 +    <younie at debian.org>)
 +
 + -- Christian Leutloff <leutloff at debian.org>  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 <leutloff at debian.org>  Mon, 23 Apr 2001 19:57:19 +0200
 +
 +
diff --cc debian/compat
index 45a4fb7,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 8
++9
diff --cc debian/control
index b750902,0000000..84f482a
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,45 -1,0 +1,41 @@@
 +Source: cppunit
- Homepage: http://cppunit.sourceforge.net/
++Homepage: http://www.freedesktop.org/wiki/Software/cppunit
 +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 <smr at debian.org>
- Build-Depends: debhelper (>= 8), dh-autoreconf, doxygen
- Standards-Version: 3.9.2
++Build-Depends: debhelper (>= 9), doxygen
++Standards-Version: 3.9.3
 +
- Package: libcppunit-1.12-1
++Package: libcppunit-1.13-0
 +Architecture: any
++Multi-Arch: same
 +Depends: ${shlibs:Depends}, ${misc:Depends}
++Pre-Depends: ${misc:Pre-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
++Depends: libcppunit-1.13-0 (= ${binary:Version}), ${misc:Depends}
++Suggests: 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}
++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.
diff --cc debian/patches/series
index 4e43161,0000000..56224fb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,1 @@@
- link-with-dl.patch
 +cppunit-config-manpage.patch
- gcc-symbol-demangle.patch
- test-progress-flush.patch
diff --cc debian/rules
index a622f8f,0000000..143c808
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,111 -1,0 +1,27 @@@
 +#!/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
++%:
++	dh $@ --parallel
 +
- 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
- 
- 	dh_autoreconf
- 	./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_autoreconf_clean
- 	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
- 
- 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 +
++override_dh_install:
 +	# Runtime library package
- 	dh_install -plibcppunit-1.12-1 --autodest debian/tmp/usr/lib/lib*.so.*
++	dh_install -plibcppunit-1.13-0 --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/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/lib/*/lib*.so
++	dh_install -plibcppunit-dev --autodest debian/tmp/usr/lib/*/lib*.a
++	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_installdocs -plibcppunit-doc doc/html
 +	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/cppunit.git



More information about the Pkg-openoffice-commits mailing list