Hi all, I plan to NMU to fix #965484 and #999156
The debdiff is as attachment. I'll wait until 20th Dec and upload to delay/10 queue. Yours, Paul
diff -Nru dbench-4.0/dbench.1 dbench-4.0/dbench.1
--- dbench-4.0/dbench.1 2022-12-13 05:40:37.000000000 +0800
+++ dbench-4.0/dbench.1 2008-02-18 08:49:35.000000000 +0800
@@ -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 "June 18, 2005"
+.TH DBENCH 1 "October 15, 2001"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -43,17 +43,15 @@
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 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
+on switched fast ethernet and a really grunty server, and a 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 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.
+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.
.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
@@ -92,6 +90,10 @@
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:
@@ -112,13 +114,12 @@
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 originally written by Paul Russell
<pruss...@alderaan.franken.de>,
-for the Debian GNU/Linux system (but may be used by others). Modified and
updated by
-Mattias Nordstrom <nordst...@realnode.com>.
+This manual page was written by Paul Russell <pruss...@alderaan.franken.de>,
+for the Debian GNU/Linux system (but may be used by others).
diff -Nru dbench-4.0/debian/changelog dbench-4.0/debian/changelog
--- dbench-4.0/debian/changelog 2022-12-13 05:40:37.000000000 +0800
+++ dbench-4.0/debian/changelog 2022-12-12 22:43:32.000000000 +0800
@@ -1,3 +1,12 @@
+dbench (4.0-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Bump debhelper compat to 12. (Closes: #965484)
+ * debian/rules: use dh. (Closes: #999156)
+ * Port to DebSrc3.0 (quilt)
+
+ -- Ying-Chun Liu (PaulLiu) <paul...@debian.org> Mon, 12 Dec 2022 22:43:32
+0800
+
dbench (4.0-2) unstable; urgency=low
* Added build-depends on autoconf, fixes FTBFS (closes: #524415)
diff -Nru dbench-4.0/debian/clean dbench-4.0/debian/clean
--- dbench-4.0/debian/clean 1970-01-01 08:00:00.000000000 +0800
+++ dbench-4.0/debian/clean 2022-12-12 22:43:32.000000000 +0800
@@ -0,0 +1,4 @@
+Makefile
+config.h
+config.log
+config.status
diff -Nru dbench-4.0/debian/compat dbench-4.0/debian/compat
--- dbench-4.0/debian/compat 2022-12-13 05:40:37.000000000 +0800
+++ dbench-4.0/debian/compat 1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-5
diff -Nru dbench-4.0/debian/control dbench-4.0/debian/control
--- dbench-4.0/debian/control 2022-12-13 05:40:37.000000000 +0800
+++ dbench-4.0/debian/control 2022-12-12 22:43:32.000000000 +0800
@@ -1,13 +1,13 @@
Source: dbench
Section: utils
-Priority: extra
+Priority: optional
Maintainer: Mattias Nordstrom <mnord...@debian.org>
-Build-Depends: debhelper (>> 5.0.0), autoconf, libpopt-dev
+Build-Depends: debhelper-compat (= 12), autoconf, libpopt-dev
Standards-Version: 3.8.1.0
Package: dbench
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc: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
diff -Nru dbench-4.0/debian/dbench.manpages dbench-4.0/debian/dbench.manpages
--- dbench-4.0/debian/dbench.manpages 1970-01-01 08:00:00.000000000 +0800
+++ dbench-4.0/debian/dbench.manpages 2022-12-12 22:43:32.000000000 +0800
@@ -0,0 +1 @@
+dbench.1
diff -Nru dbench-4.0/debian/patches/0001_manpage.patch
dbench-4.0/debian/patches/0001_manpage.patch
--- dbench-4.0/debian/patches/0001_manpage.patch 1970-01-01
08:00:00.000000000 +0800
+++ dbench-4.0/debian/patches/0001_manpage.patch 2022-12-12
22:43:32.000000000 +0800
@@ -0,0 +1,63 @@
+--- 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 <pruss...@alderaan.franken.de>,
+-for the Debian GNU/Linux system (but may be used by others).
++This manual page was originally written by Paul Russell
<pruss...@alderaan.franken.de>,
++for the Debian GNU/Linux system (but may be used by others). Modified and
updated by
++Mattias Nordstrom <nordst...@realnode.com>.
diff -Nru dbench-4.0/debian/patches/0002_Makefile.patch
dbench-4.0/debian/patches/0002_Makefile.patch
--- dbench-4.0/debian/patches/0002_Makefile.patch 1970-01-01
08:00:00.000000000 +0800
+++ dbench-4.0/debian/patches/0002_Makefile.patch 2022-12-12
22:43:32.000000000 +0800
@@ -0,0 +1,18 @@
+--- 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
diff -Nru dbench-4.0/debian/patches/series dbench-4.0/debian/patches/series
--- dbench-4.0/debian/patches/series 1970-01-01 08:00:00.000000000 +0800
+++ dbench-4.0/debian/patches/series 2022-12-12 22:43:32.000000000 +0800
@@ -0,0 +1,2 @@
+0001_manpage.patch
+0002_Makefile.patch
diff -Nru dbench-4.0/debian/rules dbench-4.0/debian/rules
--- dbench-4.0/debian/rules 2022-12-13 05:40:37.000000000 +0800
+++ dbench-4.0/debian/rules 2022-12-12 22:43:32.000000000 +0800
@@ -15,83 +15,11 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+ dh $@
-CFLAGS = -Wall -g
+override_dh_auto_configure:
+ dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info --datadir=\$${prefix}/share/dbench
-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
+override_dh_auto_install:
+ dh_auto_install -- DESTDIR=$(CURDIR)/debian/tmp
diff -Nru dbench-4.0/debian/source/format dbench-4.0/debian/source/format
--- dbench-4.0/debian/source/format 1970-01-01 08:00:00.000000000 +0800
+++ dbench-4.0/debian/source/format 2022-12-12 22:43:32.000000000 +0800
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru dbench-4.0/Makefile.in dbench-4.0/Makefile.in
--- dbench-4.0/Makefile.in 2022-12-13 05:40:37.000000000 +0800
+++ dbench-4.0/Makefile.in 2008-02-18 08:49:25.000000000 +0800
@@ -32,9 +32,12 @@
# Careful here: don't install client.txt over itself.
install: all
- ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)
- ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir)
- ${INSTALLCMD} -m644 client.txt $(DESTDIR)$(datadir)
+ ${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
clean:
rm -f *.o *~ dbench tbench tbench_srv
OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key
OpenPGP_signature
Description: OpenPGP digital signature
