From: hugo303 Date: Mon, 22 Aug 2005 13:46:48 +0000 (+0000) Subject: Applied patch for debian files received from check debian maintainer Robert Lemmen X-Git-Tag: 0.10.0~915 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=609387c2696bf86297783c622eb486c69d76baa3;p=check Applied patch for debian files received from check debian maintainer Robert Lemmen git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@236 64e312b2-a51f-0410-8e61-82d0ca0eb02a --- diff --git a/check/debian/changelog b/check/debian/changelog index 31c2080..ff86104 100644 --- a/check/debian/changelog +++ b/check/debian/changelog @@ -1,46 +1,137 @@ +check (0.9.2-6) unstable; urgency=low + + * Rebuild for g++ transition + * Updated to newer standards version + + -- Robert Lemmen Tue, 19 Jul 2005 10:53:23 +0200 + +check (0.9.2-5) unstable; urgency=low + + * fixed documentation (Closes: #301214) + * added include to check.h (Closes: #301319) + + -- Robert Lemmen Wed, 8 Jun 2005 14:50:11 +0200 + +check (0.9.2-4) unstable; urgency=low + + * added an upgrade notice that was missing + + -- Robert Lemmen Mon, 14 Mar 2005 19:12:09 +0100 + +check (0.9.2-3) unstable; urgency=low + + * fixed some problems with upstream files in debian/ + + -- Robert Lemmen Tue, 15 Feb 2005 16:11:59 +0100 + check (0.9.2-2) unstable; urgency=low - * Fixed building with gcc3 - * Removed empty money dir from docs + * fixed FTBFS error when trying to copy the example data - -- Fredrik Hugosson Fri, 12 Nov 2004 11:54:00 +0000 + -- Robert Lemmen Thu, 13 Jan 2005 13:46:25 +0100 check (0.9.2-1) unstable; urgency=low - * See upstream changelog + * New upstream release (Closes: #261420) + * Took over maintenance (Closes: #288213) + * Updated to new policy version + * Fixed copyright files (Closes: #187986) + * General cleanups in debian/ + * Added watch file + + -- Robert Lemmen Sat, 8 Jan 2005 20:22:17 +0100 + +check (0.8.4-1) unstable; urgency=low + + * Changed Author(s): to Author: in copyright file to keep lintian + happy. + + -- Britton Leo Kerin Tue, 10 Dec 2002 21:05:40 -0900 + + * Removed erroneous check directory from check.dirs. + + * Added lines to check.install to install check.lintian_overrides as + /usr/share/lintian/overrides/check. + + * Moved override to check.lintian_overrides. + + * Added lines to check.install to install examples, added invocation + of dh_install to rules. + + * Added check.install to install tutorial documentation. - -- Fredrik Hugosson Wed, 10 Nov 2004 11:43:00 +0000 + * The install target of rules now removes a doc/check-0.8.4 + directory that upstream installs. + + * Removed useless (now that distclean is used) clean of src + directory. + + * Removed README from check.docs. + + * Made BASE variable in rules simply expanded and changed it to + absolute path, reformatted slightly. + + * Change clean to distclean in rules/clean target. + + * Removed reference to debian subdirector from Makefile.in. + + * Updated copyright file. + + * Removed obsolete /usr/doc sym linking code from postinst and + prerm, added set -e to prerm. + + * Added comment in rules explaining why strip should not be + performed on this library. + + * I (Britton Leo Kerin) am now listed as the maintainer in the + control file. + + -- Britton Leo Kerin Mon, 09 Dec 2002 20:28:51 -0900 + + * debian/rules now uses upstream configure, DH_COMPAT=4, install + target is simplified by additional use of debhelper, irrelevant + dh_ program calls commented out. + + * New upstream release. Closes: bug#85195. + + -- Britton Leo Kerin Sun, 08 Dec 2002 23:53:02 -0900 + +check (0.8.3-2) unstable; urgency=low + + * Corrected typos in check.h. closes: #151599 + + -- Muhammad Hussain Yusuf Mon, 1 Jul 2002 16:21:57 +0100 check (0.8.3-1) unstable; urgency=low - * See upstream changelog + * New Upstream release + * Added check.m4 to /usr/share/aclocal. Closes: #148044 - -- Arien Malec Tue, 28 May 2002 20:59:00 +0000 + -- Muhammad Hussain Yusuf Sat, 25 May 2002 10:59:11 +0100 -check (0.8.1-1) unstable; urgency=low +check (0.8.2-1) unstable; urgency=low - * See upstream changelog + * New Upstream Release. Closes: #144186 - -- Arien Malec Wed, 27 Feb 2002 18:25:00 +0000 + -- Muhammad Hussain Yusuf Fri, 26 Apr 2002 10:54:45 +0100 -check (0.8.0-1) unstable; urgency=low +check (0.8.1-2) unstable; urgency=low - * See upstream changelog + * Changed copyright details to LGPL. Closes: #141952 - -- Arien Malec Wed, 24 Oct 2001 10:17:24 +0000 + -- Muhammad Hussain Yusuf Wed, 10 Apr 2002 12:55:49 +0100 -check (0.7.3-1) unstable; urgency=low +check (0.8.1-1) unstable; urgency=low - * Bug fix to Autoconf macro for shell portability & to debian doc-base - file + * New Upstream Release. Closes: #138898 - -- Arien Malec Tue, 21 Aug 2001 17:44:24 +0000 + -- Muhammad Hussain Yusuf Fri, 22 Mar 2002 12:41:16 +0000 -check (0.7.2-1) unstable; urgency=low +check (0.8.0-1) unstable; urgency=low - * Initial Release. + * Initial Release. Closes: #132568 - -- Arien Malec Fri, 3 Aug 2001 09:06:29 -0700 + -- Muhammad Hussain Yusuf Sun, 10 Feb 2002 15:55:59 +0000 Local variables: mode: debian-changelog diff --git a/check/debian/check.doc-base.tut b/check/debian/check.doc-base.tut index e31c2a4..e69de29 100644 --- a/check/debian/check.doc-base.tut +++ b/check/debian/check.doc-base.tut @@ -1,15 +0,0 @@ -Document: check-tutorial -Title: Check Tutorial -Author: Arien Malec -Abstract: This document presents a tutorial introduction to the use of Check. -Section: Apps/Programming - -Format: lyx -Files: /usr/share/doc/check/tutorial.lyx.gz - -Format: linuxdoc-sgml -Files: /usr/share/doc/check/tutorial.sgml.gz - -Format: HTML -Index: /usr/share/doc/check/tutorial.html -Files: /usr/share/doc/check/tutorial*.html diff --git a/check/debian/check.docs b/check/debian/check.docs index f5f8513..e69de29 100644 --- a/check/debian/check.docs +++ b/check/debian/check.docs @@ -1,3 +0,0 @@ -NEWS -README -ChangeLogOld diff --git a/check/debian/check.postinst.debhelper b/check/debian/check.postinst.debhelper index af24646..46f0421 100644 --- a/check/debian/check.postinst.debhelper +++ b/check/debian/check.postinst.debhelper @@ -1,12 +1,5 @@ # Automatically added by dh_installdocs -if [ "$1" = "configure" ]; then - if [ -d /usr/doc -a ! -e /usr/doc/check -a -d /usr/share/doc/check ]; then - ln -sf ../share/doc/check /usr/doc/check - fi -fi -# End automatically added section -# Automatically added by dh_installdocs -if [ "$1" = configure ] && command -v install-docs >/dev/null 2>&1; then +if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then install-docs -i /usr/share/doc-base/check-tutorial fi # End automatically added section diff --git a/check/debian/check.prerm.debhelper b/check/debian/check.prerm.debhelper index 2cd4a33..cc674a8 100644 --- a/check/debian/check.prerm.debhelper +++ b/check/debian/check.prerm.debhelper @@ -1,11 +1,6 @@ # Automatically added by dh_installdocs -if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/check ]; then - rm -f /usr/doc/check -fi -# End automatically added section -# Automatically added by dh_installdocs -if [ "$1" = remove -o "$1" = upgrade ] && \ - command -v install-docs >/dev/null 2>&1; then +if [ "$1" = remove ] || [ "$1" = upgrade ] && \ + which install-docs >/dev/null 2>&1; then install-docs -r check-tutorial fi # End automatically added section diff --git a/check/debian/control b/check/debian/control index 56aba5a..7a0302a 100644 --- a/check/debian/control +++ b/check/debian/control @@ -1,17 +1,15 @@ Source: check Section: devel Priority: optional -Maintainer: Fredrik Hugosson -Build-Depends: debhelper (>> 3.0.0), gcc (>= 3.0) | gcc-3.0 | gcc-3.2 | gcc-3.3 -Standards-Version: 3.5.2 +Maintainer: Robert Lemmen +Build-Depends: debhelper (>= 3.0.0) +Standards-Version: 3.6.2.1 Package: check Architecture: any -Depends: -Description: A unit test framework for C - Check is a unit test framework for C. It features a simple interface - for defining unit tests, putting little in the way of the - developer. Tests are run in a separate address space, so Check can - catch both assertion failures and code errors that cause segmentation - faults or other signals. The output from unit tests can be used within - source code editors and IDEs. +Description: unit test framework for C + Check features a simple interface for defining unit tests, putting + little in the way of the developer. Tests are run in a separate + address space, so Check can catch both assertion failures and code + errors that cause segmentation faults or other signals. The output + from unit tests can be used within source code editors and IDEs. diff --git a/check/debian/copyright b/check/debian/copyright index 5b84385..0a4d087 100644 --- a/check/debian/copyright +++ b/check/debian/copyright @@ -1,13 +1,30 @@ -This package was debianized by Arien Malec on -Fri, 3 Aug 2001 09:06:29 -0700. +This package is now maintained by Robert Lemmen -It was created from the author's sources, which can be downloaded from -sourceforge.net/projects/check +It was originally debianized by Muhammad Hussain Yusuf +on Sun, 10 Feb 2002 15:55:59 +0000 and maintained after him for a while by +Britton Leo Kerin -Upstream Author(s): Arien Malec +The upstream source was downloaded from http://sourceforge.net/projects/check -Copyright: This software is copyright (c) 2001 by Arien Malec -You are free to distribute this software under the terms of the GNU -General Public License. On Debian systems, the complete text of the -GNU General Public License can be found in -/usr/share/common-licenses/GPL file. +Upstream Authors: Arien Malec , + Sven Neumann , + Fred L. Drake, Jr. + +Copyright: 2001-2005 check authors (see above) and others + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + On Debian systems, the complete text of the GNU Lesser General Public + License can be found in /usr/share/common-licenses/LGPL. diff --git a/check/debian/dirs b/check/debian/dirs index ca882bb..d379f3c 100644 --- a/check/debian/dirs +++ b/check/debian/dirs @@ -1,2 +1,3 @@ -usr/bin -usr/sbin +/usr/share/doc/check +/usr/include +/usr/lib diff --git a/check/debian/rules b/check/debian/rules index 4d04401..927b19b 100755 --- a/check/debian/rules +++ b/check/debian/rules @@ -1,58 +1,29 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=3 - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -CC_VSK=-dumpversion | cut -c1 -CC=$(shell if test `gcc $(CC_VSK)` = 3; then \ - echo gcc; \ - elif test `which gcc-3.3` -a `gcc-3.3 $(CC_VSK)` = 3; then \ - echo gcc-3.3; \ - elif test `which gcc-3.1` -a `gcc-3.1 $(CC_VSK)` = 3; then \ - echo gcc-3.1; \ - elif test `which gcc-3.0` -a `gcc-3.0 $(CC_VSK)` = 3; then \ - echo gcc-3.0; \ - fi) +export DESTDIR=$(shell pwd)/debian/check configure: configure-stamp configure-stamp: dh_testdir - # Add here commands to configure the package. - ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-plain-docdir CC="$(CC)" - + ./configure --prefix=/usr --enable-plain-docdir touch configure-stamp build: configure-stamp build-stamp build-stamp: dh_testdir - - # Add here commands to compile the package. $(MAKE) - touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. -$(MAKE) distclean - + # hack! + rm -f debian/files dh_clean install: build @@ -61,46 +32,33 @@ install: build dh_clean -k dh_installdirs - # Add here commands to install the package into debian/tmp - $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. + $(MAKE) install + # fix the installation + rm -f debian/check/usr/share/doc/check/tutorial.sgml + rm -f debian/check/usr/share/doc/check/ChangeLog + rm -f debian/check/usr/share/doc/check/*.html + mkdir debian/check/usr/share/doc/check/tutorial + cp doc/*.html debian/check/usr/share/doc/check/tutorial + rm debian/check/usr/share/doc/check/COPYING + binary-arch: build install dh_testdir dh_testroot - # we don't want another copy of the GPL Licence file - dh_movefiles -XCOPYING - -# dh_installdebconf - dh_installdocs + dh_installdocs -XTODO dh_installexamples -# dh_installmenu -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron - dh_installman - dh_installinfo -# dh_undocumented + # fix the example setup + rm -rf debian/check/usr/share/doc/check/examples/Makefile* + rm -rf debian/check/usr/share/doc/check/examples/configure* + cp debian/example_makefile debian/check/usr/share/doc/check/examples/Makefile dh_installchangelogs ChangeLog dh_link dh_strip - dh_compress + dh_compress -XMakefile dh_fixperms - dh_makeshlibs dh_installdeb -# dh_perl - dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb -binary: binary-indep binary-arch +binary: binary-arch .PHONY: build clean binary-indep binary-arch binary install configure