diff -Nru blktool-4/debian/changelog blktool-4/debian/changelog --- blktool-4/debian/changelog 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/changelog 2015-07-07 23:13:29.000000000 +0000 @@ -1,3 +1,23 @@ +blktool (4-7) unstable; urgency=low + + * New maintainer. (Closes: #695127). + * Fix "blktool readonly is broken" (Closes: #641164). + * bump debhelper version to 9 + * fix changelog-should-mention-qa + * fix ancient-standards-version 3.7.2.2 (current is 3.9.6) + * fix vcs-field-not-canonical + * fix xs-vcs-header-in-debian-control + * add homepage + * changelog: targeting to unstable instaed of experimental + * control: drop unneeded stuff with 3.0quilt format + * copyright: link to GPL-2 instead of versionless GPL + * copyright: migrate to DEP-5 (machine-readable debian/copyright file) + * patches: convert 0001-fix-typos-in-manpage to git patch format + * patches: convert 0002-fix-string-error to git patch format + * copyright: bump license to gpl-2.0+ (was: gpl-2) + + -- Azat Khuzhin Fri, 12 Jun 2015 21:29:25 +0300 + blktool (4-6.1) unstable; urgency=low * Non-maintainer upload. @@ -24,7 +44,6 @@ * Fixed debian/watch file -- Stefan Bauer Thu, 03 Sep 2009 23:45:55 +0200 - blktool (4-4) unstable; urgency=low * The "I don't love you anymore" release. diff -Nru blktool-4/debian/compat blktool-4/debian/compat --- blktool-4/debian/compat 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/compat 2015-06-12 21:58:19.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru blktool-4/debian/control blktool-4/debian/control --- blktool-4/debian/control 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/control 2015-07-07 22:17:17.000000000 +0000 @@ -1,11 +1,12 @@ Source: blktool Section: admin Priority: optional -Maintainer: Stefan Bauer -Build-Depends: cdbs, debhelper (>= 7.4.0), libglib2.0-dev, quilt -Standards-Version: 3.8.4 -XS-Vcs-Git: git://git.debian.org/git/collab-main/blktool.git -XS-Vcs-Browser: http://git.debian.org/?p=collab-maint/blktool.git +Maintainer: Azat Khuzhin +Build-Depends: cdbs, debhelper (>= 9), libglib2.0-dev +Standards-Version: 3.9.6 +Homepage: http://sourceforge.net/projects/gkernel/files/blktool/ +Vcs-Git: git://anonscm.debian.org/collab-maint/blktool.git +Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/blktool.git Package: blktool Architecture: any diff -Nru blktool-4/debian/copyright blktool-4/debian/copyright --- blktool-4/debian/copyright 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/copyright 2015-07-07 22:49:06.000000000 +0000 @@ -1,14 +1,30 @@ -This package was debianized by Eric Dorland on -Fri, 21 Jan 2005 18:58:21 -0500. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: blktool +Upstream-Contact: Jeff Garzik +Source: http://sourceforge.net/projects/gkernel/files/blktool/ -It was downloaded from http://sourceforge.net/projects/gkernel/ +Files: * +Copyright: 2004 Jeff Garzik +License: GPL-2.0+ -Upstream Author: Jeff Garzik +Files: debian/* +Copyright: 2005-2007, Eric Dorland + 2015, Azat Khuzhin +License: GPL-2.0+ -Copyright: - -Copyright 2004 Jeff Garzik - -This program is free-software released under the terms of -GPL 2.0. Please check /usr/share/common-licenses/GPL -for more informations about GPL. +License: GPL-2.0+ + 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; either version 2 of the License, or + (at your option) any later version. + . + 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 program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru blktool-4/debian/patches/0001-fix-typos-in-manpage.patch blktool-4/debian/patches/0001-fix-typos-in-manpage.patch --- blktool-4/debian/patches/0001-fix-typos-in-manpage.patch 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/patches/0001-fix-typos-in-manpage.patch 2015-07-07 22:43:40.000000000 +0000 @@ -1,21 +1,34 @@ ---- blktool.8 2004-08-16 06:09:47.000000000 +0200 -+++ blktool-4/blktool.8 2010-02-14 21:05:53.000000000 +0100 -@@ -191,7 +191,7 @@ +From ba5578e7d2c28011776e6c71dec441ad127d5c83 Mon Sep 17 00:00:00 2001 +From: Azat Khuzhin +Date: Wed, 8 Jul 2015 01:37:09 +0300 +Subject: [PATCH] fix typos in manpage + +--- + blktool.8 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/blktool.8 b/blktool.8 +index a1f5c96..45b7724 100644 +--- a/blktool.8 ++++ b/blktool.8 +@@ -191,7 +191,7 @@ Query or set device bus state (0 off, 1 on, 2 tristate) Query the detected (or overridden, via -t) device class. Typically this will result in 'ATA' or 'SCSI' for most devices. Detection is based on device major; thus your SATA device may appear as -'SCSI'. +\&'SCSI'. - + .TP .B cd-speed -@@ -237,7 +237,7 @@ - +@@ -237,7 +237,7 @@ Omitting the on/off argument will print the current state. + .TP .B media -Lock in (or unlock) a removeable device. +Lock in (or unlock) a removable device. - + .TP .B multiple-count +-- +2.1.4 diff -Nru blktool-4/debian/patches/0002-fix-string-error.patch blktool-4/debian/patches/0002-fix-string-error.patch --- blktool-4/debian/patches/0002-fix-string-error.patch 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/patches/0002-fix-string-error.patch 2015-07-07 22:43:50.000000000 +0000 @@ -1,8 +1,17 @@ -Index: blktool-4/util.c -=================================================================== ---- blktool-4.orig/util.c 2004-08-15 22:02:07.000000000 -0400 -+++ blktool-4/util.c 2011-11-11 09:39:07.337415376 -0500 -@@ -28,7 +28,7 @@ +From 8571ba876fc914ccd71a875ae23b09012604a94e Mon Sep 17 00:00:00 2001 +From: Azat Khuzhin +Date: Wed, 8 Jul 2015 01:42:24 +0300 +Subject: [PATCH] fix string error + +--- + util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.c b/util.c +index 1f3a9ca..2ccf56a 100644 +--- a/util.c ++++ b/util.c +@@ -28,7 +28,7 @@ void pdie(const char *msg, int perr) if (perr) perror(msg); else @@ -11,3 +20,6 @@ if (blkdev >= 0) close(blkdev); exit(1); +-- +2.1.4 + diff -Nru blktool-4/debian/patches/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch blktool-4/debian/patches/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch --- blktool-4/debian/patches/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch 1970-01-01 00:00:00.000000000 +0000 +++ blktool-4/debian/patches/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch 2015-06-12 22:04:40.000000000 +0000 @@ -0,0 +1,71 @@ +From 455ce5d70abb749ab7abb6d0d79963661fdd80c4 Mon Sep 17 00:00:00 2001 +From: Azat Khuzhin +Date: Sat, 1 Nov 2014 22:24:32 +0300 +Subject: [PATCH] Fix 3-d argument for BLKROSET it must be 'const int *' + +Most of *SET ioctls have int type for 3-d argument, except BLKROSET. +So add bc_arg_type enum, build it into bool_comand and install arg_type +to bc_arg_int_ptr for BLKROSET only. + +Debian-bug-id: 641164 +Link: https://bugs.debian.org/641164 +--- + blktool.c | 11 +++++++++-- + blktool.h | 7 +++++++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/blktool.c b/blktool.c +index fbefecd..221a195 100644 +--- a/blktool.c ++++ b/blktool.c +@@ -85,7 +85,7 @@ static struct bool_command bool_cmd_tbl[] = { + { { DEF_BOOL("pio-data"), dc_ata, DEF_HDIO(32BIT) }, + "16-bit", "32-bit" }, + { { DEF_BOOL("readonly"), dc_any, IOCNAME(BLKROGET), IOCNAME(BLKROSET) }, +- DEF_BOOLSTR }, ++ DEF_BOOLSTR, bc_arg_int_ptr }, + { { DEF_BOOL("unmask-irq"), dc_ata, DEF_HDIO(UNMASKINTR) }, + DEF_BOOLSTR }, + { { "wcache", ct_bool, handle_wcache, dc_any, +@@ -171,7 +171,14 @@ static void handle_bool(int argc, char **argv, struct command *cmd) + + } else if ((argc == 4) && (cmd->write_ioctl_name != NULL)) { + do_32 = parse_bool(argc, argv, bcm); +- if (ioctl(blkdev, cmd->write_ioctl, do_32)) ++ ++ int ret; ++ if (bcm->arg_type == bc_arg_int_ptr) { ++ ret = ioctl(blkdev, cmd->write_ioctl, &do_32); ++ } else { ++ ret = ioctl(blkdev, cmd->write_ioctl, do_32); ++ } ++ if (ret) + pdie(cmd->write_ioctl_name, 1); + } + else { +diff --git a/blktool.h b/blktool.h +index fce4387..85add83 100644 +--- a/blktool.h ++++ b/blktool.h +@@ -85,11 +85,18 @@ struct command { + const char *write_ioctl_name; + }; + ++enum bc_arg_type { ++ bc_arg_int, ++ bc_arg_int_ptr, ++}; ++ + struct bool_command { + struct command cmd; + + const char *str_false; + const char *str_true; ++ ++ enum bc_arg_type arg_type; + }; + + struct class_operations { +-- +2.1.4 + diff -Nru blktool-4/debian/patches/series blktool-4/debian/patches/series --- blktool-4/debian/patches/series 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/patches/series 2015-06-12 22:05:10.000000000 +0000 @@ -1,2 +1,3 @@ 0001-fix-typos-in-manpage.patch 0002-fix-string-error.patch +0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch diff -Nru blktool-4/debian/README.source blktool-4/debian/README.source --- blktool-4/debian/README.source 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Building blktool for Debian --------------------------------- - -The blktool source package uses quilt to apply and remove its patches. -Please refer to /usr/share/doc/quilt/README.source for information about how to -use quilt for source packages. diff -Nru blktool-4/debian/rules blktool-4/debian/rules --- blktool-4/debian/rules 2015-07-08 12:44:52.000000000 +0000 +++ blktool-4/debian/rules 2015-07-07 22:19:16.000000000 +0000 @@ -2,4 +2,3 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk diff -Nru blktool-4/debian/source/format blktool-4/debian/source/format --- blktool-4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ blktool-4/debian/source/format 2015-06-12 21:44:25.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)