[graphite2] 13/38: Import Debian changes 1.10.2-8

[Rene Engelhard]

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

rene pushed a commit to branch experimental
in repository graphite2.

commit bc8dd1507420451583a131dc4b4c10d1cd096181
Author: Steve M. Robbins <smr at debian.org>
Date:   Sat Jan 28 15:59:30 2006 -0500

    Import Debian changes 1.10.2-8
    
    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.
---
 debian/changelog             | 10 ++++++++++
 debian/control               |  1 +
 examples/money/MoneyTest.cpp |  2 +-
 examples/money/MoneyTest.h   |  2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1261c14..ce662ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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.
diff --git a/debian/control b/debian/control
index f7108b2..37a0617 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Description: Unit Testing Library for C++
  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)
diff --git a/examples/money/MoneyTest.cpp b/examples/money/MoneyTest.cpp
index bdebbc5..f15e0ff 100644
--- a/examples/money/MoneyTest.cpp
+++ b/examples/money/MoneyTest.cpp
@@ -78,5 +78,5 @@ MoneyTest::testAddThrow()
 
   // Process
   Money money( 123, "USD" );
-  money += money123FF;        // should throw an exception
+  CPPUNIT_ASSERT_THROW( money += money123FF, IncompatibleMoneyError );
 }
diff --git a/examples/money/MoneyTest.h b/examples/money/MoneyTest.h
index 44e1808..475f2e9 100644
--- a/examples/money/MoneyTest.h
+++ b/examples/money/MoneyTest.h
@@ -10,7 +10,7 @@ class MoneyTest : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST( testConstructor );
   CPPUNIT_TEST( testEqual );
   CPPUNIT_TEST( testAdd );
-  CPPUNIT_TEST_EXCEPTION( testAddThrow, IncompatibleMoneyError );
+  CPPUNIT_TEST( testAddThrow );
   CPPUNIT_TEST_SUITE_END();
 
 public:

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