* Martin Steigerwald <m...@teamix.de> [20090812 17:18]: > Hi Michael! > I updated my Debian package to fio-1.32.
Great. > I switched it to git-buildpackage. Wonderful. :) > You can get and build it like follows: > 1197 git clone git://github.com/martin21/fio.git [...] > Aside from the differing copyright file - Hendrik's is in the new format - > and > the fact that Hendriks package is done via cdbs I think my package has all > and more than Hendriks. > I developed the package on Lenny, but I used pbuilder to verify that it > builts > okay under unstable and that the build dependencies are sufficient. > Michael, please review. I am at the office again beginning next week, so I > subscribed to this bug report via my private address. Initial reviewing done. Find fixes against git tree attached as git patches. (Tip: use lintian from unstable to verify your package.) Please review on your own and apply what you acknowledge, ping me if you think the package is ready for upload to Debian then. @Jens: the first patch (0001-fio.1-fix-hyphen-used-as-minus-sign.patch) addresses a minor issue in the manpage. Please feel free to apply it in your upstream source. > I am happy to put it onto alioth or somewhere - need to get > started on how to approach that tough. Check out http://wiki.debian.org/Alioth/Git ("Collab Maint project"). > I'd prefer git over subversion for maintaining the > package. git is perfect and fine for me. Thanks Martin, good packaging work. regards, -mika-
From 79d6ce4b59149a0cd5b8f8b45f3fa67b9bb5dbc4 Mon Sep 17 00:00:00 2001 From: Michael Prokop <m...@grml.org> Date: Wed, 12 Aug 2009 17:24:41 +0200 Subject: [PATCH 1/4] fio.1: fix hyphen-used-as-minus-sign Signed-off-by: Michael Prokop <m...@grml.org> --- fio.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fio.1 b/fio.1 index b3925b5..9b1e02b 100644 --- a/fio.1 +++ b/fio.1 @@ -45,7 +45,7 @@ Print help information for \fIcommand\fR. May be `all' for all commands. .TP .BI \-\-debug \fR=\fPtype Enable verbose tracing of various fio actions. May be `all' for all types -or individual types seperated by a comma (eg --debug=io,file). `help' will +or individual types seperated by a comma (eg \-\-debug=io,file). `help' will list all available tracing options. .TP .B \-\-help -- 1.6.3.1
From 7ba64f048eca6892c27dcf989a660a871ac5edaf Mon Sep 17 00:00:00 2001 From: Michael Prokop <m...@grml.org> Date: Wed, 12 Aug 2009 17:30:45 +0200 Subject: [PATCH 2/4] debian/copyright: refer to gpl2 and include its header; updated URLs; some formating changes Signed-off-by: Michael Prokop <m...@grml.org> --- debian/copyright | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/debian/copyright b/debian/copyright index 265c7e0..4e9d3ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,29 +1,37 @@ This package was debianized by Martin Steigerwald <m...@teamix.de> on Tue, 19 May 2009 15:04:02 +0200. -It was downloaded from: -http://freshmeat.net/urls/3aa21b8c106cab742bf1f20d60629e3f -aka http://brick.kernel.dk/snaps/fio-1.26.tar.gz +It was downloaded from http://freshmeat.net/projects/fio/ +aka http://brick.kernel.dk/snaps/fio-1.32.tar.gz Upstream Author: - Jens Axboe <jens.ax...@oracle.com> (as of posting in LKML from 19 May 2009) + Jens Axboe <jens.ax...@oracle.com> -Copyright: - - Copyright (C) 2005 Jens Axboe <ax...@suse.de> - Copyright (C) 2006 Jens Axboe <ax...@kernel.dk> +Copyright: © 2005-2006 by Jens Axboe License: - GNU GENERAL PUBLIC LICENSE Version 2 + This package 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; version 2 dated June, 1991. -The Debian packaging is (C) 2009, Martin Steigerwald <m...@teamix.de> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + This package 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 + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. -Files under differing copyrights: +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. - fifo.c, fifo.h: +Copyrights notes: + + fifo.c, fifo.h: Copyright (C) 2004 Stelian Pop <stel...@popies.net> hash.h: @@ -66,3 +74,6 @@ Files under differing copyrights: Copyright (C) Jean-Luc Cooke <jlco...@certainkey.com> Copyright (C) Andrew McDonald <and...@mcdonald.org.uk> Copyright (C) 2003 Kyle McMartin <k...@debian.org> + +The Debian packaging is (C) 2009, Martin Steigerwald <m...@teamix.de> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. -- 1.6.3.1
From b1b844b1c6a5ac4ddda5472ff5f9325eb2605714 Mon Sep 17 00:00:00 2001 From: Michael Prokop <m...@grml.org> Date: Wed, 12 Aug 2009 17:33:26 +0200 Subject: [PATCH 3/4] debian/rules: drop unnecessary configure target; replace dh_clean with dh_prep; drop templates Signed-off-by: Michael Prokop <m...@grml.org> --- debian/rules | 39 ++++++--------------------------------- 1 files changed, 6 insertions(+), 33 deletions(-) diff --git a/debian/rules b/debian/rules index f19be9b..7dd2d10 100755 --- a/debian/rules +++ b/debian/rules @@ -9,43 +9,30 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - - - - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - build: build-stamp -build-stamp: configure-stamp +build-stamp: dh_testdir # Add here commands to compile the package. $(MAKE) - #docbook-to-man debian/fio.sgml > fio.1 touch $@ -clean: +clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp + rm -f build-stamp # Add here commands to clean up after the build process. $(MAKE) clean - dh_clean + dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/fio. @@ -62,25 +49,11 @@ binary-arch: build install dh_testroot dh_installchangelogs dh_installdocs -# dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms -# dh_perl -# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol @@ -88,4 +61,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install -- 1.6.3.1
From 735e283b1ad2adbbc2f552eb540bda1ebe4b8f93 Mon Sep 17 00:00:00 2001 From: Michael Prokop <m...@grml.org> Date: Wed, 12 Aug 2009 17:34:34 +0200 Subject: [PATCH 4/4] Bump Standard-Version to 3.8.2; add myself to Uploaders Signed-off-by: Michael Prokop <m...@grml.org> --- debian/control | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/debian/control b/debian/control index b846734..67b15a7 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: fio Section: utils Priority: optional Maintainer: Martin Steigerwald <m...@teamix.de> +Uploaders: Michael Prokop <m...@debian.org> Build-Depends: debhelper (>= 7), libaio-dev -Standards-Version: 3.8.0 +Standards-Version: 3.8.2 Homepage: http://freshmeat.net/projects/fio Package: fio -- 1.6.3.1
signature.asc
Description: Digital signature
