[graphite2] 22/38: Import Debian changes 1.12.1-3

[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 63a4535c3b7f8fd54bf70ff1b39bc91211611e5a
Author: Steve M. Robbins <smr at debian.org>
Date:   Fri Feb 11 23:57:07 2011 -0600

    Import Debian changes 1.12.1-3
    
    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.
---
 debian/changelog               | 16 ++++++++++++++++
 debian/compat                  |  2 +-
 debian/control                 | 22 +++++-----------------
 debian/copyright               |  5 +----
 debian/libcppunit-doc.doc-base |  2 +-
 debian/rules                   | 19 +++----------------
 6 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fde81f..ee4e331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+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.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index 29f9169..d928c1b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,33 +5,21 @@ 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: libqt3-mt-dev, debhelper (>= 5), doxygen
-Standards-Version: 3.7.3.0
+Build-Depends: debhelper (>= 8), doxygen
+Standards-Version: 3.9.1
 
 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.
-
-Package: libqttestrunner1c2a
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libqttestrunner1, libqttestrunner1c2
-Replaces: libqttestrunner1, libqttestrunner1c2
+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.
- .
- This package provides a Qt-based GUI for running tests.
 
 Package: libcppunit-dev
-Section: libdevel
+Section: devel
 Architecture: any
-Depends: libcppunit-1.12-1 (= ${binary:Version}), ${shlibs:Depends}
+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++
diff --git a/debian/copyright b/debian/copyright
index 83d94e6..f2e09a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ 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)
+Copyright: LGPL 2.1 (see /usr/share/common-licenses/LGPL-2.1)
 
 
 License:
@@ -28,6 +28,3 @@ License:
 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 --git a/debian/libcppunit-doc.doc-base b/debian/libcppunit-doc.doc-base
index 988962c..9ed02f1 100644
--- a/debian/libcppunit-doc.doc-base
+++ b/debian/libcppunit-doc.doc-base
@@ -2,7 +2,7 @@ Document: cppunit
 Title: CppUnit Cookbook
 Author: Michael Feathers and others
 Abstract: A short cookbook to help the user getting started with CppUnit.
-Section: devel
+Section: Programming
 
 Format: HTML
 Index: /usr/share/doc/libcppunit-doc/html/index.html
diff --git a/debian/rules b/debian/rules
index 4e6ccce..3bf28df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,6 @@ build-stamp:
 	./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
@@ -41,16 +38,9 @@ clean:
 	dh_testroot
 	rm -f build-stamp
 
-	-$(MAKE) clean
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(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
@@ -58,7 +48,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) DESTDIR=`pwd`/debian/tmp \
@@ -68,15 +58,12 @@ install: build
 	# Runtime library package
 	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 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

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