--- dmidecode-2.9.orig/debian/control +++ dmidecode-2.9/debian/control @@ -0,0 +1,25 @@ +Source: dmidecode +Section: utils +Priority: optional +Maintainer: Petter Reinholdtsen +Build-Depends: debhelper (>= 6), dpatch +Standards-Version: 3.7.2 + +Package: dmidecode +Priority: important +Architecture: i386 ia64 amd64 kfreebsd-i386 knetbsd-i386 kfreebsd-amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: lm-sensors (<< 2.8.1-2) +Description: Dump Desktop Management Interface data + The Desktop Management Interface provides a standardized description of + a computer's hardware, including characteristics such as BIOS serial + number and hardware connectors. dmidecode provides a dump of the DMI + data available from the BIOS. It is used as a back-end tool by other + hardware detection programs. + +Package: dmidecode-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: i386 ia64 amd64 kfreebsd-i386 knetbsd-i386 kfreebsd-amd64 +Depends: ${shlibs:Depends} +Description: Dump Desktop Management Interface data (udeb) --- dmidecode-2.9.orig/debian/rules +++ dmidecode-2.9/debian/rules @@ -0,0 +1,98 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +PACKAGE=$(shell dh_listpackages | grep -- -udeb$$) +VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) +ARCH=$(shell dpkg --print-architecture) +UFILENAME=$(PACKAGE)_$(VERSION)_$(ARCH).udeb + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +INSTALL = install + +include /usr/share/dpatch/dpatch.make + +# Flags fetched from the upstream Makefile. Use -Os to make the udeb as +# small as possible. +CFLAGS += -Os + +CFLAGS += -W -Wall -pedantic -Wshadow -Wstrict-prototypes -Wpointer-arith \ + -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef + +# Dropped -ansi as it break building on ia64 [pere 2007-01-09] +CFLAGS += -ansi + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + # Add here commands to configure the package. + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) CFLAGS="$(CFLAGS)" + #/usr/bin/docbook-to-man debian/dmidecode.sgml > dmidecode.1 + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/dmidecode. + $(MAKE) install DESTDIR=$(CURDIR)/debian/dmidecode \ + prefix=/usr mandir=/usr/share/man + + # Install files into udeb directory + $(INSTALL) dmidecode $(CURDIR)/debian/dmidecode-udeb/usr/sbin/dmidecode + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installman + dh_installchangelogs CHANGELOG + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- dmidecode-2.9.orig/debian/watch +++ dmidecode-2.9/debian/watch @@ -0,0 +1,6 @@ +# watch file, `man uscan` for more information +version=2 + +http://savannah.nongnu.org/download/dmidecode/dmidecode-(.*)\.tar\.gz + +# end of file --- dmidecode-2.9.orig/debian/compat +++ dmidecode-2.9/debian/compat @@ -0,0 +1 @@ +6 --- dmidecode-2.9.orig/debian/copyright +++ dmidecode-2.9/debian/copyright @@ -0,0 +1,17 @@ +This package was debianized by Petter Reinholdtsen on +Sun, 9 Nov 2003 09:54:14 +0100. + +It was downloaded from . + +Upstream Authors: Alan Cox and + Jean Delvare . + +Copyright: + +These programs are 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, or (at your option) any +later version. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- dmidecode-2.9.orig/debian/docs +++ dmidecode-2.9/debian/docs @@ -0,0 +1 @@ +README --- dmidecode-2.9.orig/debian/changelog +++ dmidecode-2.9/debian/changelog @@ -0,0 +1,209 @@ +dmidecode (2.9-1.2build1) natty; urgency=low + + * No-change upload to reduce changelogs. + + -- Martin Pitt Mon, 13 Dec 2010 12:39:03 +0100 + +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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 to detect if BIGENDIAN should be defined. + + -- Petter Reinholdtsen Sun, 9 Nov 2003 09:54:14 +0100 + --- dmidecode-2.9.orig/debian/dirs +++ dmidecode-2.9/debian/dirs @@ -0,0 +1,2 @@ +usr/sbin +usr/share/man/man8 --- dmidecode-2.9.orig/debian/dmidecode-udeb.dirs +++ dmidecode-2.9/debian/dmidecode-udeb.dirs @@ -0,0 +1 @@ +usr/sbin --- dmidecode-2.9.orig/debian/patches/20_ansi_c.dpatch +++ dmidecode-2.9/debian/patches/20_ansi_c.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_ansi_c.dpatch by Petter Reinholdtsen +## +## DP: Make sure the code compiles when using -ansi. Renames non-ANSI +## DP: C 'inline' to '__inline'. + +@DPATCH@ +Index: dmidecode/biosdecode.c +=================================================================== +RCS file: /home/pere/src/cvsroot/src/dmidecode/biosdecode.c,v +retrieving revision 1.6 +diff -u -3 -p -u -r1.6 biosdecode.c +--- dmidecode/biosdecode.c 1 Mar 2005 22:04:56 -0000 1.6 ++++ dmidecode/biosdecode.c 1 Mar 2005 22:09:23 -0000 +@@ -502,7 +502,7 @@ static struct bios_entry bios_entries[]= + }; + + /* Believe it or not, this is significantly faster than memcmp and strncmp */ +-static inline int anchor_match(const struct bios_entry *entry, const char *p) ++static __inline int anchor_match(const struct bios_entry *entry, const char *p) + { + size_t i; + +--- dmidecode-2.9.orig/types.h ++++ dmidecode-2.9/types.h +@@ -32,7 +32,7 @@ + #endif + + #ifdef ALIGNMENT_WORKAROUND +-static inline u64 U64(u32 low, u32 high) ++static __inline u64 U64(u32 low, u32 high) + { + u64 self; + --- dmidecode-2.9.orig/debian/patches/00list +++ dmidecode-2.9/debian/patches/00list @@ -0,0 +1,4 @@ +# +# List of patches to apply. +# +20_ansi_c