Imported Debian patch 2.12-3

debian/changelog

@@ -0,0 +1,341 @@
+dmidecode (2.12-3) unstable; urgency=medium
+
+  * debian/control
+    - bump Standards-Version to 3.9.5
+    - add Vcs-*
+  * New Maintainer ( Closes: #748486)
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 19 May 2014 18:01:43 +0200
+
+dmidecode (2.12-2) unstable; urgency=low
+
+  * Also build for armhf (Closes: #715139).
+
+ -- Luk Claes <luk@debian.org>  Thu, 15 Aug 2013 11:24:31 +0200
+
+dmidecode (2.12-1) unstable; urgency=low
+
+  * New upstream version.
+  * Add watch file.
+  * Add upstream patch to kill warnings (Closes: #706004).
+
+ -- Luk Claes <luk@debian.org>  Tue, 07 May 2013 08:52:36 +0200
+
+dmidecode (2.11+20120326-3) unstable; urgency=low
+
+  * Take over maintenance with maintainer's consent.
+
+ -- Luk Claes <luk@debian.org>  Sun, 10 Mar 2013 21:55:43 +0100
+
+dmidecode (2.11+20120326-2) unstable; urgency=low
+
+  * Updating GPL boilerplate in copyright file.
+  * Switching to xz compression.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Fri, 29 Jun 2012 04:59:24 +0200
+
+dmidecode (2.11+20120326-1) unstable; urgency=low
+
+  * Merging upstream version 2.11+20120326.
+  * Removing chassis-type.patch, included upstream.
+  * Removing type16-fix.patch, including upstream.
+  * Removing smbios-271.patch, included upstream.
+  * Rediffing manpage-hyphen.patch.
+  * Renumbering patches.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Tue, 26 Jun 2012 01:07:02 +0200
+
+dmidecode (2.11-9) unstable; urgency=low
+
+  * Adding debug package.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Fri, 18 May 2012 13:29:25 +0200
+
+dmidecode (2.11-8) unstable; urgency=low
+
+  * Using package type instead of custom field for udeb package.
+  * Adding patch to escape hypens in manpage.
+  * Also passing cppflags to make (Closes: #655891).
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Fri, 18 May 2012 12:36:27 +0200
+
+dmidecode (2.11-7) unstable; urgency=low
+
+  * Updating compression handling for udeb with newer debhelper.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Fri, 18 May 2012 08:00:01 +0200
+
+dmidecode (2.11-6) unstable; urgency=low
+
+  * Also passing ldflags to configure to enable all hardening build
+    flags (Closes: #655891).
+  * Updating to standards version 3.9.3.
+  * Updating copyright file machine-readable format version 1.0.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Mon, 16 Apr 2012 09:23:37 +0000
+
+dmidecode (2.11-5) unstable; urgency=low
+
+  * Updating year in copyright file.
+  * Updating to debhelper version 9.
+  * Adding patch to avoid overwriting build environment rather than to
+    just extend it.
+  * Simplifying CFLAGS handing in rules.
+  * Enabling hardening build options (Closes: #655891).
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Sat, 21 Jan 2012 11:16:31 +0100
+
+dmidecode (2.11-4) unstable; urgency=low
+
+  * Using compression level 9 also for binary packages.
+  * Adding patch from Jean Delvare <khali@linux-fr.org> to fix boundary
+    checks of memory array location codes (DMI type 16).
+  * Adding patch from Jean Delvare <khali@linux-fr.org> to update to
+    support SMBIOS specification version 2.7.1.
+  * Sorting overrides in rules alphabetically.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Fri, 28 Oct 2011 21:54:37 +0200
+
+dmidecode (2.11-3) unstable; urgency=low
+
+  * Adding patch from Svante Signell <svante.signell@telia.com> to
+    enable build of all targets on GNU/Hurd (Closes: #643649).
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Wed, 28 Sep 2011 13:03:50 +0200
+
+dmidecode (2.11-2) unstable; urgency=low
+
+  * Adding patch from Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
+    to correctly decode the chassis-type (Closes: #637028).
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Wed, 28 Sep 2011 06:42:29 +0200
+
+dmidecode (2.11-1) unstable; urgency=low
+
+  * Taking over package from Petter with thanks for his past work on the
+    package.
+  * Merging upstream version 2.11 (Closes: #531843, #639169).
+  * Removing useless whitespaces at EOL and EOF.
+  * Updating to debhelper version 8.
+  * Updating to standards version 3.9.2.
+  * Adding homepage field.
+  * Switching to source format 3.0 (quilt).
+  * Removing pre-squeeze conflict against lm-sensors.
+  * Using architecture patterns (Closes: #480571).
+  * Sorting depends.
+  * Adding misc-depends to udeb.
+  * Removing watch file.
+  * Rewriting package descriptions.
+  * Rewriting copyright file in machine-interpretable format.
+  * Prefixing debhelper files with package name.
+  * Adding authors file to docs.
+  * Minimizing rules file.
+  * Sorting fields in control.
+  * Removing unused debhelper dirs files.
+  * Adding debhelper install files.
+  * Avoid installing readme file, no additional useful content.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Tue, 27 Sep 2011 21:23:46 +0200
+
+dmidecode (2.9-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Correctly set package type for the udeb. Allows to simplify debian/rules
+    and ensures a correct dependency on libc6-udeb. Closes: #562014.
+  * Update debhelper compat to version 6.
+  * Don't ignore errors during 'make clean'.
+
+ -- Frans Pop <fjp@debian.org>  Tue, 22 Dec 2009 05:13:24 +0100
+
+dmidecode (2.9-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS on kfreebsd-amd64 by adding it to the list of supported
+    architectures for the second package (Closes: #493385). Thanks to
+    Petr Salinger.
+
+ -- Cyril Brulebois <kibi@debian.org>  Tue, 30 Jun 2009 01:49:22 +0200
+
+dmidecode (2.9-1) unstable; urgency=low
+
+  * New upstream release (Closes: #413747).
+   - Drop patch 30_upstream_20060601 included upstream.
+   - Reintroduce -ansi and extend 20_ansi_c.dpatch to make the source
+     ANSI C compliant again. (Closes: #406031)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Fri, 18 May 2007 11:33:24 +0200
+
+dmidecode (2.8-4) unstable; urgency=low
+
+  * Update CFLAGS line, drop -ansi to avoid build failure on
+    ia64 (Closes: #406031), and add  -Winline -Wundef to
+    match the upstream makefile.  Thanks to Dann Frazier for the clue.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Tue,  9 Jan 2007 09:11:26 +0100
+
+dmidecode (2.8-3) unstable; urgency=low
+
+  * New patch 30_upstream_20060601 from upstream CVS.
+    - Detect EFI support at run time, to work properly on x86-based
+      Mac (Closes: #375997)
+    - Avoids unaligned memory access on ia64 and other archs.  (Closes: #398473)
+  * Drop the patch to remove the product name lookup table from vpddecode,
+    to avoid user visible changes this late in the debian release.
+  * Drop patch to fix typo in Chassis height, to avoid user visible change.
+  * Update standards-version from 2.6.2 to 2.7.2.  No change needed.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun,  7 Jan 2007 20:07:42 +0100
+
+dmidecode (2.8-2) unstable; urgency=low
+
+  * Add kfreebsd-amd64 to the architecture list.  It is claimed to
+    work. (Closes: #355454)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Wed, 29 Mar 2006 22:44:20 +0200
+
+dmidecode (2.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Increased debhelper compat level from 3 to 4.
+  * Add ${misc:Depends} as a dependency.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Fri, 10 Feb 2006 21:52:51 +0100
+
+dmidecode (2.7-2) unstable; urgency=low
+
+  * Change priority for dmidecode from optional to important to
+    match override file.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat, 20 Aug 2005 23:39:08 +0200
+
+dmidecode (2.7-1) unstable; urgency=low
+
+  * New upstream release.
+    - Include new command line interface making it easier for scripts
+      to extract the values they want.
+    - Default output format is slightly changed.  This might break existing
+      scripts, which should use the new command line options instead.
+    - Added supprt for more products in vpddecode.
+  * Remove David Z. Maze as uploader on request from Jeroen van
+    Wolffelaar.  David is giving up package maintainence.
+  * Removing 30_upstream_20050605 now included in release 2.7.
+  * Updated Standards-Version to 3.6.2.  No changes.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat, 20 Aug 2005 23:20:14 +0200
+
+dmidecode (2.6-2) unstable; urgency=low
+
+  * Add new archs kfreebsd-i386 knetbsd-i386. (Closes: #303511)
+  * Add 30_upstream_20050605.dpatch to get the latest changes
+    from upstream CVS.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun,  5 Jun 2005 13:51:55 +0200
+
+dmidecode (2.6-1) unstable; urgency=low
+
+  * New Upstream version 2.6.
+    - Fixes signed issue.  Dropping obsolete 10_highmem.dpatch.
+  * Updated build rules.  Removed -DUSE_MMAP from CFLAGS, as this define is
+    in config.h now.
+  * Update the list of compile flags in the rules tile to match the
+    ones used by upstream.
+  * Add 20_ansi_c.dpatch to get code to compile using -ansi.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Thu,  3 Mar 2005 21:24:37 +0100
+
+dmidecode (2.5-2) unstable; urgency=low
+
+  * Fix signed/unsigned issue making dmidecode fail on machines with
+    lots of ram.  New patch 10_highmem.dpatch.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat, 19 Feb 2005 22:55:58 +0100
+
+dmidecode (2.5-1) unstable; urgency=low
+
+  * New upstream version 2.5.
+    - Obsoletes 10_from_upstream_20040716.dpatch.  Removed.
+    - Changes in 20_typo_main.dpatch is now in upstream tarball.  Removed.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Mon, 22 Nov 2004 10:32:13 +0100
+
+dmidecode (2.4-3) unstable; urgency=low
+
+  * Patch main() to avoid compile failure. (Closes: #261322)
+  * Add some compiler flags to get more warnings.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 25 Jul 2004 08:51:16 +0200
+
+dmidecode (2.4-2) unstable; urgency=low
+
+  * Add amd64 as a build architecture. (Closes: #252318)
+  * Add patch 10_from_upstream_20040716.dpatch fetched from
+    upstream CVS.  Removed patch 10_install_rules.dpatch now included
+    in upstream CVS.
+  * Build dmidecode-udeb.  Not using debhelper udeb support to make
+    sure the package is still buildable in Woody.  Stole some code
+    from discover1 to make sure the udeb is really an
+    udeb.  (Closes: #259265)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Tue, 20 Jul 2004 09:56:28 +0200
+
+dmidecode (2.4-1) unstable; urgency=low
+
+  * New upstream version 2.4.
+    - Includes manual pages. (Closes: #221681)
+  * Start using dpatch instead of home-grown patching system.  Add
+    build dependency on dpatch.  Move local changes into
+    10-enable-ia64.dpatch.
+  * Add debian/watch to make it easier to discover new versions
+    of the source.
+  * Get rid of lintian warnings.
+  * Changed to use latest standard version (3.6.1.0).  No modifications
+    needed.
+  * Remove 10-enable-ia64.dpatch.  It is no longer needed, as ia64
+    builds are detected at automatically compile time now.
+  * New 10_install_rules.dpatch making the install rules easier to
+    override, making sure the manual pages are installed in the
+    correct location.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Fri, 19 Mar 2004 23:49:07 +0100
+
+dmidecode (2.3-5) unstable; urgency=low
+
+  * Move debian specific patches into debian/patches/, and apply
+    them at build time.
+  * Drop useless BIGENDIAN patch, as this program is untested
+    on big endian machines.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Tue,  2 Dec 2003 23:53:19 +0100
+
+dmidecode (2.3-4) unstable; urgency=low
+
+  * Add support for ia64.  Patch from Dann Frazier. (Closes: #221782).
+
+ -- Petter Reinholdtsen <pere@debian.org>  Thu, 20 Nov 2003 11:30:39 +0100
+
+dmidecode (2.3-3) unstable; urgency=low
+
+  * Conflict with lm-sensors << 2.8.1-2, not <= 2.8.1-2.
+    (Closes: #221071).
+
+ -- Petter Reinholdtsen <pere@debian.org>  Mon, 17 Nov 2003 09:19:29 +0100
+
+dmidecode (2.3-2) unstable; urgency=low
+
+  * Remember to include the upstream README in the binary package.
+  * Add David Z. Maze as uploader and co-maintainer.
+  * Add conflict on lm-sensors (<= 2.8.1-2), as the current and
+    previous versions of lm-sensors contained an old version of
+    dmidecode.  The next version will depend on dmidecode instead.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Nov 2003 09:55:25 +0100
+
+dmidecode (2.3-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #169842)
+  * Limit arch to i386 for now.  I'm not sure if other archs
+    can use these tools.
+  * Upstream is missing manual pages.  Patches are welcome. :)
+  * Use <endian.h> to detect if BIGENDIAN should be defined.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun,  9 Nov 2003 09:54:14 +0100

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,45 @@
+Source: dmidecode
+Section: utils
+Priority: optional
+Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/dmidecode.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/dmidecode.git
+Homepage: http://dmidecode.nongnu.org/
+
+Package: dmidecode
+Priority: important
+Architecture: any-amd64 armhf ia64 any-i386
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: SMBIOS/DMI table decoder
+ Dmidecode reports information about the system's hardware as described in the
+ system BIOS according to the SMBIOS/DMI standard.
+ .
+ This information typically includes system manufacturer, model name, serial
+ number, BIOS version, asset tag as well as a lot of other details of varying
+ level of interest and reliability depending on the manufacturer. This will
+ often include usage status for the CPU sockets, expansion slots (e.g. AGP, PCI,
+ ISA) and memory module slots, and the list of I/O ports (e.g. serial, parallel,
+ USB).
+ .
+ Beware that DMI data have proven to be too unreliable to be blindly trusted.
+ Dmidecode does not scan the hardware, it only reports what the BIOS told it to.
+
+Package: dmidecode-dbg
+Section: debug
+Priority: extra
+Architecture: any-amd64 armhf ia64 any-i386
+Depends: ${misc:Depends}, dmidecode (= ${binary:Version})
+Description: SMBIOS/DMI table decoder (debug)
+ Dmidecode reports information about the system's hardware as described in the
+ system BIOS according to the SMBIOS/DMI standard.
+ .
+ This package contains the debugging symbols.
+
+Package: dmidecode-udeb
+Section: debian-installer
+Architecture: any-amd64 armhf ia64 any-i386
+Package-Type: udeb
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: SMBIOS/DMI table decoder (udeb)

debian/copyright

@@ -0,0 +1,33 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dmidecode
+Upstream-Contact: dmidecode-devel@nongnu.org
+Source: http://download.savannah.gnu.org/releases/demidecode/
+
+Files: *
+Copyright: 2002-2011 Jean Delvare <khali@linux-fr.org>
+           2002 Alan Cox <alan@redhat.com>
+           2010 Anton Arapov <anton@redhat.com>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2003-2007 Petter Reinholdtsen <pere@debian.org>
+           2011-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
+           2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
+License: GPL-2+
+
+License: GPL-2+
+ This program 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 program 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 <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.

debian/dmidecode-udeb.install

@@ -0,0 +1 @@
+usr/sbin/dmidecode

debian/dmidecode.docs

@@ -0,0 +1 @@
+AUTHORS

debian/dmidecode.install

@@ -0,0 +1 @@
+usr

debian/patches/01-ansi-c.patch

@@ -0,0 +1,17 @@
+Author: Petter Reinholdtsen <pere@hungry.com>
+Description:
+ Make sure the code compiles when using -ansi. Renames non-ANSI C 'inline' to
+ '__inline'.
+
+diff -Naurp dmidecode.orig/types.h dmidecode/types.h
+--- dmidecode.orig/types.h	2011-09-27 17:09:22.211059414 +0200
++++ dmidecode/types.h	2011-09-27 17:21:35.362694344 +0200
+@@ -32,7 +32,7 @@ typedef struct {
+ #endif
+ 
+ #ifdef ALIGNMENT_WORKAROUND
+-static inline u64 U64(u32 low, u32 high)
++static __inline u64 U64(u32 low, u32 high)
+ {
+ 	u64 self;
+ 

debian/patches/02-hurd.patch

@@ -0,0 +1,15 @@
+Author: Svante Signell <svante.signell@telia.com>
+Description: Enable build of all targets on GNU/Hurd (Closes: #643649).
+
+diff -Naurp dmidecode.orig/Makefile dmidecode/Makefile
+--- dmidecode.orig/Makefile	2011-09-28 06:23:12.627245890 +0200
++++ dmidecode/Makefile	2011-09-28 13:02:12.089955791 +0200
+@@ -39,7 +39,7 @@ INSTALL_PROGRAM := $(INSTALL) -m 755
+ RM              := rm -f
+ 
+ # BSD make provides $MACHINE, but GNU make doesn't
+-MACHINE ?= $(shell uname -m 2>/dev/null)
++MACHINE ?= $(shell uname -m 2>/dev/null | cut - -d- -f 1)
+ 
+ # These programs are only useful on x86
+ PROGRAMS-i386 := biosdecode ownership vpddecode

debian/patches/03-build.patch

@@ -0,0 +1,24 @@
+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
+Description: Avoid overwriting build environment rather than to just extend it.
+
+diff -Naurp dmidecode.orig/Makefile dmidecode/Makefile
+--- dmidecode.orig/Makefile	2011-10-28 21:49:16.510949714 +0200
++++ dmidecode/Makefile	2012-01-21 11:05:50.109410854 +0100
+@@ -13,7 +13,7 @@
+ #
+ 
+ CC      = gcc
+-CFLAGS  = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
++CFLAGS += -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+           -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
+ #CFLAGS += -DBIGENDIAN
+ #CFLAGS += -DALIGNMENT_WORKAROUND
+@@ -23,7 +23,7 @@ CFLAGS += -O2
+ #CFLAGS += -g
+ 
+ # Pass linker flags here
+-LDFLAGS =
++#LDFLAGS =
+ 
+ DESTDIR =
+ prefix  = /usr/local

debian/patches/04-manpage-hyphen.patch

@@ -0,0 +1,204 @@
+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
+Description: Escaping hyphens in manpage.
+
+diff -Naurp dmidecode.orig/man/dmidecode.8 dmidecode/man/dmidecode.8
+--- dmidecode.orig/man/dmidecode.8	2012-06-25 23:23:43.849293701 +0200
++++ dmidecode/man/dmidecode.8	2012-06-26 01:12:39.578227162 +0200
+@@ -8,7 +8,7 @@ dmidecode \- \s-1DMI\s0 table decoder
+ .SH DESCRIPTION
+ .B dmidecode
+ is a tool for dumping a computer's \s-1DMI\s0 (some say \s-1SMBIOS\s0) table
+-contents in a human-readable format. This table contains a description of the
++contents in a human\-readable format. This table contains a description of the
+ system's hardware components, as well as other useful pieces of information
+ such as serial numbers and \s-1BIOS\s0 revision. Thanks to this table, you can
+ retrieve this information without having to probe for the actual hardware.
+@@ -32,7 +32,7 @@ Handle 0x0002, DMI type 2, 8 bytes.
+ Base Board Information
+         Manufacturer: Intel
+         Product Name: C440GX+
+-        Version: 727281-001
++        Version: 727281\-001
+         Serial Number: INCY92700942
+ 
+ Each record has:
+@@ -45,7 +45,7 @@ A type. The \s-1SMBIOS\s0 specification
+ a computer can be made of. In this example, the type is 2, which
+ means that the record contains "Base Board Information".
+ .IP \(bu
+-A size. Each record has a 4-byte header (2 for the handle, 1 for the type,
++A size. Each record has a 4\-byte header (2 for the handle, 1 for the type,
+ 1 for the size), the rest is used by the record data. This value doesn't
+ take text strings into account (these are placed at the end of the record),
+ so the actual length of the record may be (and is often) greater than the
+@@ -57,42 +57,42 @@ and serial number.
+ 
+ .SH OPTIONS
+ .TP
+-.BR "-d" ", " "--dev-mem FILE"
++.BR "\-d" ", " "\-\-dev\-mem FILE"
+ Read memory from device \fBFILE\fR (default: \fB/dev/mem\fR)
+ .TP
+-.BR "-q" ", " "--quiet"
++.BR "\-q" ", " "\-\-quiet"
+ Be less verbose. Unknown, inactive and \s-1OEM\s0-specific entries are not
+-displayed. Meta-data and handle references are hidden.
++displayed. Meta\-data and handle references are hidden.
+ .TP
+-.BR "-s" ", " "--string KEYWORD"
++.BR "\-s" ", " "\-\-string KEYWORD"
+ Only display the value of the \s-1DMI\s0 string identified by \fBKEYWORD\fR.
+-\fBKEYWORD\fR must be a keyword from the following list: \fBbios-vendor\fR,
+-\fBbios-version\fR, \fBbios-release-date\fR,
+-\fBsystem-manufacturer\fR, \fBsystem-product-name\fR,
+-\fBsystem-version\fR, \fBsystem-serial-number\fR,
+-\fBsystem-uuid\fR,
+-\fBbaseboard-manufacturer\fR, \fBbaseboard-product-name\fR,
+-\fBbaseboard-version\fR, \fBbaseboard-serial-number\fR,
+-\fBbaseboard-asset-tag\fR, \fBchassis-manufacturer\fR,
+-\fBchassis-type\fR,
+-\fBchassis-version\fR, \fBchassis-serial-number\fR,
+-\fBchassis-asset-tag\fR, \fBprocessor-family\fR,
+-\fBprocessor-manufacturer\fR,
+-\fBprocessor-version\fR, \fBprocessor-frequency\fR.
++\fBKEYWORD\fR must be a keyword from the following list: \fBbios\-vendor\fR,
++\fBbios\-version\fR, \fBbios\-release\-date\fR,
++\fBsystem\-manufacturer\fR, \fBsystem\-product\-name\fR,
++\fBsystem\-version\fR, \fBsystem\-serial\-number\fR,
++\fBsystem\-uuid\fR,
++\fBbaseboard\-manufacturer\fR, \fBbaseboard\-product\-name\fR,
++\fBbaseboard\-version\fR, \fBbaseboard\-serial\-number\fR,
++\fBbaseboard\-asset\-tag\fR, \fBchassis\-manufacturer\fR,
++\fBchassis\-type\fR,
++\fBchassis\-version\fR, \fBchassis\-serial\-number\fR,
++\fBchassis\-asset\-tag\fR, \fBprocessor\-family\fR,
++\fBprocessor\-manufacturer\fR,
++\fBprocessor\-version\fR, \fBprocessor\-frequency\fR.
+ Each keyword corresponds to a given \s-1DMI\s0 type and a given offset
+ within this entry type.
+ Not all strings may be meaningful or even defined on all systems. Some
+ keywords may return more than one result on some systems (e.g.
+-\fBprocessor-version\fR on a multi-processor system).
++\fBprocessor\-version\fR on a multi\-processor system).
+ If \fBKEYWORD\fR is not provided or not valid, a list of all valid
+ keywords is printed and
+ .B dmidecode
+ exits with an error.
+ This option cannot be used more than once.
+ .TP
+-.BR "-t" ", " "--type TYPE"
++.BR "\-t" ", " "\-\-type TYPE"
+ Only display the entries of type \fBTYPE\fR. \fBTYPE\fR can be either a
+-\s-1DMI\s0 type number, or a comma-separated list of type numbers, or a
++\s-1DMI\s0 type number, or a comma\-separated list of type numbers, or a
+ keyword from the following list: \fBbios\fR, \fBsystem\fR,
+ \fBbaseboard\fR, \fBchassis\fR, \fBprocessor\fR, \fBmemory\fR,
+ \fBcache\fR, \fBconnector\fR, \fBslot\fR. Refer to the DMI TYPES section
+@@ -104,28 +104,28 @@ is printed and
+ .B dmidecode
+ exits with an error.
+ .TP
+-.BR "-u" ", " "--dump"
++.BR "\-u" ", " "\-\-dump"
+ Do not decode the entries, dump their contents as hexadecimal instead.
+ Note that this is still a text output, no binary data will be thrown upon
+ you. The strings attached to each entry are displayed as both
+ hexadecimal and \s-1ASCII\s0. This option is mainly useful for debugging.
+ .TP
+-.BR "  " "  " "--dump-bin FILE"
++.BR "  " "  " "\-\-dump\-bin FILE"
+ Do not decode the entries, instead dump the DMI data to a file in binary
+-form. The generated file is suitable to pass to \fB--from-dump\fR
++form. The generated file is suitable to pass to \fB\-\-from\-dump\fR
+ later.
+ .TP
+-.BR "  " "  " "--from-dump FILE"
++.BR "  " "  " "\-\-from\-dump FILE"
+ Read the DMI data from a binary file previously generated using 
+-\fB--dump-bin\fR.
++\fB\-\-dump\-bin\fR.
+ .TP
+-.BR "-h" ", " "--help"
++.BR "\-h" ", " "\-\-help"
+ Display usage information and exit
+ .TP
+-.BR "-V" ", " "--version"
++.BR "\-V" ", " "\-\-version"
+ Display the version and exit
+ .P
+-Options --string, --type and --dump-bin
++Options \-\-string, \-\-type and \-\-dump\-bin
+ determine the output format and are mutually exclusive.
+ .P
+ Please note in case of
+@@ -161,10 +161,10 @@ Type	Information
+ 15	System Event Log
+ 16	Physical Memory Array
+ 17	Memory Device
+-18	32-bit Memory Error
++18	32\-bit Memory Error
+ 19	Memory Array Mapped Address
+ 20	Memory Device Mapped Address
+-21	Built-in Pointing Device
++21	Built\-in Pointing Device
+ 22	Portable Battery
+ 23	System Reset
+ 24	Hardware Security
+@@ -173,10 +173,10 @@ Type	Information
+ 27	Cooling Device
+ 28	Temperature Probe
+ 29	Electrical Current Probe
+-30	Out-of-band Remote Access
++30	Out\-of\-band Remote Access
+ 31	Boot Integrity Services
+ 32	System Boot
+-33	64-bit Memory Error
++33	64\-bit Memory Error
+ 34	Management Device
+ 35	Management Device Component
+ 36	Management Device Threshold Data
+@@ -189,12 +189,12 @@ Type	Information
+ .TE
+ 
+ Additionally, type 126 is used for disabled entries and type 127 is an
+-end-of-table marker. Types 128 to 255 are for \s-1OEM\s0-specific data.
++end\-of\-table marker. Types 128 to 255 are for \s-1OEM\s0-specific data.
+ .B dmidecode
+ will display these entries by default, but it can only decode them
+ when the vendors have contributed documentation or code for them.
+ 
+-Keywords can be used instead of type numbers with \fB--type\fR.
++Keywords can be used instead of type numbers with \fB\-\-type\fR.
+ Each keyword is equivalent to a list of type numbers:
+ 
+ .TS
+@@ -213,22 +213,22 @@ connector	8
+ slot	9
+ .TE
+ 
+-Keywords are matched case-insensitively. The following command lines are equivalent:
++Keywords are matched case\-insensitively. The following command lines are equivalent:
+ .IP \(bu "\w'\(bu'u+1n"
+-dmidecode --type 0 --type 13
++dmidecode \-\-type 0 \-\-type 13
+ .IP \(bu
+-dmidecode --type 0,13
++dmidecode \-\-type 0,13
+ .IP \(bu
+-dmidecode --type bios
++dmidecode \-\-type bios
+ .IP \(bu
+-dmidecode --type BIOS
++dmidecode \-\-type BIOS
+ 
+ .SH BINARY DUMP FILE FORMAT
+-The binary dump files generated by --dump-bin and read using --from-dump
++The binary dump files generated by \-\-dump\-bin and read using \-\-from\-dump
+ are formatted as follows:
+ .IP \(bu "\w'\(bu'u+1n"
+ The SMBIOS or DMI entry point is located at offset 0x00.
+-It is crafted to hard-code the table address at offset 0x20.
++It is crafted to hard\-code the table address at offset 0x20.
+ .IP \(bu "\w'\(bu'u+1n"
+ The DMI table is located at offset 0x20.
+ 

debian/patches/05-supported-smbios-ver.patch

@@ -0,0 +1,11 @@
+--- dmidecode/dmidecode.c	2013/04/24 18:11:56	1.175
++++ dmidecode/dmidecode.c	2013/04/26 19:05:48	1.176
+@@ -69,7 +69,7 @@
+ #define out_of_spec "<OUT OF SPEC>"
+ static const char *bad_index = "<BAD INDEX>";
+ 
+-#define SUPPORTED_SMBIOS_VER 0x0207
++#define SUPPORTED_SMBIOS_VER 0x0208
+ 
+ /*
+  * Type-independant Stuff

debian/patches/series

@@ -0,0 +1,5 @@
+01-ansi-c.patch
+02-hurd.patch
+03-build.patch
+04-manpage-hyphen.patch
+05-supported-smbios-ver.patch

debian/rules

@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh ${@}
+
+override_dh_auto_build:
+	dh_auto_build -- CFLAGS="$(CFLAGS) $(CPPFLAGS) -Os -ansi" LDFLAGS="$(LDFLAGS)"
+
+override_dh_auto_install:
+	dh_auto_install -- prefix=/usr
+
+	# remove useless files
+	rm -f debian/tmp/usr/share/doc/dmidecode/CHANGELOG
+	rm -f debian/tmp/usr/share/doc/dmidecode/README
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz -z9
+
+override_dh_install:
+	dh_install --fail-missing
+
+override_dh_strip:
+	dh_strip --dbg-package=dmidecode-dbg

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/source/options

@@ -0,0 +1,2 @@
+compression = xz
+compression-level = 9

debian/watch

@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
+http://download.savannah.gnu.org/releases/dmidecode/dmidecode-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))