--- dbench-4.0.orig/dbench.1 +++ dbench-4.0/dbench.1 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH DBENCH 1 "October 15, 2001" +.TH DBENCH 1 "June 18, 2005" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -43,15 +43,17 @@ and WindowsNT. .br Given the requirements of running netbench (60 and 150 Windows PCs all -on switched fast ethernet and a really grunty server, and a to open up +on switched fast ethernet and a really grunty server, and some way to +nurse all those machines along so they will run a very fussy benchmark +suite without crashing), these programs were written to open up netbench to the masses. .br Both \fBdbench\fP and \fBtbench\fP read a load description file called -client.txt that was derived from a capture of a real -netbench run. client.txt is about 25MB and describes the -500 thousand operations that a netbench client does in a typical -netbench run. They parse client.txt and use it to produce -the same load without having to buy a huge lab. +client.txt that was derived from a network sniffer dump of a real +netbench run. client.txt is about 4MB and describes the 90 thousand +operations that a netbench client does in a typical netbench run. They +parse client.txt and use it to produce the same load without having to +buy a huge lab. .br dbench produces only the filesystem load. It does all the same IO calls that the smbd server in Samba would produce when confronted with @@ -90,10 +92,6 @@ should be invoked on that server before invoking \fBtbench\fP. \fBtbench\fP can also take the following options: .TP -.B \-c loadfile -Use this as the full path name of the client.txt file (the default is -/usr/share/dbench/client.txt). -.TP .B \-T option[,...] This sets the socket options for the connection to the server. The options are a comma-separated list of one or more of the following: @@ -114,12 +112,13 @@ for details about these options. .br The \fBtbench_srv\fP can only take one option: -.B \-t option[,...] +.B \-T option[,...] as documented above. .SH SEE ALSO .I /usr/share/doc/dbench/README contains the original README by Andrew Tridgell which accompanies the dbench source. .SH AUTHOR -This manual page was written by Paul Russell , -for the Debian GNU/Linux system (but may be used by others). +This manual page was originally written by Paul Russell , +for the Debian GNU/Linux system (but may be used by others). Modified and updated by +Mattias Nordstrom . --- dbench-4.0.orig/Makefile.in +++ dbench-4.0/Makefile.in @@ -32,12 +32,9 @@ # Careful here: don't install client.txt over itself. install: all - ${INSTALLCMD} -d $(bindir) $(datadir) $(mandir) - ${INSTALLCMD} dbench tbench tbench_srv $(bindir) - ${INSTALLCMD} client.txt $(datadir) - ${INSTALLCMD} -m644 dbench.1 $(mandir) - ln -sf dbench.1 $(mandir)/tbench.1 - ln -sf dbench.1 $(mandir)/tbench_srv.1 + ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) + ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) + ${INSTALLCMD} -m644 client.txt $(DESTDIR)$(datadir) clean: rm -f *.o *~ dbench tbench tbench_srv --- dbench-4.0.orig/debian/control +++ dbench-4.0/debian/control @@ -0,0 +1,20 @@ +Source: dbench +Section: utils +Priority: extra +Maintainer: Mattias Nordstrom +Build-Depends: debhelper (>> 5.0.0), autoconf, libpopt-dev +Standards-Version: 3.8.1.0 + +Package: dbench +Architecture: any +Depends: ${shlibs:Depends} +Homepage: http://samba.org/ftp/tridge/dbench/ +Description: The dbench (disk) and tbench (TCP) benchmarks + dbench and tbench simulate the load of the netbench "industry + standard" benchmark used to rate (windows) file servers. Unlike netbench, + they do not require a lab of Microsoft Windows PCs: dbench produces + the filesystem load on a netbench run, and tbench produces the + network load, allowing simpler bottleneck isolation. + . + Note that this benchmark is *not* a realistic reflection of normal + server load. --- dbench-4.0.orig/debian/rules +++ dbench-4.0/debian/rules @@ -0,0 +1,97 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --datadir=\$${prefix}/share/dbench + + +build: build-stamp + +configure: + ./autogen.sh + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: config.status + dh_testdir + dh_testroot + + # Add here commands to clean up after the build process. + $(MAKE) clean + -rm -f build-stamp config.status config.log config.sub config.guess config.h Makefile configure + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/dbench. + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install --source=debian/tmp + dh_installman dbench.1 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- dbench-4.0.orig/debian/watch +++ dbench-4.0/debian/watch @@ -0,0 +1,3 @@ +version=3 + +ftp://ftp.samba.org/pub/tridge/dbench/dbench-(.*)\.tar\.gz debian uupdate --- dbench-4.0.orig/debian/changelog +++ dbench-4.0/debian/changelog @@ -0,0 +1,77 @@ +dbench (4.0-2) unstable; urgency=low + + * Added build-depends on autoconf, fixes FTBFS (closes: #524415) + * Added build-depends on libpopt-dev. + + -- Mattias Nordstrom Fri, 17 Apr 2009 15:57:13 +0300 + +dbench (4.0-1) unstable; urgency=low + + * New upstream release + * Updated to Debian Policy v3.8.1.0, no changes needed. + * New maintainer email address. + + -- Mattias Nordstrom Sat, 11 Apr 2009 16:36:19 +0300 + +dbench (3.04-2) unstable; urgency=low + + * Updated to Debian Policy v3.7.2, no changes needed. + * Updated to debhelper version 5. + * Updated watch file to version 3. + * Updated the copyright file to include proper license information. + + -- Mattias Nordstrom Sat, 13 May 2006 22:50:29 +0300 + +dbench (3.04-1) unstable; urgency=low + + * New upstream release. + * Removed VA_COPY patch from snprintf.c which has been fixed upstream. + * Fixed incorrect Debian Policy version in control, should have been v3.6.2.1 + + -- Mattias Nordstrom Fri, 18 Nov 2005 20:15:53 +0200 + +dbench (3.03-2) unstable; urgency=low + + * Applied patch that fixes compilation errors for amd64, s390 and powerpc + (closes: #315357) + * Acknowledge NMU (closes: #283397) + + -- Mattias Nordstrom Wed, 22 Jun 2005 09:48:50 +0300 + +dbench (3.03-1) unstable; urgency=low + + * New upstream release (closes: #262664) + * Updated manpage (closes: #286567) + * Cleanup (closes: #198334) + * Updated to Debian Policy v3.6.2.1 + * Adopted package (closes: #312868) + * Added upstream homepage to description in debian/control. + + -- Mattias Nordstrom Tue, 21 Jun 2005 14:09:30 +0300 + +dbench (2.0-1) unstable; urgency=low + + * New upstream release + * Updated to Debian Policy v3.5.8. + * Which means this belongs here (from debian/copyright): + Originally downloaded from ftp://samba.org/pub/tridge/dbench/ + Upstream Author(s): Andrew Tridgell + Martin Pool + + -- Paul Russell Fri, 7 Feb 2003 11:45:00 +0100 + +dbench (1.3-2) unstable; urgency=low + + * Insert space in "file servers" (closes: #124534) + * Fix man page description (closes: #139605) + + -- Paul Russell Mon, 25 Mar 2002 04:13:54 +0100 + +dbench (1.3-1) unstable; urgency=low + + * Initial Release (closes: #117124) + * Added install target to Makefile. + * Added default directory to find client.txt. + * Wrote manpage. + + -- Paul Russell Sun, 28 Oct 2001 09:30:05 +0100 --- dbench-4.0.orig/debian/compat +++ dbench-4.0/debian/compat @@ -0,0 +1 @@ +5 --- dbench-4.0.orig/debian/dbench.install +++ dbench-4.0/debian/dbench.install @@ -0,0 +1,2 @@ +usr/bin/* +usr/share/* --- dbench-4.0.orig/debian/dbench.links +++ dbench-4.0/debian/dbench.links @@ -0,0 +1,2 @@ +usr/share/man/man1/dbench.1 usr/share/man/man1/tbench.1 +usr/share/man/man1/dbench.1 usr/share/man/man1/tbench_srv.1 --- dbench-4.0.orig/debian/copyright +++ dbench-4.0/debian/copyright @@ -0,0 +1,26 @@ +This package was adopted for Debian maintainership by Mattias Nordstrom + on Sat, 18 Jun 2005 21:00:00 +0300. + +It was downloaded from http://samba.org/ftp/tridge/dbench/ + +Upstream Author: Andrew Tridgell + +This software is copyright (c) 1999, 2001, Andrew Tridgell and Martin Pool. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License with + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; + if not, write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public +License, can be found in /usr/share/common-licenses/GPL. --- dbench-4.0.orig/debian/dbench.docs +++ dbench-4.0/debian/dbench.docs @@ -0,0 +1 @@ +README