[graphite2] 09/38: Import Debian changes 1.10.2-4

[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 015c45f043fff352320370dcf0153538b9369de9
Author: Steve M. Robbins <smr at debian.org>
Date:   Mon Jul 25 22:01:04 2005 -0400

    Import Debian changes 1.10.2-4
    
    cppunit (1.10.2-4) unstable; urgency=low
    
      * GCC 4 transition.  Closes: #322557.
    
      * debian/control: Remove obsolete "cppunit" transition package.
        Closes: #321906.
---
 debian/changelog |  9 +++++++++
 debian/control   | 22 ++++++++--------------
 debian/rules     |  4 ++--
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f28f10a..1b2d988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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
diff --git a/debian/control b/debian/control
index de26e2a..870736a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,19 +5,11 @@ Maintainer: Steve M. Robbins <smr at debian.org>
 Build-Depends: libqt3-mt-dev, libqt3-compat-headers, debhelper (>> 4), doxygen
 Standards-Version: 3.5.2
 
-Package: cppunit
-Architecture: any
-Depends: libcppunit-dev
-Description: Unit Testing Library for C++ [transitional package]
- This is a transitional, dummy package.
- This package simply depends on libcppunit-dev, and may be
- safely removed once the latter is installed.
-
-Package: libcppunit-1.10-2
+Package: libcppunit-1.10-2c2
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libcppunit-1.10-0 (= 1.10.2-1)
-Replaces: libcppunit-1.10-0 (= 1.10.2-1)
+Conflicts: libcppunit-1.10-0 (= 1.10.2-1), libcppunit-1.10-2
+Replaces: libcppunit-1.10-0 (= 1.10.2-1), libcppunit-1.10-2
 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
@@ -26,9 +18,11 @@ Description: Unit Testing Library for C++
  For more information on CppUnit visit the project homepage
  http://cppunit.sourceforge.net/ .
 
-Package: libqttestrunner1
+Package: libqttestrunner1c2
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libqttestrunner1
+Replaces: libqttestrunner1
 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
@@ -41,8 +35,8 @@ Description: Unit Testing Library for C++
 
 Package: libcppunit-dev
 Architecture: any
-Depends: libcppunit-1.10-2 (= ${Source-Version}), ${shlibs:Depends}
-Suggests: libqttestrunner1 (= ${Source-Version})
+Depends: libcppunit-1.10-2c2 (= ${Source-Version}), ${shlibs:Depends}
+Suggests: libqttestrunner1c2 (= ${Source-Version})
 Replaces: cppunit (<< 1.10.0-3)
 Description: Unit Testing Library for C++
  CppUnit is a simple Framework for incorporating test cases in 
diff --git a/debian/rules b/debian/rules
index fecab29..04c745b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,10 +49,10 @@ install: build
 		install
 
 	# Runtime library package
-	dh_install -plibcppunit-1.10-2 --autodest debian/tmp/usr/lib/lib*.so.*
+	dh_install -plibcppunit-1.10-2c2 --autodest debian/tmp/usr/lib/lib*.so.*
 
 	# Qt Test runner library package
-	dh_install -plibqttestrunner1 lib/lib*.so.* usr/lib
+	dh_install -plibqttestrunner1c2 lib/lib*.so.* usr/lib
 
 	# Developer package
 	dh_install -plibcppunit-dev --autodest debian/tmp/usr/bin/DllPlugInTester

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