[graphite2] 18/38: Import Debian changes 1.12.1-1

Rene Engelhard rene at moszumanska.debian.org
Sun May 14 10:53:44 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 920f53cb638a66bea71bf6f26e3e78031a2005a0
Merge: 4619950 d9ba08e
Author: Steve M. Robbins <smr at debian.org>
Date:   Wed Feb 20 22:43:21 2008 -0600

    Import Debian changes 1.12.1-1
    
    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.

 ChangeLog                                          |  399 ++-
 Makefile.am                                        |    5 +-
 Makefile.in                                        |  165 +-
 NEWS                                               |   13 +
 THANKS                                             |    2 +-
 aclocal.m4                                         |  898 +++--
 config/ax_cxx_have_isfinite.m4                     |   27 +
 config/bb_enable_doxygen.m4                        |    2 +-
 config/config.guess                                |  681 ++--
 config/config.h.in                                 |    6 +
 config/config.sub                                  |  189 +-
 config/depcomp                                     |  100 +-
 config/install-sh                                  |  514 ++-
 config/ltmain.sh                                   | 1152 +++++--
 config/missing                                     |   68 +-
 configure                                          | 3640 ++++++++++----------
 configure.in                                       |    8 +-
 cppunit-config.1                                   |    2 +-
 cppunit.spec                                       |    2 +-
 debian/changelog                                   |   25 +
 debian/control                                     |   24 +-
 debian/copyright                                   |   14 +
 debian/libcppunit-doc.doc-base                     |    2 -
 debian/rules                                       |    7 +-
 doc/Makefile.in                                    |   94 +-
 doc/cookbook.dox                                   |    2 +-
 examples/ClockerPlugIn/Makefile.in                 |   84 +-
 examples/DumperPlugIn/Makefile.in                  |   84 +-
 examples/Makefile.in                               |  129 +-
 examples/cppunittest/CppUnitTestMain.dsp           |    8 +
 examples/cppunittest/Makefile.am                   |    2 +
 examples/cppunittest/Makefile.in                   |  156 +-
 examples/cppunittest/MockFunctor.h                 |    4 +-
 examples/cppunittest/MockProtector.h               |    6 +-
 examples/cppunittest/TestAssertTest.cpp            |   72 +-
 examples/cppunittest/TestAssertTest.h              |    6 +-
 examples/cppunittest/XmlOutputterTest.cpp          |    6 +-
 examples/cppunittest/XmlUniformiser.cpp            |    4 +-
 examples/cppunittest/assertion_traitsTest.cpp      |   35 +
 examples/cppunittest/assertion_traitsTest.h        |   27 +
 examples/hierarchy/Makefile.am                     |    2 +
 examples/hierarchy/Makefile.in                     |  148 +-
 examples/hierarchy/main.cpp                        |    6 +-
 examples/money/Makefile.in                         |  169 +-
 examples/money/MoneyTest.cpp                       |    2 +-
 examples/money/MoneyTest.h                         |    2 +-
 examples/msvc6/CppUnitTestApp/CppUnitTestApp.rc    |   18 +-
 examples/simple/Makefile.in                        |  138 +-
 include/Makefile.in                                |  129 +-
 include/cppunit/Makefile.in                        |  142 +-
 include/cppunit/TestAssert.h                       |    9 +
 include/cppunit/TestResult.h                       |    2 +-
 include/cppunit/XmlOutputterHook.h                 |    2 +
 include/cppunit/config/Makefile.in                 |  100 +-
 include/cppunit/config/config-evc4.h               |    5 +
 include/cppunit/config/config-msvc6.h              |    5 +
 include/cppunit/extensions/Makefile.in             |  100 +-
 include/cppunit/extensions/TestFixtureFactory.h    |    2 +
 include/cppunit/plugin/Makefile.in                 |  100 +-
 include/cppunit/plugin/TestPlugIn.h                |    2 +
 include/cppunit/portability/FloatingPoint.h        |   54 +
 include/cppunit/portability/Makefile.am            |   11 +-
 include/cppunit/portability/Makefile.in            |  111 +-
 include/cppunit/tools/Makefile.in                  |  100 +-
 include/cppunit/ui/Makefile.in                     |  129 +-
 include/cppunit/ui/mfc/Makefile.in                 |  100 +-
 include/cppunit/ui/qt/Config.h                     |    2 +-
 include/cppunit/ui/qt/Makefile.in                  |  100 +-
 include/cppunit/ui/text/Makefile.in                |  100 +-
 lib/.keepme                                        |    0
 src/DllPlugInTester/CommandLineParser.cpp          |    4 +-
 src/DllPlugInTester/Makefile.in                    |  160 +-
 src/Makefile.in                                    |  129 +-
 src/cppunit/DynamicLibraryManagerException.cpp     |    4 +-
 src/cppunit/Makefile.in                            |  163 +-
 src/cppunit/TestAssert.cpp                         |   25 +-
 src/cppunit/TestCaseDecorator.cpp                  |    4 +-
 src/cppunit/TextTestRunner.cpp                     |    4 +-
 src/cppunit/Win32DynamicLibraryManager.cpp         |   10 +-
 src/cppunit/XmlDocument.cpp                        |    4 +-
 src/cppunit/cppunit.dsp                            |    4 +
 src/msvc6/DSPlugIn/DSPlugIn.dsp                    |    2 -
 src/msvc6/testpluginrunner/TestPlugInRunner.rc     |   54 +-
 src/msvc6/testrunner/TestRunner.rc                 |   14 +-
 src/qttestrunner/Makefile                          |  315 ++
 src/qttestrunner/MostRecentTests.h                 |    2 +-
 .../{MostRecentTests.h => MostRecentTests.h~}      |    0
 src/qttestrunner/TestRunnerModel.h                 |    2 +-
 .../{TestRunnerModel.h => TestRunnerModel.h~}      |    0
 89 files changed, 6791 insertions(+), 4563 deletions(-)

