Re: hwtools should include MemMMXtest
[another reply to myself, how lame :)]
To get the package accepted into the archive today (hi, ibid!), I had
to get the copyright file fixed. So I did an NMU. :)
I hope you don't mind. Patches are attached.
I'm also uploading hwtools 0.6 right now.
--
Digital Electronic Being Intended for Assassination and Nullification
diff -ruN scsitools-0.1.prev/debian/README.Debian scsitools-0.1/debian/README.Debian
--- scsitools-0.1.prev/debian/README.Debian Thu Apr 13 20:35:31 2000
+++ scsitools-0.1/debian/README.Debian Thu Apr 13 19:23:20 2000
@@ -12,10 +12,10 @@
-- Christoph Lameter <clameter@debian.org>
scsitools is a fork of hwtools previously maintained by Christoph Lameter
-(in 1996-1997) & Josip Rodin acting as the Debian QA Team (in 1999).
-It was needed to open the SCSI tools provided by hwtools to other Debian
-architectures than i386 (in effect, hwtools is a collection of tools mainly
-designed for i386).
+(in 1996-1997) & Josip Rodin and Robert Woodcock acting on behalf of the
+Debian QA Team (in 1999). It was needed to open the SCSI tools provided by
+hwtools to other Debian architectures than i386 (in effect, hwtools is a
+collection of tools mainly designed for i386).
TODO:
-----
@@ -28,4 +28,3 @@
+ register scsi-config & tk_scsiformat with menu?
-- Eric Delaunay <delaunay@debian.org>
-
diff -ruN scsitools-0.1.prev/debian/changelog scsitools-0.1/debian/changelog
--- scsitools-0.1.prev/debian/changelog Thu Apr 13 20:35:31 2000
+++ scsitools-0.1/debian/changelog Thu Apr 13 20:31:43 2000
@@ -1,3 +1,20 @@
+scsitools (0.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload, to get it accepted it into the archive,
+ sorry Eric :)
+ * Fixed copyright file to include all authors and copyrights.
+ * Worked around important problems on PowerPC due to signed chars by
+ adding -fsigned-char to $CFLAGS.
+ * Lowered debconf question priority to medium, and made it display the
+ note only on new installs, not upgrades.
+ * Updated rules file to match hwtools, removed some cruft. Added rcw's
+ name to the short list of people who maintained hwtools on behalf of
+ the quality assurance group.
+ * Removed prerm, didn't contain anything useful.
+ * Added rescan-scsi-bus.sh.1 to undocumented list.
+
+ -- Josip Rodin <jrodin@jagor.srce.hr> Thu, 13 Apr 2000 19:35:06 +0200
+
scsitools (0.1-1) unstable; urgency=low
* first release (fork of hwtools 0.5-0.2 that provides scsidev, scsifmt,
diff -ruN scsitools-0.1.prev/debian/config scsitools-0.1/debian/config
--- scsitools-0.1.prev/debian/config Thu Apr 13 20:35:31 2000
+++ scsitools-0.1/debian/config Thu Apr 13 19:24:07 2000
@@ -3,6 +3,5 @@
# Source debconf library.
. /usr/share/debconf/confmodule
-db_input high scsitools/info || true
+[ "$2" ] || db_input medium scsitools/info || true
db_go
-
diff -ruN scsitools-0.1.prev/debian/copyright scsitools-0.1/debian/copyright
--- scsitools-0.1.prev/debian/copyright Thu Apr 13 20:35:31 2000
+++ scsitools-0.1/debian/copyright Thu Apr 13 19:57:31 2000
@@ -1,14 +1,35 @@
This is the Debian Linux prepackaged version of several SCSI tools.
+It was previously maintained by Christoph Lameter (as part of hwtools).
+It's currently maintained by Eric Delaunay <delaunay@lix.polytechnique.fr>.
-Original sources come from:
-scsiinfo, sraw:
- ftp://tsx-11.mit.edu/pub/linux/ALPHA/scsi/
+Original sources and copyrights:
+
+scsiinfo:
+ Copyright (C) 1993 Eric Youngdale
+ Copyright (C) 1994, 1997 Michael Weller (eowmob@exp-math.uni-essen.de)
+ ftp://tsx-11.mit.edu/pub/linux/ALPHA/scsi/
+sraw:
+ Copyright (C) 1993 Eric Youngdale
+ ftp://tsx-11.mit.edu/pub/linux/ALPHA/scsi/
scsidev:
- http://www.garloff.de/kurt/linux/scsidev/
-scsifmt, scsistop:
- ftp://metalab.unc.edu/pub/Linux/system/hardware/
+ Copyright (C) 1994--1997 Eric Youngdale <eric@andante.org>
+ Copyright (C) 2000 Kurt Garloff <garoff@suse.de>
+ http://www.garloff.de/kurt/linux/scsidev/
+scsifmt:
+ Copyright (C) 1996 Alex Butcher (Alex.Butcher@bris.ac.uk)
+ based on the work of Grant R. Guenther (grant@torque.net) and Itai
+ Nahshon. FORMAT_UNIT mechanism taken from FreeBSD's scsifmt.sh.
+ ftp://metalab.unc.edu/pub/Linux/system/hardware/
+scsistop:
+ Copyright (C) 1998 Christoph Conrad (Christoph.Conrad@post.rwth-aachen.de)
+ based on a source by
+ Copyright (C) 1996 Alex Butcher (Alex.Butcher@bris.ac.uk)
+ based on the work of Grant R. Guenther (grant@torque.net) and Itai
+ Nahshon. FORMAT_UNIT mechanism taken from FreeBSD's scsistop.sh.
+ ftp://metalab.unc.edu/pub/Linux/system/hardware/
scsi-spin: Debian native utility,
- ftp://ftp.debian.org/debian/dists/unstable/utils/
+ Copyright (C) 1998 Rob Browning <rlb@cs.utexas.edu>
+ ftp://ftp.debian.org/debian/dists/unstable/utils/
-All programs are licensed under the GNU GPL licence, full text of
-which can be found in /usr/share/common-licenses/GPL.
+All programs are licensed under the GNU GPL licence, full text of which
+can on Debian systems be found in /usr/share/common-licenses/GPL file.
diff -ruN scsitools-0.1.prev/debian/postinst scsitools-0.1/debian/postinst
--- scsitools-0.1.prev/debian/postinst Thu Apr 13 20:35:31 2000
+++ scsitools-0.1/debian/postinst Thu Apr 13 20:31:24 2000
@@ -2,7 +2,11 @@
#DEBHELPER#
-if [ $1 = "configure" ]; then
+if [ "$1" = "configure" ]; then
test -d /dev/scsi || mkdir /dev/scsi
fi
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+[ "$2" ] || db_get scsitools/info || true
diff -ruN scsitools-0.1.prev/debian/prerm scsitools-0.1/debian/prerm
--- scsitools-0.1.prev/debian/prerm Thu Apr 13 20:35:31 2000
+++ scsitools-0.1/debian/prerm Thu Jan 1 01:00:00 1970
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
diff -ruN scsitools-0.1.prev/debian/rules scsitools-0.1/debian/rules
--- scsitools-0.1.prev/debian/rules Thu Apr 13 20:35:31 2000
+++ scsitools-0.1/debian/rules Thu Apr 13 19:53:02 2000
@@ -2,15 +2,16 @@
# Derived from debhelper/dh_make example, and Cristoph Lameter's file. -joy
#export DH_VERBOSE=1
-CFLAGS = -g -O2 -Wall
+CFLAGS = -g -O2 -Wall -fsigned-char
architecture := $(shell dpkg-architecture -qDEB_HOST_ARCH)
build: build-stamp
build-stamp:
dh_testdir
- cd scsiinfo && $(MAKE) KERNEL_INCLUDES=-I/usr/src/linux/include
- cd scsidev && ./configure --prefix=/usr --mandir=/usr/share/man && $(MAKE)
+ cd scsiinfo && $(MAKE) KERNEL_INCLUDES="-I/usr/src/linux/include -fsigned-char"
+ cd scsidev && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+ --mandir='${prefix}'/share/man && $(MAKE)
cd sraw && gcc $(CFLAGS) -s -o sraw srawread.c
cd scsistop && gcc -I/usr/src/linux/include $(CFLAGS) scsistop-0.3.3.c -o scsistop
gcc -I/usr/src/linux/include $(CFLAGS) -o scsi-spin scsi-spin.C
@@ -19,17 +20,11 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp install-stamp
- for i in scsiinfo scsidev ; do \
- cd $$i && $(MAKE) clean || true && cd .. ; done
- cd sraw && rm -f sraw
- cd scsistop && rm -f scsistop
- rm -f scsi-spin
- rm -f scsidev/Makefile
- dh_clean
+ for i in scsiinfo scsidev ; do $(MAKE) -C $$i clean || true ; done
+ dh_clean build-stamp scsi-spin scsidev/Makefile scsistop/scsistop \
+ sraw/sraw
-install: install-stamp
-install-stamp: build-stamp
+install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
@@ -46,9 +41,7 @@
cp -a scsidev/README debian/tmp/usr/share/doc/scsitools/README.scsidev
cp -a scsi-spin.README debian/tmp/usr/share/doc/scsitools/README.scsi-spin
- touch install-stamp
-
-binary-indep: build install
+binary-indep:
# There are no architecture-independent files to be uploaded
# generated by this package. If there were any they would be
# made here.
@@ -59,7 +52,7 @@
dh_installdebconf
dh_installdocs scsidev/scsi.alias
dh_installmanpages
- dh_undocumented scsi-spin.8.gz sraw.8.gz
+ dh_undocumented scsi-spin.8 sraw.8 rescan-scsi-bus.sh.1
dh_installchangelogs
dh_strip
dh_compress
@@ -69,9 +62,6 @@
dh_gencontrol
dh_md5sums
dh_builddeb
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
diff -ruN scsitools-0.1.prev/debian/templates scsitools-0.1/debian/templates
--- scsitools-0.1.prev/debian/templates Thu Apr 13 20:35:31 2000
+++ scsitools-0.1/debian/templates Thu Apr 13 19:24:24 2000
@@ -8,4 +8,3 @@
Il est recommandé de lire les documents tels que
/usr/share/doc/scsitools/README.Debian ainsi que les autres
de ce répertoire avant d'utiliser l'un des programmes fournis.
-
Reply to: