--- lshw-02.10.orig/debian/control +++ lshw-02.10/debian/control @@ -0,0 +1,35 @@ +Source: lshw +Section: utils +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Ghe Rivero +Build-Depends: debhelper (>> 3.0.0), docbook-utils, libgtk2.0-dev, dpatch +Standards-Version: 3.7.2 + +Package: lshw +Architecture: any +Depends: ${shlibs:Depends}, pciutils, usbutils +Description: information about hardware configuration + A small tool to provide detailed information on the hardware + configuration of the machine. It can report exact memory + configuration, firmware version, mainboard configuration, CPU version + and speed, cache configuration, bus speed, etc. on DMI-capable x86 + systems, on some PowerPC machines (PowerMac G4 is known to work) and AMD64. + . + Information can be output in plain text, HTML or XML. + . + Homepage: http://ezix.org/project/wiki/HardwareLiSter + +Package: lshw-gtk +Architecture: any +Depends: ${shlibs:Depends}, pciutils, usbutils +Description: information about hardware configuration + A small tool to provide detailed information on the hardware + configuration of the machine. It can report exact memory + configuration, firmware version, mainboard configuration, CPU version + and speed, cache configuration, bus speed, etc. on DMI-capable x86 + systems, on some PowerPC machines (PowerMac G4 is known to work) and AMD64. + . + This package provides lshw-gtk (the GTK+ version) + . + Homepage: http://ezix.org/project/wiki/HardwareLiSter \ No newline at end of file --- lshw-02.10.orig/debian/lshw.dirs +++ lshw-02.10/debian/lshw.dirs @@ -0,0 +1 @@ +usr/bin --- lshw-02.10.orig/debian/rules +++ lshw-02.10/debian/rules @@ -0,0 +1,124 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatibility version to use. +export DH_COMPAT=4 + +include /usr/share/dpatch/dpatch.make + +CXX_DEB_FLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + export CXX_DEB_FLAGS += -O0 +else + export CXX_DEB_FLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + export INSTALL_PROGRAM += -s +endif + +ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux-gnu) + export CXX_DEB_FLAGS = -Wall -g +endif + + + + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp patch-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) -C src core + $(MAKE) -C src gui + #/usr/bin/docbook-to-man debian/lshw.sgml > lshw.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) -C src clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/lshw. + $(MAKE) install DESTDIR=$(CURDIR)/debian/lshw + $(MAKE) install-gui DESTDIR=$(CURDIR)/debian/lshw-gtk + + # data files supplied by pciutils and usbutils + rm -rf $(CURDIR)/debian/lshw/usr/share/lshw + pod2man --lax $(CURDIR)/debian/patches/lshw-gtk.pod > $(CURDIR)/debian/patches/lshw-gtk.1 + + cp $(CURDIR)/debian/patches/lshw-gtk.desktop $(CURDIR)/debian/lshw-gtk/usr/share/applications/lshw-gtk.desktop + cp $(CURDIR)/debian/patches/logo.xpm $(CURDIR)/debian/lshw-gtk/usr/share/pixmaps/lshw-gtk.xpm + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# 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_installmenu + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + 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 patch unpatch --- lshw-02.10.orig/debian/watch.old +++ lshw-02.10/debian/watch.old @@ -0,0 +1,2 @@ +version=3 +http://qa.debian.org/watch/sf.php?project=ezix/lshw-B.([\d.]*).tar.gz debian uupdate --- lshw-02.10.orig/debian/changelog +++ lshw-02.10/debian/changelog @@ -0,0 +1,153 @@ +lshw (02.10-4ubuntu1) gutsy; urgency=low + + * Added a .desktop file (LP: #28763) + Thanks to Emmet Hikory and Benjamin Montgomery + + -- Siegfried-Angel Gevatter Pujals (RainCT) Sat, 2 Jun 2007 00:15:43 +0200 + +lshw (02.10-4) unstable; urgency=low + + * Added Upstream Homepage to package description. Closes: #426698 + * Updated Debian-Policy Standards-Version to 3.7.2 + + -- Ghe Rivero Wed, 30 May 2007 13:02:26 +0200 + +lshw (02.10-3) unstable; urgency=low + + * New URL at debian/copyright. Closes: #405452 + + -- Ghe Rivero Mon, 28 May 2007 18:09:22 +0200 + +lshw (02.10-2) unstable; urgency=low + + * New upstream release. Closes: #413800 + * New Maintainer mail address in control file + + -- Ghe Rivero Fri, 25 May 2007 11:02:42 +0200 + +lshw (02.10-1) unstable; urgency=low + + * New upstream release. Closes: #405452 + * Remove lshw-common package. manuf.txt and oui.txt aren't used at all, + and we now depend on pciutils and usbutils for pci.ids and usb.ids + respectively (ubuntu patch) + * New URL at debian/copyright. Closes: #405452 + * Fix FTBFS with GCC 4.3: missing #includes. Closes: #417381 + + -- Ghe Rivero Thu, 03 May 2007 20:02:07 +0200 + +lshw (02.08.01-1) unstable; urgency=low + + * New upstream release. Closes: #360182 + * Added AMD64 to the known platforms that works properly. Closes: #349619 + + -- Ghe Rivero Thu, 20 Jul 2006 00:35:07 +0200 + +lshw (02.06-3) unstable; urgency=low + + * "See you in GUA, Debconf-es2" Release + * Change CXX flags on alpha, so no more segfaults. + Closes: #243752 and similar not reported to BTS. + * Small fix on code for alpha (dpatch 06-alpha) + * gxx transition + * Dedicated to Endesa to switch off the electricity from my university + all the weekend :/ + * Updated DH_COMPAT=4 + * Removed ${shlibs:Depends} variable from lshw-common + + -- Ghe Rivero Wed, 21 Dec 2005 16:58:49 +0100 + +lshw (02.06-2) unstable; urgency=low + + * Updated rules files. Copy logy.xpm instead of move it. + + -- Ghe Rivero Mon, 17 Oct 2005 21:48:29 +0200 + +lshw (02.06-1) unstable; urgency=low + + * New upstream release + + -- Ghe Rivero Sun, 16 Oct 2005 23:59:50 +0200 + +lshw (02.05.01-3) unstable; urgency=low + + * Removed spurious files from source. + * Make works with DEB_BUILD_OPTIONS. + * Now can be compiled twice or more. + + -- Ghe Rivero Sun, 16 Oct 2005 23:11:27 +0200 + +lshw (02.05.01-2) unstable; urgency=low + + * New Free Software Foundation (FSF) address: + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + + -- Ghe Rivero Tue, 27 Sep 2005 22:10:16 +0200 + +lshw (02.05.01-1) unstable; urgency=low + + * New upstream release + * Added manpage for lshw-gtk (lintian/linda clean) + * Upgraded to Debian Policy 3.6.2 + + -- Ghe Rivero Thu, 21 Jul 2005 23:42:52 +0200 + +lshw (02.04-1) unstable; urgency=low + + * New upstream release + * lshw-common is now arch independent, closes: #308473 + * Added watch file + * Binaries moved to /usr/bin, + Added menu entry for lshw-gtk, closes: #303393 + + -- Ghe Rivero Sun, 17 Jul 2005 13:29:09 +0200 + +lshw (02.03-2) unstable; urgency=low + + * Build fix on AMD64, closes: #298029 + * Build fix on no network machines, Depends on hwdata, closes: #300788 + * Build Depends on dpatch + + -- Ghe Rivero Wed, 23 Mar 2005 00:16:06 +0100 + +lshw (02.03-1) unstable; urgency=low + + * New upstream release + * Recommends pciutils and hwdata, closes: #191506 + + -- Ghe Rivero Sun, 6 Feb 2005 23:09:00 +0100 + +lshw (02.00-1) unstable; urgency=low + + * New upstream release, closes: #233038 + * Updated standards version from 3.5.10 to 3.6.1 + * New binary package: lshw-gtk, a GUI frontend + * New package: lshw-common, hw info files + + -- Ghe Rivero Thu, 6 Jan 2005 23:01:14 +0100 + +lshw (01.03-1) unstable; urgency=low + + * New upstream release. + This release include SCSI support, closes: #182543. + Includes alpha support, closes: #183502. + It also fix html output, closes: #182826. + * Removed the manpage from debian dir because it is there in upstream + sources. This also means that the build dependency on perl is changed + to docbook-utils. + * Updated standards version from 3.5.8 to 3.5.10. + + -- Ola Lundqvist Sat, 30 Aug 2003 12:56:50 +0200 + +lshw (0.06-2) unstable; urgency=low + + * Fixed description, closes: #183321. + + -- Ola Lundqvist Thu, 17 Apr 2003 22:36:19 +0200 + +lshw (0.06-1) unstable; urgency=low + + * Initial release, closes: #181106. + + -- Ola Lundqvist Sat, 15 Feb 2003 13:23:56 +0100 --- lshw-02.10.orig/debian/lshw-gtk.manpages +++ lshw-02.10/debian/lshw-gtk.manpages @@ -0,0 +1 @@ +debian/patches/lshw-gtk.1 --- lshw-02.10.orig/debian/lshw-common.dirs +++ lshw-02.10/debian/lshw-common.dirs @@ -0,0 +1 @@ +usr/share/lshw --- lshw-02.10.orig/debian/lshw-gtk.dirs +++ lshw-02.10/debian/lshw-gtk.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/applications +usr/share/pixmaps --- lshw-02.10.orig/debian/lshw-gtk.menu +++ lshw-02.10/debian/lshw-gtk.menu @@ -0,0 +1 @@ +?package(lshw-gtk):needs="x11" section="Apps/System" title="lshw-gtk" command="lshw-gtk" icon="/usr/share/pixmaps/lshw-gtk.xpm" --- lshw-02.10.orig/debian/patches/02-bin.dpatch +++ lshw-02.10/debian/patches/02-bin.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02bin.dpatch by Ghe Rivero +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile /tmp/dpep-work.fcGba5/lshw-02.05.01/src/Makefile +--- ./src/Makefile 2005-07-20 18:37:45.000000000 +0200 ++++ /tmp/dpep-work.fcGba5/lshw-02.05.01/src/Makefile 2005-07-22 09:13:48.605063728 +0200 +@@ -4,7 +4,7 @@ + + DESTDIR=/ + PREFIX=/usr +-SBINDIR=$(PREFIX)/sbin ++SBINDIR=$(PREFIX)/bin + MANDIR=$(PREFIX)/share/man + DATADIR=$(PREFIX)/share + export DESTDIR --- lshw-02.10.orig/debian/patches/lshw-gtk.pod +++ lshw-02.10/debian/patches/lshw-gtk.pod @@ -0,0 +1,36 @@ +=head1 NAME + +lshw-gtk - list hardware (GTK version) + +=head1 DESCRIPTION + +lshw is a small tool to extract detailed information on the hardware +configuration of the machine. It can report exact memory +configuration, firmware version, mainboard configuration, +CPU version +and speed, cache configuration, bus speed, etc. on +DMI-capable x86 or IA-64 +systems and on some PowerPC +machines (PowerMac G4 is known to work). + +It currently supports DMI (x86 and IA-64 only), OpenFirmware device tree (PowerPC only), +PCI/AGP, CPUID (x86), IDE/ATA/ATAPI, PCMCIA (only tested on x86), SCSI and USB. + +=head1 NOTES + +lshw-gtk must be run as super user or it will only report + +=head1 COPYING + +lshw is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 2. + +=head1 AUTOR + +lshw is maintained by Lyonel Vincent +. + +=head1 OTHER INFO + +The webpage for lshw is at http://ezix.org/software/lshw.html + +=cut --- lshw-02.10.orig/debian/patches/03-lshw-gtk.dpatch +++ lshw-02.10/debian/patches/03-lshw-gtk.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03lshw-gtk.dpatch by Ghe Rivero +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lshw-02.08.01~/src/Makefile lshw-02.08.01/src/Makefile +--- lshw-02.08.01~/src/Makefile 2006-07-20 00:59:25.000000000 +0200 ++++ lshw-02.08.01/src/Makefile 2006-07-20 01:00:09.000000000 +0200 +@@ -81,7 +81,7 @@ + + install-gui: gui + $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) +- $(INSTALL) -m 0755 -s gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR) ++ $(INSTALL) -m 0755 -s gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)/$(PACKAGENAME)-gtk + $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork + $(INSTALL) -m 0644 gui/artwork/*.svg $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork + --- lshw-02.10.orig/debian/patches/05-cflags.dpatch +++ lshw-02.10/debian/patches/05-cflags.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05cflags.dpatch by Ghe Rivero > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lshw-02.05.01~/src/Makefile lshw-02.05.01/src/Makefile +--- lshw-02.05.01~/src/Makefile 2005-10-16 20:59:43.000000000 +0000 ++++ lshw-02.05.01/src/Makefile 2005-10-16 21:03:35.000000000 +0000 +@@ -16,8 +16,10 @@ + CXX=c++ + INCLUDES=-I./core/ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) +-LDFLAGS=-L./core/ -g ++#CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES) ++CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) ++#LDFLAGS=-L./core/ -Os -s ++LDFLAGS=-L./core/ + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif +diff -urNad lshw-02.05.01~/src/core/Makefile lshw-02.05.01/src/core/Makefile +--- lshw-02.05.01~/src/core/Makefile 2005-07-20 16:37:45.000000000 +0000 ++++ lshw-02.05.01/src/core/Makefile 2005-10-16 21:04:06.000000000 +0000 +@@ -3,7 +3,8 @@ + CXX=c++ + INCLUDES= + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES) ++#CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES) ++CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) + LDFLAGS= + LDSTATIC= + LIBS= +diff -urNad lshw-02.05.01~/src/gui/Makefile lshw-02.05.01/src/gui/Makefile +--- lshw-02.05.01~/src/gui/Makefile 2005-07-20 16:37:45.000000000 +0000 ++++ lshw-02.05.01/src/gui/Makefile 2005-10-16 21:02:30.000000000 +0000 +@@ -6,11 +6,12 @@ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" + GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) + INCLUDES=-I../core $(GTKINCLUDES) +-CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES) ++#CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES) ++CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) + CFLAGS=$(CXXFLAGS) $(DEFINES) + GTKLIBS=$(shell pkg-config gtk+-2.0 --libs) + LIBS=-L../core -llshw $(GTKLIBS) +-LDFLAGS= -Os -s ++#LDFLAGS= -Os -s + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif --- lshw-02.10.orig/debian/patches/04-lshw-common.dpatch +++ lshw-02.10/debian/patches/04-lshw-common.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04lshw-gtk.dpatch by Ghe Rivero +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lshw-02.10~/src/core/pci.cc lshw-02.10/src/core/pci.cc +--- lshw-02.10~/src/core/pci.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/pci.cc 2007-05-10 12:10:04.000000000 +0200 +@@ -12,7 +12,7 @@ + + #define PROC_BUS_PCI "/proc/bus/pci" + #define SYS_BUS_PCI "/sys/bus/pci" +-#define PCIID_PATH "/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids" ++#define PCIID_PATH "/usr/share/lshw-common/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids" + + #define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ + #define PCI_VENDOR_ID 0x00 /* 16 bits */ +diff -urNad lshw-02.10~/src/core/usb.cc lshw-02.10/src/core/usb.cc +--- lshw-02.10~/src/core/usb.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/usb.cc 2007-05-10 12:09:38.000000000 +0200 +@@ -22,7 +22,7 @@ + #include + + #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" +-#define USBID_PATH "/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids" ++#define USBID_PATH "/usr/share/lshw-common/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids" + + #define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ + #define USB_CLASS_AUDIO 1 --- lshw-02.10.orig/debian/patches/07-gcc43.dpatch +++ lshw-02.10/debian/patches/07-gcc43.dpatch @@ -0,0 +1,128 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07-gcc43.dpatch by Ghe Rivero +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lshw-02.10~/src/core/cpuinfo.cc lshw-02.10/src/core/cpuinfo.cc +--- lshw-02.10~/src/core/cpuinfo.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/cpuinfo.cc 2007-05-13 13:35:49.000000000 +0200 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urNad lshw-02.10~/src/core/device-tree.cc lshw-02.10/src/core/device-tree.cc +--- lshw-02.10~/src/core/device-tree.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/device-tree.cc 2007-05-13 13:35:44.000000000 +0200 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urNad lshw-02.10~/src/core/ide.cc lshw-02.10/src/core/ide.cc +--- lshw-02.10~/src/core/ide.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/ide.cc 2007-05-13 13:36:19.000000000 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urNad lshw-02.10~/src/core/parisc.cc lshw-02.10/src/core/parisc.cc +--- lshw-02.10~/src/core/parisc.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/parisc.cc 2007-05-13 13:36:48.000000000 +0200 +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urNad lshw-02.10~/src/core/partitions.cc lshw-02.10/src/core/partitions.cc +--- lshw-02.10~/src/core/partitions.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/partitions.cc 2007-05-13 13:36:57.000000000 +0200 +@@ -20,6 +20,7 @@ + #include "lvm.h" + #include "osutils.h" + #include ++#include + #include + #include + #include +diff -urNad lshw-02.10~/src/core/pci.cc lshw-02.10/src/core/pci.cc +--- lshw-02.10~/src/core/pci.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/pci.cc 2007-05-13 13:37:58.000000000 +0200 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + __ID("@(#) $Id: pci.cc 1726 2007-02-13 21:38:11Z lyonel $"); + +diff -urNad lshw-02.10~/src/core/pnp.cc lshw-02.10/src/core/pnp.cc +--- lshw-02.10~/src/core/pnp.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/pnp.cc 2007-05-13 13:36:32.000000000 +0200 +@@ -9,6 +9,7 @@ + #include "version.h" + #include "pnp.h" + ++#include + #include + + __ID("@(#) $Id: pnp.cc 1726 2007-02-13 21:38:11Z lyonel $"); +diff -urNad lshw-02.10~/src/core/print.cc lshw-02.10/src/core/print.cc +--- lshw-02.10~/src/core/print.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/print.cc 2007-05-13 13:35:36.000000000 +0200 +@@ -11,6 +11,7 @@ + #include "options.h" + #include "version.h" + #include "osutils.h" ++#include + #include + #include + #include +diff -urNad lshw-02.10~/src/core/scsi.cc lshw-02.10/src/core/scsi.cc +--- lshw-02.10~/src/core/scsi.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/scsi.cc 2007-05-13 13:36:25.000000000 +0200 +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #ifndef MKDEV +diff -urNad lshw-02.10~/src/core/usb.cc lshw-02.10/src/core/usb.cc +--- lshw-02.10~/src/core/usb.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/core/usb.cc 2007-05-13 13:36:41.000000000 +0200 +@@ -12,6 +12,7 @@ + #include "osutils.h" + #include "heuristics.h" + #include ++#include + #include + #include + #include +diff -urNad lshw-02.10~/src/lshw.cc lshw-02.10/src/lshw.cc +--- lshw-02.10~/src/lshw.cc 2007-02-13 22:38:11.000000000 +0100 ++++ lshw-02.10/src/lshw.cc 2007-05-13 13:37:03.000000000 +0200 +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + + __ID("@(#) $Id: lshw.cc 1726 2007-02-13 21:38:11Z lyonel $"); --- lshw-02.10.orig/debian/patches/06-alpha.dpatch +++ lshw-02.10/debian/patches/06-alpha.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06-alpha.dpatch by Ghe Rivero +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lshw-02.06~/src/core/pcmcia.cc lshw-02.06/src/core/pcmcia.cc +--- lshw-02.06~/src/core/pcmcia.cc 2005-10-13 23:33:55.000000000 +0200 ++++ lshw-02.06/src/core/pcmcia.cc 2005-10-18 10:32:20.000000000 +0200 +@@ -1007,8 +1007,8 @@ + { + if (stab[i][0] == 'S') + { +- unsigned int pos = stab[i].find(':'); +- ++ string::size_type pos = stab[i].find(':'); ++ + socketname = ""; + carddescription = ""; + --- lshw-02.10.orig/debian/patches/00list +++ lshw-02.10/debian/patches/00list @@ -0,0 +1,6 @@ +01-wget.dpatch +02-bin.dpatch +03-lshw-gtk.dpatch +04-lshw-common.dpatch +05-cflags.dpatch +07-gcc43.dpatch \ No newline at end of file --- lshw-02.10.orig/debian/patches/logo.xpm +++ lshw-02.10/debian/patches/logo.xpm @@ -0,0 +1,239 @@ +/* XPM */ +static char * logo_xpm[] = { +"32 32 204 2", +" c None", +". c #000000", +"+ c #160F00", +"@ c #624400", +"# c #9D6E00", +"$ c #C68A00", +"% c #DC9900", +"& c #E09C00", +"* c #D19200", +"= c #B17C00", +"- c #7E5800", +"; c #362600", +"> c #010100", +", c #2E2000", +"' c #AA7700", +") c #FAAF00", +"! c #FFB200", +"~ c #D89700", +"{ c #654600", +"] c #040300", +"^ c #0A0700", +"/ c #916500", +"( c #FCB000", +"_ c #D29300", +": c #332300", +"< c #1B1300", +"[ c #CE9000", +"} c #F2AE12", +"| c #DFA92C", +"1 c #F8B00A", +"2 c #F8AD00", +"3 c #5E4200", +"4 c #1A1200", +"5 c #DC9A00", +"6 c #E1AA2A", +"7 c #B29C6A", +"8 c #D0A540", +"9 c #948155", +"0 c #C88E0A", +"a c #FEB100", +"b c #664700", +"c c #080600", +"d c #CC8F00", +"e c #FEB201", +"f c #AE9B70", +"g c #FBB105", +"h c #EBA400", +"i c #EAA70B", +"j c #453000", +"k c #8C6200", +"l c #F4AF0F", +"m c #BD9F5C", +"n c #E7A100", +"o c #120D00", +"p c #291C00", +"q c #FBAF00", +"r c #F9B009", +"s c #B89E62", +"t c #D4970A", +"u c #916600", +"v c #A27100", +"w c #AC9B73", +"x c #906E1D", +"y c #D0A440", +"z c #F7AD00", +"A c #171000", +"B c #0F0B00", +"C c #F7AC00", +"D c #A09783", +"E c #AF9C6F", +"F c #745100", +"G c #563C00", +"H c #EDAD19", +"I c #BB9F5E", +"J c #CFA542", +"K c #FFB201", +"L c #FDB103", +"M c #C38800", +"N c #B59D66", +"O c #EDAD18", +"P c #C5A250", +"Q c #CBA348", +"R c #D9A734", +"S c #E7AB21", +"T c #B39D69", +"U c #DDA830", +"V c #060400", +"W c #B88100", +"X c #FCB104", +"Y c #D7A738", +"Z c #F7B00B", +"` c #B99E60", +" . c #D5A63A", +".. c #D3A63D", +"+. c #CAA34A", +"@. c #CEA443", +"#. c #F1AE14", +"$. c #261B00", +"%. c #CD8F00", +"&. c #CA8D00", +"*. c #AB9666", +"=. c #DEA92E", +"-. c #F9B008", +";. c #AF9C6E", +">. c #E8AC1F", +",. c #3B2900", +"'. c #D09100", +"). c #A17100", +"!. c #483D25", +"~. c #928056", +"{. c #C28E16", +"]. c #7F5900", +"^. c #1E1500", +"/. c #CF9205", +"(. c #B99E61", +"_. c #E5AB24", +":. c #3E2B00", +"<. c #C08600", +"[. c #755201", +"}. c #838383", +"|. c #828282", +"1. c #888786", +"2. c #463610", +"3. c #4F3700", +"4. c #956800", +"5. c #F1A800", +"6. c #765200", +"7. c #503800", +"8. c #ECA400", +"9. c #7A5501", +"0. c #967527", +"a. c #9F6F00", +"b. c #4D4940", +"c. c #8B8B8B", +"d. c #696969", +"e. c #78653A", +"f. c #B57F00", +"g. c #634500", +"h. c #9A6B00", +"i. c #604300", +"j. c #BF8500", +"k. c #251A00", +"l. c #F2A900", +"m. c #0E0A00", +"n. c #6A4A00", +"o. c #BE8400", +"p. c #433D30", +"q. c #636363", +"r. c #4B3910", +"s. c #402D00", +"t. c #030200", +"u. c #513900", +"v. c #1F1500", +"w. c #C28800", +"x. c #D79600", +"y. c #221800", +"z. c #FEB200", +"A. c #EDA500", +"B. c #090600", +"C. c #302200", +"D. c #8F6400", +"E. c #C18700", +"F. c #8E6300", +"G. c #5F4300", +"H. c #986A00", +"I. c #785300", +"J. c #463100", +"K. c #312200", +"L. c #4D3600", +"M. c #412E00", +"N. c #4E3600", +"O. c #BA8200", +"P. c #BD8400", +"Q. c #845C00", +"R. c #644600", +"S. c #DA9800", +"T. c #261A00", +"U. c #2F2100", +"V. c #211700", +"W. c #EFA700", +"X. c #F5AB00", +"Y. c #765300", +"Z. c #9B6C00", +"`. c #342500", +" + c #7D5700", +".+ c #F9AE00", +"++ c #EEA600", +"@+ c #704E00", +"#+ c #513800", +"$+ c #020100", +"%+ c #4C3500", +"&+ c #A97600", +"*+ c #795500", +"=+ c #B37D00", +"-+ c #2B1E00", +";+ c #0B0800", +">+ c #5F4200", +",+ c #AF7A00", +"'+ c #CB8E00", +")+ c #281C00", +"!+ c #150E00", +"~+ c #2A1E00", +"{+ c #201600", +"]+ c #050400", +" ", +" . . . . . . . ", +" . + @ # $ % & * = - ; > . ", +" . , ' ) ! ! ! ! ! ! ! ! ! ~ { ] ", +" ^ / ( ! ! ! ! ! ! ! ! ! ! ! ! ! _ : . ", +" < [ ! ! ! ! ! ! ! ! ! ! ! } | 1 ! ! 2 3 . ", +" 4 5 ! ! ! ! ! ! ! ! ! ! ! 6 7 8 9 0 ! ! a b . ", +" c d ! ! ! ! ! ! ! ! ! ! ! e f g ! h i ! ! ! ( j . ", +" . k ! ! ! ! ! ! ! ! ! ! ! ! l m ! ! ! ! ! ! ! ! n o ", +" p q ! ! ! ! ! ! ! ! ! ! ! ! r s ! ! ! ! ! ! t ! ! u . ", +" . v ! ! ! ! ! ! ! ! ! ! ! ! ! ! w ! ! ! ! ! ! x y ! z A ", +" B C ! ! ! ! ! ! ! ! ! ! ! ! ! ! D 1 ! ! ! ! ! ! E ! ! F . ", +" G ! ! ! ! ! ! ! ! ! ! ! ! ! ! H I J K ! ! ! ! L f ! ! M . ", +" . / ! ! ! ! ! ! ! ! ! ! ! ! ! e N O l P Q R S 6 T U ! ! 2 V ", +" . W ! ! ! ! ! ! ! ! ! ! ! ! X I Y Z ` I ...+.@.#.! ! ! ! $. ", +" . %.! ! ! ! ! ! ! ! ! ! ! &.*.=.-.;.>.! ! ! ! ! ! ! ! ! ! ,. ", +" . '.).!.~.{.! ! ! ! ! q ].^./.! (._.! ! ! ! ! ! ! ! ! ! ! :. ", +" . <.[.}.|.1.2.3.4.5.! 6.7.8.! 9.0.! ! ! ! ! ! ! ! ! ! ! ! , ", +" . a.5 b.c.d.e.f.g.4 h.].i.! j.k.l.! ! ! ! ! ! ! ! ! ! ! a m. ", +" . n.! o.p.q.r.! ! 5 s.; t.u.v.w.! ! ! ! ! ! ! ! ! ! ! ! x.. ", +" y.z.! A.a._ ! ! ! _ B.C.D.E.! ! ! ! ! ! ! ! ! ! ! ! ! F.. ", +" . M ! ! ! ! ! ! ! G.H.I.J.( ! ! ! ! ! ! ! ! ! ! ! ! ! K. ", +" L.! ! ! ! ! ! ! M.$ a N.F.! ! ! ! ! ! ! ! ! ! ! ! O.. ", +" . P.! ! ! ! ! ! Q.R.! S.T.! ! ! ! ! ! ! ! ! ! ! q U. ", +" V.W.! ! ! ! ! X.K.Y.Z.`.! ! ! ! ! ! ! ! ! ! ! +. ", +" . J..+! ! ! ! ! ++@+#+'.! ! ! ! ! ! ! ! ! ! ' $+ ", +" . %+X.! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! &+V ", +" . C.x.! ! ! ! ! ! ! ! ! ! ! ! ! ! .+*+$+ ", +" c *+A.! ! ! ! ! ! ! ! ! ! a =+-+. ", +" . ;+>+,+h ! ! ! ! .+'+Q.)+. ", +" . . . !+~+, {+]+. . ", +" "}; --- lshw-02.10.orig/debian/patches/01-wget.dpatch +++ lshw-02.10/debian/patches/01-wget.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01wget.dpatch by > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./src/Makefile /tmp/dpep-work.ddpISg/lshw-02.04/src/Makefile +--- ./src/Makefile 2005-04-28 04:28:54.000000000 +0200 ++++ /tmp/dpep-work.ddpISg/lshw-02.04/src/Makefile 2005-06-12 10:30:13.325457240 +0200 +@@ -56,16 +56,16 @@ + docbook2man $< + + pci.ids: +- wget http://pciids.sourceforge.net/pci.ids ++ #wget http://pciids.sourceforge.net/pci.ids + + usb.ids: +- wget http://www.linux-usb.org/usb.ids ++ #wget http://www.linux-usb.org/usb.ids + + oui.txt: +- wget http://standards.ieee.org/regauth/oui/oui.txt ++ #wget http://standards.ieee.org/regauth/oui/oui.txt + + manuf.txt: +- wget http://www.ethereal.com/distribution/manuf.txt ++ #wget http://www.ethereal.com/distribution/manuf.txt + + install: all + -mkdir -p $(DESTDIR) --- lshw-02.10.orig/debian/patches/lshw-gtk.desktop +++ lshw-02.10/debian/patches/lshw-gtk.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Hardware Lister +Comment=Provides information on hardware +Comment[ca]=Proveeix informació sobre el maquinari +Icon=lshw-gtk +Exec=lshw-gtk +Terminal=false +Categories=Settings;HardwareSettings; --- lshw-02.10.orig/debian/copyright +++ lshw-02.10/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Ola Lundqvist on +Sat, 15 Feb 2003 13:23:56 +0100. + +It was downloaded from: + http://ezix.org/project/wiki/HardwareLiSter + +Upstream Author: + Lyonel Vincent + +Copyright: + + This 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, or (at your option) any later + version. + + This 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 with + your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with + the lshw source package as the file COPYING. If not, write to the Free + Software Foundation, Inc.,51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA.