Bug#524790: Updated debian package for fio

2009-08-13 Thread Martin Steigerwald
Am Mittwoch 12 August 2009 schrieb Michael Prokop:
 * Martin Steigerwald mar...@lichtvoll.de [20090812 21:13]:
  Am Mittwoch 12 August 2009 schrieb Michael Prokop:
   * Martin Steigerwald m...@teamix.de [20090812 17:18]:
Hi Michael!
 
  [...]
 
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.
[...]
  Please pull and review.

 Just one minor problem: the copyright sign in your git commit isn't
 UTF-8, which should be used nowadays in debian maintainer scripts.
 Fix it via running:

   iconv -f ISO-8859-1 -t UTF-8 debian/copyright  debian/copyright.new
   mv debian/copyright.new debian/copyright

 I've attached a patch (which also changes another '(C)' to '©') that
 addresses the issue so you can verify the result. Then the package
 should be lintian clean.

I used recode which replaces the original file automatically. ;) I left the  
copyright notes unchanged as they are copied from the source files. You 
didn't change them either. I can change them if you wish.

KMail got the encoding wrong as I saved the attachment with your patch. 
Strange. I am using UTF-8 here and the attachment is quoted printable.

Ciao,
-- 
Martin 'Helios' Steigerwald - http://www.Lichtvoll.de
GPG: 03B0 0D6C 0040 0710 4AFA  B82F 991B EAAC A599 84C7


signature.asc
Description: This is a digitally signed message part.


Bug#524790: Updated debian package for fio

2009-08-13 Thread Michael Prokop
* Martin Steigerwald mar...@lichtvoll.de [20090813 08:31]:
 Am Mittwoch 12 August 2009 schrieb Michael Prokop:

  Just one minor problem: the copyright sign in your git commit isn't
  UTF-8, which should be used nowadays in debian maintainer scripts.
  Fix it via running:

iconv -f ISO-8859-1 -t UTF-8 debian/copyright  debian/copyright.new
mv debian/copyright.new debian/copyright

  I've attached a patch (which also changes another '(C)' to '©') that
  addresses the issue so you can verify the result. Then the package
  should be lintian clean.

 I used recode which replaces the original file automatically. ;) I left the  
 copyright notes unchanged as they are copied from the source files. You 
 didn't change them either. I can change them if you wish.

 KMail got the encoding wrong as I saved the attachment with your patch. 
 Strange. I am using UTF-8 here and the attachment is quoted printable.

Heh. :)

Package is lintian clean and the fio_1.32-1.diff.gz looks fine.
If you send me a 'ACK' I'll upload the package.

regards,
-mika-


signature.asc
Description: Digital signature


Bug#524790: Updated debian package for fio

2009-08-13 Thread Martin Steigerwald
Am Donnerstag 13 August 2009 schrieb Michael Prokop:
 * Martin Steigerwald mar...@lichtvoll.de [20090813 08:31]:
  Am Mittwoch 12 August 2009 schrieb Michael Prokop:
   Just one minor problem: the copyright sign in your git commit isn't
   UTF-8, which should be used nowadays in debian maintainer scripts.
   Fix it via running:
  
 iconv -f ISO-8859-1 -t UTF-8 debian/copyright 
   debian/copyright.new mv debian/copyright.new debian/copyright
  
   I've attached a patch (which also changes another '(C)' to '©')
   that addresses the issue so you can verify the result. Then the
   package should be lintian clean.
 
  I used recode which replaces the original file automatically. ;) I
  left the copyright notes unchanged as they are copied from the source
  files. You didn't change them either. I can change them if you wish.
 
  KMail got the encoding wrong as I saved the attachment with your
  patch. Strange. I am using UTF-8 here and the attachment is quoted
  printable.

 Heh. :)

 Package is lintian clean and the fio_1.32-1.diff.gz looks fine.
 If you send me a 'ACK' I'll upload the package.

ACK. ;)

BTW the package was lintian clean here even before I fixed the copyright 
sign. And I did install lintian from unstable here.

shambhala:~ apt-show-versions | grep lintian
lintian/sid uptodate 2.2.13

-- 
Martin 'Helios' Steigerwald - http://www.Lichtvoll.de
GPG: 03B0 0D6C 0040 0710 4AFA  B82F 991B EAAC A599 84C7


signature.asc
Description: This is a digitally signed message part.


Bug#524790: Updated debian package for fio

2009-08-13 Thread Michael Prokop
* Martin Steigerwald mar...@lichtvoll.de [20090813 10:42]:
 Am Donnerstag 13 August 2009 schrieb Michael Prokop:

  Package is lintian clean and the fio_1.32-1.diff.gz looks fine.
  If you send me a 'ACK' I'll upload the package.

 ACK. ;)

