Package: hwtools
Version: 0.8-5
Severity: normal
I've uploaded an NMU to fix the RC bug and a few minor ones. The diff of
the changes from 0.8-5 to 0.8-5.1 is attached. This needs to be applied
on top of the 0.8-5 debian package. To get the full diff between
upstream 0.8 and debian 0.8-5.1 you can use apt-get source.
Baruch
diff -Nur hwtools-0.8-5/debian/changelog hwtools-0.8-5.1/debian/changelog
--- hwtools-0.8-5/debian/changelog 2005-08-24 22:28:50.000000000 +0100
+++ hwtools-0.8-5.1/debian/changelog 2005-08-24 21:38:22.000000000 +0100
@@ -1,3 +1,15 @@
+hwtools (0.8-5.1) unstable; urgency=low
+
+ * Non-maintainer upload. With blessings from maintainer.
+ * Make some variables static to avoid the use of memcpy function by gcc4. We
+ are not linking with gcc libraries. (Closes: #318540)
+ * Add vi.po for Vietnamese translation (Closes: #311909)
+ * Incorporate patch to initscripts (Closes: #294758)
+ * Description english improved (Closes: #306650)
+ * Moved to compat level 4 from 1!
+
+ -- Baruch Even <[EMAIL PROTECTED]> Wed, 24 Aug 2005 21:38:09 +0100
+
hwtools (0.8-5) unstable; urgency=high
* Removed replacement of manpages buffer.1 cpio.1 and mt.1 (Closes: #291138).
diff -Nur hwtools-0.8-5/debian/compat hwtools-0.8-5.1/debian/compat
--- hwtools-0.8-5/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ hwtools-0.8-5.1/debian/compat 2005-08-24 21:38:05.000000000 +0100
@@ -0,0 +1 @@
+4
diff -Nur hwtools-0.8-5/debian/conffiles hwtools-0.8-5.1/debian/conffiles
--- hwtools-0.8-5/debian/conffiles 2005-08-24 22:28:50.000000000 +0100
+++ hwtools-0.8-5.1/debian/conffiles 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/etc/init.d/hwtools
diff -Nur hwtools-0.8-5/debian/control hwtools-0.8-5.1/debian/control
--- hwtools-0.8-5/debian/control 2005-08-24 22:28:50.000000000 +0100
+++ hwtools-0.8-5.1/debian/control 2005-08-24 21:52:51.000000000 +0100
@@ -2,8 +2,8 @@
Section: utils
Priority: optional
Maintainer: Pierre Ancelot <[EMAIL PROTECTED]>
-Build-Depends: debhelper, bin86
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>> 4.0.0), bin86
+Standards-Version: 3.6.2
Package: hwtools
Architecture: i386
@@ -20,7 +20,7 @@
qic-02 driver and configuration utilities. Adds the qic-02 tapes support
.
Be aware that these tools require some knowledge of what are they
- doing to be used properly, not causing damage to your system.
+ doing to be used properly, otherwise they may cause damage to your system.
.
Some programs that were previously part of this package have been
moved to their own packages (hdparm, scsitools, memtest86)
diff -Nur hwtools-0.8-5/debian/init hwtools-0.8-5.1/debian/init
--- hwtools-0.8-5/debian/init 2005-08-24 22:28:50.000000000 +0100
+++ hwtools-0.8-5.1/debian/init 2005-08-24 21:34:08.000000000 +0100
@@ -26,7 +26,7 @@
start|restart|force-reload|reload)
echo -n "Optimizing hardware..."
optimizehw
- echo
+ echo "done."
;;
stop)
exit 0
@@ -34,7 +34,7 @@
*)
N=/etc/init.d/hwtools
echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- exit 1
+ exit 3
;;
esac
diff -Nur hwtools-0.8-5/debian/po/vi.po hwtools-0.8-5.1/debian/po/vi.po
--- hwtools-0.8-5/debian/po/vi.po 1970-01-01 01:00:00.000000000 +0100
+++ hwtools-0.8-5.1/debian/po/vi.po 2005-08-24 21:31:14.000000000 +0100
@@ -0,0 +1,27 @@
+# Vietnamese Translation for hwtools.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <[EMAIL PROTECTED]>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hwtools 0.8-5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-10-01 08:24+0200\n"
+"PO-Revision-Date: 2005-06-04 17:07+0930\n"
+"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n"
+"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Description
+#: ../templates:3
+msgid "There are no more SCSI utilities in this package."
+msgstr "Không có tiá»n Ãch SCSI còn lại trong gói tin nà y."
+
+#. Description
+#: ../templates:3
+msgid ""
+"The SCSI-related utilities have moved to a separate `scsitools' package."
+msgstr "Những tiá»n Ãch liên quan Äến SCSI Äã di chuyá»n sang má»t
gói «scsitools» riêng rá»i."
diff -Nur hwtools-0.8-5/debian/postrm.debhelper
hwtools-0.8-5.1/debian/postrm.debhelper
--- hwtools-0.8-5/debian/postrm.debhelper 1970-01-01 01:00:00.000000000
+0100
+++ hwtools-0.8-5.1/debian/postrm.debhelper 2005-08-24 21:37:40.000000000
+0100
@@ -0,0 +1,6 @@
+# Automatically added by dh_installdebconf
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_purge
+fi
+# End automatically added section
diff -Nur hwtools-0.8-5/debian/rules hwtools-0.8-5.1/debian/rules
--- hwtools-0.8-5/debian/rules 2005-08-24 22:28:50.000000000 +0100
+++ hwtools-0.8-5.1/debian/rules 2005-08-24 21:51:30.000000000 +0100
@@ -2,7 +2,6 @@
# Derived from debhelper/dh_make example, and Cristoph Lameter's file. -joy
#export DH_VERBOSE=1
-export DH_COMPAT=1
CFLAGS = -g -O2 -Wall
SHELL = /bin/bash -e
@@ -35,23 +34,23 @@
dh_installdirs sbin usr/sbin usr/lib/hwtools \
usr/share/man/man5 usr/share/man/man8 usr/share/doc/hwtools
- cd irqtune && $(MAKE) install DESTDIR=../../debian/tmp
- install -m755 irqtune-wrapper debian/tmp/usr/sbin/irqtune
- cp -a scanport/src/scanport debian/tmp/sbin
- cp -a scanport/src/inb debian/tmp/sbin
- cp -a tpqic02-support-1.9b/qic02conf debian/tmp/usr/sbin/
- cp -a memmxtest/src/image debian/tmp/usr/lib/hwtools/memmxtest.bin
+ cd irqtune && $(MAKE) install DESTDIR=../../debian/hwtools
+ install -m755 irqtune-wrapper debian/hwtools/usr/sbin/irqtune
+ cp -a scanport/src/scanport debian/hwtools/sbin
+ cp -a scanport/src/inb debian/hwtools/sbin
+ cp -a tpqic02-support-1.9b/qic02conf debian/hwtools/usr/sbin/
+ cp -a memmxtest/src/image debian/hwtools/usr/lib/hwtools/memmxtest.bin
# DOS executables
-# cp -a scanport/dos/*.exe debian/tmp/usr/lib/hwtools
-# chmod a-x debian/tmp/usr/lib/hwtools/{*.o,*.exe}
- chmod a-x debian/tmp/usr/lib/hwtools/*.o
+# cp -a scanport/dos/*.exe debian/hwtools/usr/lib/hwtools
+# chmod a-x debian/hwtools/usr/lib/hwtools/{*.o,*.exe}
+ chmod a-x debian/hwtools/usr/lib/hwtools/*.o
# Documentation
- cp -a irqtune/README debian/tmp/usr/share/doc/hwtools/README.irqtune
- cp -a irqtune/README.html debian/tmp/usr/share/doc/hwtools/irqtune.html
- cp -a scanport/README-inb debian/tmp/usr/share/doc/hwtools/README.inb
- cp -a scanport/README-scanport
debian/tmp/usr/share/doc/hwtools/README.scanport
- cp -a memmxtest/doc/MANUAL
debian/tmp/usr/share/doc/hwtools/MANUAL.memmxtest
- cp -a tpqic02-support-1.9b/README.tape-0.7.1.6
debian/tmp/usr/share/doc/hwtools/README.tpqic02-support-0.7.1.6
+ cp -a irqtune/README debian/hwtools/usr/share/doc/hwtools/README.irqtune
+ cp -a irqtune/README.html
debian/hwtools/usr/share/doc/hwtools/irqtune.html
+ cp -a scanport/README-inb
debian/hwtools/usr/share/doc/hwtools/README.inb
+ cp -a scanport/README-scanport
debian/hwtools/usr/share/doc/hwtools/README.scanport
+ cp -a memmxtest/doc/MANUAL
debian/hwtools/usr/share/doc/hwtools/MANUAL.memmxtest
+ cp -a tpqic02-support-1.9b/README.tape-0.7.1.6
debian/hwtools/usr/share/doc/hwtools/README.tpqic02-support-0.7.1.6
binary-indep:
# There are no architecture-independent packages here.
diff -Nur hwtools-0.8-5/memmxtest/src/mtest.c
hwtools-0.8-5.1/memmxtest/src/mtest.c
--- hwtools-0.8-5/memmxtest/src/mtest.c 2005-08-24 22:28:50.000000000 +0100
+++ hwtools-0.8-5.1/memmxtest/src/mtest.c 2005-08-24 21:28:46.000000000
+0100
@@ -1656,7 +1656,7 @@
prepare_pr32 (unsigned long memelems)
{
/* These things have been tested, and generate max-length sequences. */
- unsigned long xormasks[33] =
+ static unsigned long xormasks[33] =
{0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0x6021UL, /* 16 */
@@ -1677,7 +1677,7 @@
0x30000021UL,
0x60008001UL}; /* 32 */
- unsigned long andmasks[33] =
+ static unsigned long andmasks[33] =
{0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0x0000FFFFUL, /* 16 */
@@ -1698,7 +1698,7 @@
0x7FFFFFFFUL,
0xFFFFFFFFUL}; /* 32 */
- unsigned long trigbits[33] =
+ static unsigned long trigbits[33] =
{0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0x00008000UL, /* 16 */