diff --cc cppunit-config.1
index baa8b58,baa8b58..6f829fc
--- a/cppunit-config.1
+++ b/cppunit-config.1
@@@ -12,7 -12,7 +12,7 @@@ programs that use \fIcppunit\fP. It is 
  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 --cc debian/changelog
index 21652f6,0000000..325181d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,217 -1,0 +1,242 @@@
++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/control
index aa86884,0000000..7183ba2
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,65 -1,0 +1,55 @@@
 +Source: cppunit
++Homepage: http://cppunit.sourceforge.net/
 +Section: devel
 +Priority: optional
 +Maintainer: Steve M. Robbins <smr at debian.org>
- Build-Depends: libqt3-mt-dev, libqt3-compat-headers, debhelper (>= 5), doxygen
- Standards-Version: 3.7.2.0
++Build-Depends: libqt3-mt-dev, debhelper (>= 5), doxygen
++Standards-Version: 3.7.3.0
 +
- Package: libcppunit-1.12-0
++Package: libcppunit-1.12-1
 +Architecture: any
 +Depends: ${shlibs: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.
-  .
-  For more information on CppUnit visit the project homepage
-  http://cppunit.sourceforge.net/ .
 +
 +Package: libqttestrunner1c2a
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Conflicts: libqttestrunner1, libqttestrunner1c2
 +Replaces: libqttestrunner1, libqttestrunner1c2
 +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.
 + .
 + This package provides a Qt-based GUI for running tests.
-  .
-  For more information on CppUnit visit the project homepage
-  http://cppunit.sourceforge.net/ .
 +
 +Package: libcppunit-dev
++Section: libdevel
 +Architecture: any
- Depends: libcppunit-1.12-0 (= ${Source-Version}), ${shlibs:Depends}
- Suggests: libqttestrunner1c2a (= ${Source-Version}), libcppunit-doc
++Depends: libcppunit-1.12-1 (= ${binary:Version}), ${shlibs: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.
-  .
-  For more information on CppUnit visit the project homepage
-  http://cppunit.sourceforge.net/ .
 +
 +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.
-  .
-  For more information on CppUnit visit the project homepage
-  http://cppunit.sourceforge.net/ .
diff --cc debian/copyright
index f80dff4,0000000..83d94e6
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,19 -1,0 +1,33 @@@
 +This package was debianized by Christian Leutloff <leutloff at debian.org> 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 <mfeathers at objectmentor.com> 
 +Jerome Lacoste <lacostej at altern.org>          
 +E. Sommerlade <eric at sommerla.de>              
 +J.E. Hoffmann <je-h at gmx.net>                  
 +Baptiste Lepilleur <gaiacrtn at free.fr>
 +Bastiaan Bakker <bastiaan.bakker at lifeline.nl>
++Steve Robbins <smr99 at sourceforge.net>
 +
 +Copyright: LGPL (see /usr/share/common-licenses/LGPL)
 +
 +
++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'.
++
++The Debian packaging is (C) 2001-2008, Steven Robbins <smr at debian.org>
++and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
 +
diff --cc debian/libcppunit-doc.doc-base
index 5d0969e,0000000..988962c
mode 100644,000000..100644
--- a/debian/libcppunit-doc.doc-base
+++ b/debian/libcppunit-doc.doc-base
@@@ -1,11 -1,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: devel
 +
 +Format: HTML
 +Index: /usr/share/doc/libcppunit-doc/html/index.html
 +Files: /usr/share/doc/libcppunit-doc/html/*.html
- 
-   
diff --cc debian/rules
index 8f23604,0000000..fd2eb11
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,117 -1,0 +1,118 @@@
 +#!/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
 +        CXXFLAGS += -O2
 +    endif
 +endif
 +
 +build: build-stamp
 +build-stamp:
 +	dh_testdir
 +
 +	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
 +	$(MAKE)
 +
 +	cd src/qttestrunner && qmake-qt3 qttestrunnerlib.pro
 +	$(MAKE) -C src/qttestrunner
 +
 +	$(MAKE) check
 +
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp
 +
 +	-$(MAKE) clean
 +	-$(MAKE) distclean
 +	find src -name '*.o' | xargs rm -f
 +	rm -f config.log
 +
 +	-$(MAKE) -C src/qttestrunner clean
 +	rm -rf src/qttestrunner/Makefile
 +	rm -rf src/qttestrunner/.moc
 +	rm -rf src/qttestrunner/.obj*
 +
 +	rm -rf lib
 +
 +	dh_clean
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k
 +	dh_installdirs
 +
 +	$(MAKE) DESTDIR=`pwd`/debian/tmp \
 +		htmldir=/usr/share/doc/libcppunit-doc/html \
 +		install
 +
 +	# Runtime library package
- 	dh_install -plibcppunit-1.12-0 --autodest debian/tmp/usr/lib/lib*.so.*
++	dh_install -plibcppunit-1.12-1 --autodest debian/tmp/usr/lib/lib*.so.*
 +
 +	# Qt Test runner library package
 +	dh_install -plibqttestrunner1c2a lib/lib*.so.* usr/lib
 +
 +	# 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 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-0 -l debian/libcppunit-1.12-0/usr/lib
++	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
diff --cc src/cppunit/Makefile.in
index addf23b,aa68cb0..188e1d4
--- a/src/cppunit/Makefile.in
+++ b/src/cppunit/Makefile.in
@@@ -40,7 -36,6 +36,8 @@@ 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
@@@ -89,30 -85,32 +87,35 @@@ am_libcppunit_la_OBJECTS = AdditionalMe
  	XmlDocument.lo XmlElement.lo XmlOutputter.lo \
  	XmlOutputterHook.lo Win32DynamicLibraryManager.lo
  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. -I$(srcdir) -I$(top_builddir)/config
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/config
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ 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)
@@@ -297,11 -300,8 +305,10 @@@ 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
 +t_link_SOURCES = t_link.cpp
 +t_link_LDADD = libcppunit.la
  all: all-am
  
  .SUFFIXES:
@@@ -363,18 -363,8 +370,18 @@@ clean-libLTLIBRARIES
  	  rm -f "$${dir}/so_locations"; \
  	done
  libcppunit.la: $(libcppunit_la_OBJECTS) $(libcppunit_la_DEPENDENCIES) 
- 	$(CXXLINK) -rpath $(libdir) $(libcppunit_la_LDFLAGS) $(libcppunit_la_OBJECTS) $(libcppunit_la_LIBADD) $(LIBS)
+ 	$(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_LDFLAGS) $(t_link_OBJECTS) $(t_link_LDADD) $(LIBS)
++	$(CXXLINK) $(t_link_OBJECTS) $(t_link_LDADD) $(LIBS)
 +
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
  
@@@ -430,11 -420,10 +437,11 @@@ 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@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
@@@ -511,96 -495,22 +513,95 @@@ 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; \
++	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 +	srcdir=$(srcdir); export srcdir; \
- 	list='$(TESTS)'; \
++	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 \
- 	      *" $$tst "*) \
++	      *$$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 \
- 	      *" $$tst "*) \
++	      *$$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'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
- 	  case $$file in \
- 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- 	  esac; \
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ 	list='$(DISTFILES)'; \
+ 	  dist_files=`for file in $$list; do echo $$file; done | \
+ 	  sed -e "s|^$$srcdirstrip/||;t" \
+ 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ 	case $$dist_files in \
+ 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+ 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ 			   sort -u` ;; \
+ 	esac; \
+ 	for file in $$dist_files; do \
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
- 	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
  	  if test -d $$d/$$file; then \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  	    fi; \
@@@ -693,20 -609,23 +702,24 @@@ ps: ps-a
  
  ps-am:
  
- uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ uninstall-am: uninstall-libLTLIBRARIES
+ 
+ .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-exec install-exec-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-strip installcheck installcheck-am \
++	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-info-am uninstall-libLTLIBRARIES
++	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.

-- 
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