diff -Nru cppunit-1.15.1/debian/changelog cppunit-1.15.1/debian/changelog --- cppunit-1.15.1/debian/changelog 2020-03-24 14:02:55.000000000 +0000 +++ cppunit-1.15.1/debian/changelog 2021-09-10 21:00:23.000000000 +0000 @@ -1,12 +1,45 @@ -cppunit (1.15.1-2build1) focal; urgency=medium +cppunit (1.15.1-3) unstable; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * Team upload. - -- Matthias Klose Tue, 24 Mar 2020 15:02:55 +0100 + [ Debian Janitor ] + * Trim trailing whitespace. + * Use secure URI in Homepage field. + * Apply multi-arch hints. + + libcppunit-dev: Add Multi-Arch: same. + + libcppunit-doc: Add Multi-Arch: foreign. + + [ Mattia Rizzolo ] + * d/rules: + + Do not install examples Makefile (that are autogenerated by automake + anyway): they contain build-host-specific details and are unreproducible. + Thanks to Vagrant Cascadian for the initial patch. Closes: #990327 + + Make the logic for the indep/arch builds more obvious. + + Move the installation parts from override_dh_install to debhelper + .install files. + + Temporarily set --doc-main-package to retain the behaviour pre-compat-11. + + Install the FAQ file, and add a symlink in the right place so that the + HTML docs resolve correctly to it. Closes: #883796 + + Remove spurious hidden files from the examples, that should have + never been there. + * d/control: + + Mark as Rules-Requires-Root: no. + + Drop old obsoleted Replaces/Conflicts. + + Use debhelper-compat(=10) and drop d/compat. + + Bump Standards-Version to 4.6.0, no changes needed. + + Bump debhelper compat level to 13: + + Add d/not-installed for the new dh_missing helper. + + Add Build-Depends-Indep:graphviz, to generate the png files used in the + docs (previously we were shipping the .dot files instead, as the build + system doesn't fail due to missing `dot`). + + De-duplicate the binary package descriptions. + * Use version=4 and https in debian/watch. + + -- Mattia Rizzolo Fri, 10 Sep 2021 23:00:23 +0200 cppunit (1.15.1-2) unstable; urgency=medium - * upload to unstable + * upload to unstable -- Rene Engelhard Wed, 01 Jan 2020 22:45:37 +0100 @@ -20,8 +53,8 @@ cppunit (1.14.0-4) unstable; urgency=medium - * debian/patches/gcc9.diff: backport from git (closes: #925661) - * debian/*.README.Debian: remove (closes: #908523) + * debian/patches/gcc9.diff: backport from git (closes: #925661) + * debian/*.README.Debian: remove (closes: #908523) -- Rene Engelhard Mon, 29 Jul 2019 21:49:12 +0200 @@ -43,7 +76,7 @@ * New upstream release (closes: #861718) * move Maintainer to Debian LibreOffice Maintainers (with Steves - permission) - as upstream is TDF anyway. Keep smr in Uploaders: and + permission) - as upstream is TDF anyway. Keep smr in Uploaders: and add me -- Rene Engelhard Sun, 14 May 2017 19:38:56 +0200 @@ -82,7 +115,7 @@ cppunit (1.13.1-1) experimental; urgency=low * New upstream. - + * watch: Update to freedesktop.org URL. * rules: Split override_dh_install into arch & indep overrides. Fixes @@ -99,10 +132,10 @@ * 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 Sat, 15 Sep 2012 23:01:26 -0500 @@ -112,7 +145,7 @@ * 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 / @@ -121,14 +154,14 @@ * patches/test-progress-flush.patch: New. Upstream change sets to avoid losing test runner messages. Closes: #400867. - + -- Steve M. Robbins Sun, 11 Dec 2011 00:26:51 -0600 cppunit (1.12.1-3) unstable; urgency=low * compat: - * control: Use debhelper 8. - + * control: Use debhelper 8. + * rules: * control: Remove libqttestrunner1c2a. Closes: #604345. @@ -161,18 +194,18 @@ * 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 + - 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. @@ -194,19 +227,19 @@ * 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/rules: * debian/examples: Add all example code to libcppunit-doc. Closes: #379968. - + -- Steve M. Robbins 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; + - 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 - patch in debian/patch01.testresult-include-string @@ -224,11 +257,11 @@ 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 + * examples/money/MoneyTest.h: Replace deprecated CPPUNIT_TEST_EXCEPTION by CPPUNIT_ASSERT_THROW. Fixes build failure on alpha. - + -- Steve M. Robbins Sat, 28 Jan 2006 15:59:30 -0500 cppunit (1.10.2-7) unstable; urgency=low @@ -246,9 +279,9 @@ * 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; + - debian/rules: build using CFLAGS="-g -D_REENTRANT -Wl,-z,defs" by default; honour DEB_BUILD_OPTIONS=noopt to disable optimization -- Steve M. Robbins Fri, 13 Jan 2006 23:43:46 -0500 @@ -257,14 +290,14 @@ * 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 + libstdc++ allocator change. Declare conflicts & replaces with the previous "c2" packages. Closes: #339158. -- Steve M. Robbins Tue, 22 Nov 2005 22:12:05 -0500 @@ -272,8 +305,8 @@ cppunit (1.10.2-4) unstable; urgency=low * GCC 4 transition. Closes: #322557. - - * debian/control: Remove obsolete "cppunit" transition package. + + * debian/control: Remove obsolete "cppunit" transition package. Closes: #321906. -- Steve M. Robbins Mon, 25 Jul 2005 22:01:04 -0400 @@ -314,9 +347,9 @@ -- Steve M. Robbins 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. @@ -340,10 +373,10 @@ * 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. @@ -393,8 +426,6 @@ cppunit (1.5.4-1) unstable; urgency=low * Initial Release (closes: #94762). - * Added manpage for cppunit-config and added --help to cppunit-config. + * Added manpage for cppunit-config and added --help to cppunit-config. -- Christian Leutloff Mon, 23 Apr 2001 19:57:19 +0200 - - diff -Nru cppunit-1.15.1/debian/compat cppunit-1.15.1/debian/compat --- cppunit-1.15.1/debian/compat 2019-08-13 18:09:03.000000000 +0000 +++ cppunit-1.15.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru cppunit-1.15.1/debian/control cppunit-1.15.1/debian/control --- cppunit-1.15.1/debian/control 2020-01-01 21:45:35.000000000 +0000 +++ cppunit-1.15.1/debian/control 2021-09-10 20:59:35.000000000 +0000 @@ -1,12 +1,13 @@ Source: cppunit -Homepage: http://www.freedesktop.org/wiki/Software/cppunit +Homepage: https://www.freedesktop.org/wiki/Software/cppunit Section: devel Priority: optional Maintainer: Debian LibreOffice Maintainers Uploaders: Rene Engelhard , Steve M. Robbins -Build-Depends: debhelper (>= 10) -Build-Depends-Indep: doxygen -Standards-Version: 4.0.0 +Build-Depends: debhelper-compat (= 13) +Build-Depends-Indep: doxygen, graphviz +Standards-Version: 4.6.0 +Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/libreoffice-team/libs/cppunit.git Vcs-Browser: https://salsa.debian.org/libreoffice-team/libs/cppunit @@ -14,31 +15,35 @@ Section: libs Architecture: any Multi-Arch: same -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Description: Unit Testing Library for C++ - CppUnit is a simple Framework for incorporating test cases in + 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: libdevel Architecture: any +Multi-Arch: same Depends: libcppunit-1.15-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 +Description: Unit Testing Library for C++ - development library + 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 contains the development files required to build + against cppunit. Package: libcppunit-doc Section: doc Architecture: all +Multi-Arch: foreign 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 +Description: Unit Testing Library for C++ - documentation + 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 contains the API documentation of cppunit. diff -Nru cppunit-1.15.1/debian/copyright cppunit-1.15.1/debian/copyright --- cppunit-1.15.1/debian/copyright 2019-07-11 05:55:53.000000000 +0000 +++ cppunit-1.15.1/debian/copyright 2021-09-10 20:57:34.000000000 +0000 @@ -4,12 +4,12 @@ It was downloaded from the official CppUnit Homepage at: http://cppunit.sourceforge.net -Upstream Authors: +Upstream Authors: -Michael Feathers -Jerome Lacoste -E. Sommerlade -J.E. Hoffmann +Michael Feathers +Jerome Lacoste +E. Sommerlade +J.E. Hoffmann Baptiste Lepilleur Bastiaan Bakker Steve Robbins @@ -27,4 +27,3 @@ On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. - diff -Nru cppunit-1.15.1/debian/libcppunit-1.15-0.install cppunit-1.15.1/debian/libcppunit-1.15-0.install --- cppunit-1.15.1/debian/libcppunit-1.15-0.install 1970-01-01 00:00:00.000000000 +0000 +++ cppunit-1.15.1/debian/libcppunit-1.15-0.install 2021-09-10 19:19:52.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff -Nru cppunit-1.15.1/debian/libcppunit-dev.install cppunit-1.15.1/debian/libcppunit-dev.install --- cppunit-1.15.1/debian/libcppunit-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ cppunit-1.15.1/debian/libcppunit-dev.install 2021-09-10 20:57:34.000000000 +0000 @@ -0,0 +1,4 @@ +usr/include +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig diff -Nru cppunit-1.15.1/debian/libcppunit-doc.links cppunit-1.15.1/debian/libcppunit-doc.links --- cppunit-1.15.1/debian/libcppunit-doc.links 1970-01-01 00:00:00.000000000 +0000 +++ cppunit-1.15.1/debian/libcppunit-doc.links 2021-09-10 20:18:31.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/doc/libcppunit-doc/FAQ /usr/share/doc/libcppunit-doc/html/FAQ diff -Nru cppunit-1.15.1/debian/Notes cppunit-1.15.1/debian/Notes --- cppunit-1.15.1/debian/Notes 2019-07-11 05:55:53.000000000 +0000 +++ cppunit-1.15.1/debian/Notes 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ - Build Notes - ----------- - -Up-to-date versions of the following files copied from autotools-dev: - - config/config.guess - config/config.sub - - - diff -Nru cppunit-1.15.1/debian/not-installed cppunit-1.15.1/debian/not-installed --- cppunit-1.15.1/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ cppunit-1.15.1/debian/not-installed 2021-09-10 20:24:00.000000000 +0000 @@ -0,0 +1,9 @@ +usr/bin/DllPlugInTester +usr/lib/*/libcppunit.la +usr/share/doc/cppunit/AUTHORS +usr/share/doc/cppunit/BUGS +usr/share/doc/cppunit/CodingGuideLines.txt +usr/share/doc/cppunit/FAQ +usr/share/doc/cppunit/INSTALL +usr/share/doc/cppunit/INSTALL-WIN32.txt +usr/share/doc/cppunit/INSTALL-unix diff -Nru cppunit-1.15.1/debian/rules cppunit-1.15.1/debian/rules --- cppunit-1.15.1/debian/rules 2020-01-01 21:45:35.000000000 +0000 +++ cppunit-1.15.1/debian/rules 2021-09-10 21:00:23.000000000 +0000 @@ -5,38 +5,37 @@ %: dh $@ -override_dh_auto_build-arch: +override_dh_auto_configure-arch: dh_auto_configure -- --disable-html-docs --disable-doxygen - dh_auto_build override_dh_auto_build-indep: - dh_auto_configure $(MAKE) -C doc -override_dh_auto_test: - if [ -f ./src/cppunit/.libs/libcppunit.so ]; then dh_auto_test; fi +override_dh_auto_test-indep: + @echo Nothing to do for -indep -override_dh_auto_install: - if [ -f ./src/cppunit/.libs/libcppunit.so ]; then dh_auto_install; fi +override_dh_auto_install-indep: + install -d $(CURDIR)/debian/tmp + $(MAKE) -C doc -j1 install DESTDIR=$(CURDIR)/debian/tmp AM_UPDATE_INFO_DIR=no override_dh_install-arch: - # Runtime library package - dh_install -plibcppunit-1.15-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/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_install -a # W: libcppunit-1.14-0: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libcppunit-1.14.so.0.0.0 usr/lib/x86_64-linux-gnu/libcppunit-1.14.so dh_link -plibcppunit-dev /usr/lib/$(DEB_HOST_MULTIARCH)/libcppunit.so \ /usr/lib/$(DEB_HOST_MULTIARCH)/libcppunit-1.15.so -override_dh_install-indep: - # Documentation package +override_dh_installdocs-indep: + # install doc/FAQ from here just because that's easier in indep-only builds + dh_installdocs --doc-main-package=libcppunit-doc -plibcppunit-doc \ + debian/tmp/usr/share/cppunit/html doc/FAQ + +override_dh_installexamples-indep: + # clean the examples directory from built products that we do not want in the final binary package $(MAKE) -C examples clean - dh_installdocs -plibcppunit-doc doc/html - dh_installexamples -plibcppunit-doc examples/* debian/examples/* - rm -f debian/libcppunit-doc/usr/share/doc/libcppunit-doc/examples/simple/.gitignore + dh_installexamples --doc-main-package=libcppunit-doc -plibcppunit-doc examples/* debian/examples/* + # remove cruft + rm -v debian/libcppunit-doc/usr/share/doc/libcppunit-doc/examples/simple/.gitignore + find debian/libcppunit-doc/usr/share/doc/libcppunit-doc/examples/ -type d -name .deps -prune -exec rm -rv {} + + # these Makefiles contains build host specific things, so people + # interested in them should run automake to regen them if they really want to. + find debian/libcppunit-doc/usr/share/doc/libcppunit-doc/examples/ -name Makefile -print -delete diff -Nru cppunit-1.15.1/debian/watch cppunit-1.15.1/debian/watch --- cppunit-1.15.1/debian/watch 2019-07-11 05:55:53.000000000 +0000 +++ cppunit-1.15.1/debian/watch 2021-09-10 20:26:09.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -http://dev-www.libreoffice.org/src/cppunit-([\d\.]+)\.tar\.gz +version=4 +https://dev-www.libreoffice.org/src/cppunit-([\d\.]+)\.tar\.gz