Thanks. Uploaded.

You should (have) receive(d) mails about the state of the upload.
Should appear on http://ftp-master.debian.org/new.html soon.

 BTW the package was lintian clean here even before I fixed the copyright 
 sign. And I did install lintian from unstable here.

 shambhala:~ apt-show-versions | grep lintian
 lintian/sid uptodate 2.2.13

Interesting. Same lintian version with git tree before last fix:

| W: fio: debian-copyright-file-uses-obsolete-national-encoding at line 11

Are you using a UTF-8 console environment?

regards,
-mika-


signature.asc
Description: Digital signature


Bug#524790: Updated debian package for fio

2009-08-13 Thread Martin Steigerwald
Am Donnerstag 13 August 2009 schrieb Michael Prokop:
 * Martin Steigerwald mar...@lichtvoll.de [20090813 10:42]:
  Am Donnerstag 13 August 2009 schrieb Michael Prokop:
   Package is lintian clean and the fio_1.32-1.diff.gz looks fine.
   If you send me a 'ACK' I'll upload the package.
 
  ACK. ;)

 Thanks. Uploaded.

 You should (have) receive(d) mails about the state of the upload.
 Should appear on http://ftp-master.debian.org/new.html soon.

Nothing yet. Bug tracker still listed Hendrik as package maintainer in 
last mails, so possibly I won't get these?

  BTW the package was lintian clean here even before I fixed the
  copyright sign. And I did install lintian from unstable here.
 
  shambhala:~ apt-show-versions | grep lintian
  lintian/sid uptodate 2.2.13

 Interesting. Same lintian version with git tree before last fix:
 | W: fio: debian-copyright-file-uses-obsolete-national-encoding at line
 | 11

 Are you using a UTF-8 console environment?

Yes. Possibly I tricked myself. Latest git-buildpackage possibly was still 
with the older lintian. And then I possibly ran the newest linitian on the 
dsc file without rebuilding the package before. But I thought I ran a git-
buildpackage after updating lintian... well I can try to reproduce this 
and do a bug report regarding lintian if desired.

Ciao,
-- 
Martin 'Helios' Steigerwald - http://www.Lichtvoll.de
GPG: 03B0 0D6C 0040 0710 4AFA  B82F 991B EAAC A599 84C7


signature.asc
Description: This is a digitally signed message part.


Bug#524790: Updated debian package for fio

2009-08-13 Thread Michael Prokop
* Martin Steigerwald mar...@lichtvoll.de [20090813 11:35]:
 Am Donnerstag 13 August 2009 schrieb Michael Prokop:

  Thanks. Uploaded.
  You should (have) receive(d) mails about the state of the upload.
  Should appear on http://ftp-master.debian.org/new.html soon.

 Nothing yet.

Should appear soon, if not I'll ping ftp-master.

 Bug tracker still listed Hendrik as package maintainer in 
 last mails, so possibly I won't get these?

No, inside fio_1.32-1_i386.changes there's:

  Changed-By: Martin Steigerwald [snip]

which is relevant for mails.

   BTW the package was lintian clean here even before I fixed the
   copyright sign. And I did install lintian from unstable here.

   shambhala:~ apt-show-versions | grep lintian
   lintian/sid uptodate 2.2.13

  Interesting. Same lintian version with git tree before last fix:
  | W: fio: debian-copyright-file-uses-obsolete-national-encoding at line
  | 11

  Are you using a UTF-8 console environment?

 Yes. Possibly I tricked myself. Latest git-buildpackage possibly was still 
 with the older lintian. And then I possibly ran the newest linitian on the 
 dsc file without rebuilding the package before. But I thought I ran a git-
 buildpackage after updating lintian... well I can try to reproduce this 
 and do a bug report regarding lintian if desired.

If you can reproduce it it would make sense to report against
lintian, ACK.

regards,
-mika-


signature.asc
Description: Digital signature


Bug#524790: Updated debian package for fio

2009-08-12 Thread Martin Steigerwald

Hendrik, I will drop you from CC next time, unless you write me you still want 
to follow this.


Hi Michael!

I updated my Debian package to fio-1.32.

I switched it to git-buildpackage. 

You can get and build it like follows:

m...@mango:~/Zeit/fio history | tail -8
 1197  git clone git://github.com/martin21/fio.git
 1198  cd fio
 1199  git branch -a
 1200  git checkout -b upstream origin/upstream
 1201  git checkout -b pristine-tar origin/pristine-tar
 1202  git checkout master
 1203  git-buildpackage
 1204  history | tail

I also put it for download at:

http://people.teamix.net/~ms/debian/lenny/fio/


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.

I am happy to put it onto alioth or somewhere - need to get started on how to 
approach that tough. I'd prefer git over subversion for maintaining the 
package.

Ciao,
-- 
Martin Steigerwald - team(ix) GmbH - http://www.teamix.de
gpg: 19E3 8D42 896F D004 08AC A0CA 1E10 C593 0399 AE90


signature.asc
Description: This is a digitally signed message part.


Bug#524790: Updated debian package for fio

2009-08-12 Thread Jens Axboe
On Wed, Aug 12 2009, Michael Prokop wrote:
 @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.

Done!

Thanks all for working on getting this included.

-- 
Jens Axboe




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#524790: Updated debian package for fio

2009-08-12 Thread Michael Prokop
* 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 

Bug#524790: Updated debian package for fio

2009-08-12 Thread Martin Steigerwald
Am Mittwoch 12 August 2009 schrieb Michael Prokop:
 * Martin Steigerwald m...@teamix.de [20090812 17:18]:
  Hi Michael!
[...]
  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.

All applied. Added a changelog entry for each one. Pushed my changes.

Please pull and review.

 @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.

Since it is only one patch for upstream - except a minor patch for the 
Makefile to build in /usr - and Jens already applied it anyway I decided 
not to use quilt this time.

You replaced dh_clean by dh_prep in

 0003-debian-rules-drop-unnecessary-configure-target-repla.patch

What is the reason? Is dh_clean deprecated?

I forgot to add a ~/.gitconfig with my name and mail address at work. Is 
there any way to rewrite the mail address in the initial git log entries? 
If not, well its just an email address in there that won't work from 
outside of our intranet.

Ciao,
-- 
Martin 'Helios' Steigerwald - http://www.Lichtvoll.de
GPG: 03B0 0D6C 0040 0710 4AFA  B82F 991B EAAC A599 84C7


signature.asc
Description: This is a digitally signed message part.


Bug#524790: Updated debian package for fio

2009-08-12 Thread Michael Prokop
* Martin Steigerwald mar...@lichtvoll.de [20090812 21:13]:
 Am Mittwoch 12 August 2009 schrieb Michael Prokop:
  * Martin Steigerwald m...@teamix.de [20090812 17:18]:
   Hi Michael!
 [...]
   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.

 All applied. Added a changelog entry for each one. Pushed my changes.

Thx.

 Please pull and review.

Just one minor problem: the copyright sign in your git commit isn't
UTF-8, which should be used nowadays in debian maintainer scripts.
Fix it via running:

  iconv -f ISO-8859-1 -t UTF-8 debian/copyright  debian/copyright.new
  mv debian/copyright.new debian/copyright

I've attached a patch (which also changes another '(C)' to '©') that
addresses the issue so you can verify the result. Then the package
should be lintian clean.

  @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.

 Since it is only one patch for upstream - except a minor patch for the
 Makefile to build in /usr - and Jens already applied it anyway I decided
 not to use quilt this time.

ACK

 You replaced dh_clean by dh_prep in

  0003-debian-rules-drop-unnecessary-configure-target-repla.patch

 What is the reason? Is dh_clean deprecated?

You are using 'debhelper (= 7)' in Build-Depends.
debhelper 7 deprecated dh_clean -k in favour of dh_prep.

 I forgot to add a ~/.gitconfig with my name and mail address at work. Is
 there any way to rewrite the mail address in the initial git log entries?
 If not, well its just an email address in there that won't work from
 outside of our intranet.

Demonstrating switch from grml.org to debian.org:

% git filter-branch --commit-filter '
if [ $GIT_AUTHOR_EMAIL = m...@grml.org ];
then
export GIT_AUTHOR_EMAIL=m...@debian.org;
git commit-tree $@;
else
git commit-tree $@;
fi' HEAD

Depending on what you'd like to set also check out
$GIT_COMMITTER_EMAIL  CO. HTH

regards,
-mika-
From 8571251a4850e86027e6ba9a73d458e9030b39fc Mon Sep 17 00:00:00 2001
From: Michael Prokop m...@grml.org
Date: Wed, 12 Aug 2009 22:33:40 +0200
Subject: [PATCH] =?utf-8?q?Fix=20copyright=20unicode=20char=20and=20move=20another=20(C)=20to=20=C2=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit


Signed-off-by: Michael Prokop m...@grml.org
---
 debian/copyright |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 79ab588..1beb522 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Upstream Author:
 
 Jens Axboe jens.ax...@oracle.com
 
-Copyright: © 2005-2006 by Jens Axboe
+Copyright: © 2005-2006 by Jens Axboe
 
 License:
 
@@ -75,5 +75,5 @@ Copyrights notes:
 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
+The Debian packaging is © 2009, Martin Steigerwald m...@teamix.de and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
-- 
1.6.3.3



signature.asc
Description: Digital signature