Control: tags -1 +patch +pending Hi William,
hwinfo package has RC bug (#613184) due to dependency to HAL. It was solved in upstream and tagged as 20.1 as newest release in their git repository. See https://gitorious.org/opensuse/hwinfo I've prepared new upstream version package for hwinfo as attached diff (including some fixes and updates). Please consider to update your package, or to allow me to do it with NMU. Thanks! -- Hideki Yamane <[email protected]>
diff -urN hwinfo-16.0/debian/changelog hwinfo-20.1/debian/changelog --- hwinfo-16.0/debian/changelog 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/changelog 2014-03-16 13:21:21.810517204 +0900 @@ -1,3 +1,33 @@ +hwinfo (20.1-0.1) experimental; urgency=medium + + * Non-maintainer upload. + * New upstream release (Closes: #677102, #661994?) + * debian/patches + - refresh all patches + - drop serial_struct,as-needed.patch: merged upstream + - drop fix-ftbfs: not necessary due to upstream's change + - add remove_git_dependency_from_Makefile.patch: since upstream package + generation depends on local git repository. + * debian/source/format + - set "3.0 (quilt)" + * debian/rules + - remove patch lines + - add VERSION file to deal with upstream change + - remove upstream Changelog file + * debian/control + - remove "Build-Depends: libhal-dev" (Closes: #613184) + - remove "Build-Depends: quilt" + - add "Build-Depends: libx86emu-dev" + - fix description (not libhd13-dev anymore) + - update to libhd20 + * debian/*.install + - adjust file name due to above change + * debian/copyright + - update upstream URL (Closes: #667846) + - update to copyright format 1.0 + + -- Hideki Yamane <[email protected]> Sun, 16 Mar 2014 08:20:36 +0900 + hwinfo (16.0-2.2) unstable; urgency=low * Non-maintainer upload. diff -urN hwinfo-16.0/debian/control hwinfo-20.1/debian/control --- hwinfo-16.0/debian/control 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/control 2014-03-16 13:02:57.019776262 +0900 @@ -2,7 +2,7 @@ Section: admin Priority: optional Maintainer: William Vera <[email protected]> -Build-Depends: debhelper (>= 7.2.11), quilt, perl, flex, libdbus-1-dev, libhal-dev, linux-kernel-headers, doxygen, pkg-config +Build-Depends: debhelper (>= 7.2.11), perl, flex, libdbus-1-dev, linux-kernel-headers, doxygen, pkg-config, libx86emu-dev Standards-Version: 3.8.3 Package: hwinfo @@ -23,7 +23,7 @@ you think one or more of these should be included in the package, please contact the maintainer at [email protected]. -Package: libhd16 +Package: libhd20 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -57,12 +57,12 @@ partitions, network card, graphics card, monitor, camera, mouse, sound, pppoe, isdn, modem, printer, scanner, bios, cpu, usb, memory and smp. . - This package contains the documentation for the libhd13-dev package. + This package contains the documentation for the libhd-dev package. Package: libhd-dev Section: libdevel Architecture: any -Depends: libhd16 (= ${binary:Version}), libdbus-1-dev (>= 0.61), libhal-dev (>= 0.5) +Depends: libhd20 (= ${binary:Version}), libdbus-1-dev (>= 0.61), libhal-dev (>= 0.5) Suggests: libhd-doc Provides: libhd12-dev, libhd13-dev, libhd14-dev, libhd15-dev, libhd16-dev Description: Hardware identification system library and headers diff -urN hwinfo-16.0/debian/copyright hwinfo-20.1/debian/copyright --- hwinfo-16.0/debian/copyright 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/copyright 2014-03-16 13:22:43.766066714 +0900 @@ -1,55 +1,55 @@ -This package was debianized by Morten Werner Olsen <[email protected]> on -Sun, 30 May 2004 21:39:25 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: hwinfo +Source: https://gitorious.org/opensuse/hwinfo +Upstream-Contact: Steffen Winterfeldt <[email protected]> + https://www.suse.com + +Files: * +Copyright: 2006-2013 Steffen Winterfeldt + SUSE Linux GmbH +License: GPL-2 + +Files: src/int10/AsmMacros.h +Copyright: 1993,1994 by David Wexelblat <[email protected]> + The Regents of the University of California. +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + On Debian systems, the complete text of the BSD + License can be found in `/usr/share/common-licenses/BSD'. + +Files: debian/* +Copyright: 2004-2006 Morten Werner Olsen <[email protected]> + 2006-2007 James Vega <[email protected]> + 2007-2009 William Vera <[email protected]> + 2014 Hideki Yamane <[email protected]> +License: GPL-2 + +License: GPL-2 + This package 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; version 2 dated June, 1991. + . + This package 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 package; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. -It was downloaded from: - http://mirrors.kernel.org/pub/opensuse/distribution/SL-OSS-factory/inst-source/suse/src/ - -Upstream Author: - Steffen Winterfeldt <[email protected]> - -Copyright: - 2008 © Steffen Winterfeldt - SuSE Linux AG, Nuernberg, Germany - (http://www.suse.de/feedback) - -License: - - This package 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; version 2 dated June, 1991. - - This package 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 package; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - -------------------------------------------------------------------------- - -src/int10/AsmMacros.h - -(c) Copyright 1993,1994 by David Wexelblat <[email protected]> - -Copyright (c) The Regents of the University of California. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -On Debian systems, the complete text of the BSD -License can be found in `/usr/share/common-licenses/BSD'. diff -urN hwinfo-16.0/debian/libhd16.install hwinfo-20.1/debian/libhd16.install --- hwinfo-16.0/debian/libhd16.install 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/libhd16.install 1970-01-01 09:00:00.000000000 +0900 @@ -1 +0,0 @@ -debian/tmp/usr/lib/libhd.so.* diff -urN hwinfo-16.0/debian/libhd20.install hwinfo-20.1/debian/libhd20.install --- hwinfo-16.0/debian/libhd20.install 1970-01-01 09:00:00.000000000 +0900 +++ hwinfo-20.1/debian/libhd20.install 2014-03-16 11:52:01.061501349 +0900 @@ -0,0 +1 @@ +debian/tmp/usr/lib/libhd.so.* diff -urN hwinfo-16.0/debian/patches/as-needed.patch hwinfo-20.1/debian/patches/as-needed.patch --- hwinfo-16.0/debian/patches/as-needed.patch 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/as-needed.patch 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ -Description: Place libraries after archive file to have dependencies resolved - when --as-needed linker option is being used. -Author: Ilya Barygin <[email protected]> -Bug-Debian: http://bugs.debian.org/640202 - ---- hwinfo-16.0.orig/src/Makefile -+++ hwinfo-16.0/src/Makefile -@@ -23,9 +23,10 @@ - - ifdef SHARED_FLAGS - $(LIBHD_SO): $(LIBHD) -- $(CC) -shared $(SO_LIBS) -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \ -+ $(CC) -shared -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \ - -Wl,-soname=$(LIBHD_SONAME) \ -- -o $(LIBHD_SO) -+ -o $(LIBHD_SO) \ -+ $(SO_LIBS) - ln -snf $(LIBHD_NAME) $(LIBHD_SONAME) - ln -snf $(LIBHD_SONAME) $(LIBHD_BASE).so - else diff -urN hwinfo-16.0/debian/patches/cpu.c-alpha_bogo hwinfo-20.1/debian/patches/cpu.c-alpha_bogo --- hwinfo-16.0/debian/patches/cpu.c-alpha_bogo 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/cpu.c-alpha_bogo 2014-03-16 07:39:40.997917601 +0900 @@ -1,7 +1,7 @@ -Index: src/hd/cpu.c +Index: hwinfo-20.1/src/hd/cpu.c =================================================================== ---- hwinfo-14.19.orig/src/hd/cpu.c.orig -+++ hwinfo-14.19/src/hd/cpu.c +--- hwinfo-20.1.orig/src/hd/cpu.c 2014-03-16 07:39:36.862002535 +0900 ++++ hwinfo-20.1/src/hd/cpu.c 2014-03-16 07:39:36.850002784 +0900 @@ -104,6 +104,7 @@ #ifdef __alpha__ char model_id[80], system_id[80], serial_number[80], platform[80]; @@ -10,7 +10,7 @@ cpu_info_t *ct1; #endif -@@ -133,6 +134,7 @@ +@@ -141,6 +142,7 @@ #ifdef __alpha__ *model_id = *system_id = *serial_number = *platform = 0; cpu_variation = cpu_revision = hz = 0; @@ -18,7 +18,7 @@ for(sl = hd_data->cpu; sl; sl = sl->next) { if(sscanf(sl->str, "cpu model : %79[^\n]", model_id) == 1) continue; -@@ -143,6 +145,7 @@ +@@ -151,6 +153,7 @@ if(sscanf(sl->str, "cpus detected : %u", &cpus) == 1) continue; if(sscanf(sl->str, "cycle frequency [Hz] : %u", &hz) == 1) continue; if(sscanf(sl->str, "system variation : %79[^\n]", platform) == 1) continue; diff -urN hwinfo-16.0/debian/patches/dbus_pkg_config.patch hwinfo-20.1/debian/patches/dbus_pkg_config.patch --- hwinfo-16.0/debian/patches/dbus_pkg_config.patch 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/dbus_pkg_config.patch 2014-03-16 07:41:07.880134290 +0900 @@ -6,11 +6,11 @@ Bug-Debian: http://bugs.debian.org/634451 Bug-Ubuntu: https://launchpad.net/bugs/749278 -diff --git a/src/hd/Makefile b/src/hd/Makefile -index 3aa4819..be5b346 100644 ---- a/src/hd/Makefile -+++ b/src/hd/Makefile -@@ -4,7 +4,7 @@ CLEANFILES = version.h +Index: hwinfo-20.1/src/hd/Makefile +=================================================================== +--- hwinfo-20.1.orig/src/hd/Makefile 2014-03-16 07:41:05.532182461 +0900 ++++ hwinfo-20.1/src/hd/Makefile 2014-03-16 07:41:05.520182707 +0900 +@@ -4,7 +4,7 @@ include $(TOPDIR)/Makefile.common diff -urN hwinfo-16.0/debian/patches/fix-ftbfs hwinfo-20.1/debian/patches/fix-ftbfs --- hwinfo-16.0/debian/patches/fix-ftbfs 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/fix-ftbfs 1970-01-01 09:00:00.000000000 +0900 @@ -1,19 +0,0 @@ -Index: src/int10/i10_v86.c -=================================================================== ---- a/src/int10/i10_v86.c -+++ b/src/int10/i10_v86.c -@@ -27,6 +27,14 @@ - #include <string.h> - #ifdef __i386__ - #include <sys/vm86.h> -+/* 2.6.26+ kernels don't define the legacy masks. */ -+#if defined(__linux__) && !defined(TF_MASK) -+ #define TF_MASK X86_EFLAGS_TF -+ #define IF_MASK X86_EFLAGS_IF -+ #define NT_MASK X86_EFLAGS_NT -+ #define VIF_MASK X86_EFLAGS_VIF -+ #define VIP_MASK X86_EFLAGS_VIP -+#endif - #else - #include "vm86_struct.h" - #endif diff -urN hwinfo-16.0/debian/patches/fix_segfault_in_hd_is_xen_on_amd64 hwinfo-20.1/debian/patches/fix_segfault_in_hd_is_xen_on_amd64 --- hwinfo-16.0/debian/patches/fix_segfault_in_hd_is_xen_on_amd64 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/fix_segfault_in_hd_is_xen_on_amd64 2014-03-16 07:42:45.974122913 +0900 @@ -1,8 +1,8 @@ -diff --git a/src/hd/hd.c b/src/hd/hd.c -index 1539121..18e89c3 100644 ---- a/src/hd/hd.c -+++ b/src/hd/hd.c -@@ -3245,16 +3245,16 @@ int hd_is_xen(hd_data_t *hd_data) +Index: hwinfo-20.1/src/hd/hd.c +=================================================================== +--- hwinfo-20.1.orig/src/hd/hd.c 2014-03-16 07:42:42.006204232 +0900 ++++ hwinfo-20.1/src/hd/hd.c 2014-03-16 07:42:41.994204479 +0900 +@@ -3159,16 +3159,16 @@ "mov %%edx,8(%%esi)\n\t" "pop %%ebx" #else diff -urN hwinfo-16.0/debian/patches/hwinfo.8-strip_suse hwinfo-20.1/debian/patches/hwinfo.8-strip_suse --- hwinfo-16.0/debian/patches/hwinfo.8-strip_suse 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/hwinfo.8-strip_suse 2014-03-16 07:51:47.275060843 +0900 @@ -1,23 +1,25 @@ -Index: doc/hwinfo.8 +Index: hwinfo-20.1/doc/hwinfo.8 =================================================================== ---- hwinfo-14.19.orig/doc/hwinfo.8.orig -+++ hwinfo-14.19/doc/hwinfo.8 -@@ -71,10 +71,6 @@ - .B zip. - .\" +--- hwinfo-20.1.orig/doc/hwinfo.8 2014-03-16 07:51:44.659114160 +0900 ++++ hwinfo-20.1/doc/hwinfo.8 2014-03-16 07:51:44.647114404 +0900 +@@ -100,19 +100,11 @@ + hwprobe=bios.ddc.ports=1,x86emu=trace:dump:trace.only=0:dump.only=0 \ + hwinfo --monitor --log=foo .\" -.SH FILES --.B /var/lib/hardware/* --.\" +-.TP +-\fB/var/lib/hardware/hd.ids\fR +-External hardware data base (in readable text form). Try the --dump-db option to see the format. +-.TP +-\fB/var/lib/hardware/udi\fR +-Directory where persistent config data are stored (see --save-config option). -.\" .SH BUGS Not all hardware can be detected. .\" -@@ -87,6 +83,6 @@ - .\" - .\" .SH "SEE ALSO" --Documentation in /usr/share/doc/packages/hwinfo. +-More documentation in /usr/share/doc/packages/hwinfo. +discover(8). + .br + Source repository: git://git.opensuse.org/projects/hwinfo.git. .\" - .\" EOF diff -urN hwinfo-16.0/debian/patches/kbd.c-tiocgdev_undefined hwinfo-20.1/debian/patches/kbd.c-tiocgdev_undefined --- hwinfo-16.0/debian/patches/kbd.c-tiocgdev_undefined 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/kbd.c-tiocgdev_undefined 2014-03-16 07:39:35.358033422 +0900 @@ -1,8 +1,8 @@ -Index: src/hd/kbd.c +Index: hwinfo-20.1/src/hd/kbd.c =================================================================== ---- hwinfo-14.19.orig/src/hd/kbd.c.orig -+++ hwinfo-14.19/src/hd/kbd.c -@@ -121,11 +121,13 @@ +--- hwinfo-20.1.orig/src/hd/kbd.c 2014-03-16 07:39:29.706149499 +0900 ++++ hwinfo-20.1/src/hd/kbd.c 2014-03-16 07:39:29.694149745 +0900 +@@ -134,11 +134,13 @@ } if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) { @@ -14,5 +14,5 @@ } + */ - if(tty_major == 229 /* iseries hvc */) { - if (tty_minor >= 128) { + if (0) + ; diff -urN hwinfo-16.0/debian/patches/new_archs hwinfo-20.1/debian/patches/new_archs --- hwinfo-16.0/debian/patches/new_archs 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/new_archs 2014-03-16 07:28:29.087771121 +0900 @@ -1,8 +1,8 @@ -Index: src/hd/hd.c +Index: hwinfo-20.1/src/hd/hd.c =================================================================== ---- hwinfo-14.19.orig/src/hd/hd.c.orig -+++ hwinfo-14.19/src/hd/hd.c -@@ -142,6 +142,14 @@ +--- hwinfo-20.1.orig/src/hd/hd.c 2014-03-16 07:28:23.679883096 +0900 ++++ hwinfo-20.1/src/hd/hd.c 2014-03-16 07:28:23.667883345 +0900 +@@ -143,6 +143,14 @@ #define HD_ARCH "hppa" #endif diff -urN hwinfo-16.0/debian/patches/remove_git_dependency_from_Makefile.patch hwinfo-20.1/debian/patches/remove_git_dependency_from_Makefile.patch --- hwinfo-16.0/debian/patches/remove_git_dependency_from_Makefile.patch 1970-01-01 09:00:00.000000000 +0900 +++ hwinfo-20.1/debian/patches/remove_git_dependency_from_Makefile.patch 2014-03-16 08:08:58.738133887 +0900 @@ -0,0 +1,39 @@ +Description: <short summary of the patch> +Author: Hideki Yamane <[email protected]> +Forwarded: not-needed +Last-Update: 2014-03-16 + +Index: hwinfo-20.1/Makefile +=================================================================== +--- hwinfo-20.1.orig/Makefile 2014-03-16 08:08:32.382666415 +0900 ++++ hwinfo-20.1/Makefile 2014-03-16 08:08:55.338202579 +0900 +@@ -1,6 +1,6 @@ + TOPDIR = $(CURDIR) + SUBDIRS = src +-TARGETS = hwinfo hwinfo.pc changelog ++TARGETS = hwinfo hwinfo.pc + CLEANFILES = hwinfo hwinfo.pc hwinfo.static hwscan hwscan.static hwscand hwscanqueue doc/libhd doc/*~ + LIBDIR = /usr/lib + ULIBDIR = $(LIBDIR) +@@ -12,11 +12,6 @@ + + export SO_LIBS + +-GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) +-GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) +- +-VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION) +- + include Makefile.common + + # ia64 +@@ -32,9 +27,6 @@ + + .PHONY: fullstatic static shared tiny doc diet tinydiet uc tinyuc + +-changelog: $(GITDEPS) +- $(GIT2LOG) --changelog changelog +- + hwscan: hwscan.o $(LIBHD) + $(CC) hwscan.o $(LDFLAGS) $(LIBS) -o $@ + diff -urN hwinfo-16.0/debian/patches/serial_struct hwinfo-20.1/debian/patches/serial_struct --- hwinfo-16.0/debian/patches/serial_struct 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/serial_struct 1970-01-01 09:00:00.000000000 +0900 @@ -1,31 +0,0 @@ -Index: src/hd/kbd.c -=================================================================== ---- hwinfo-14.19.orig/src/hd/kbd.c.orig -+++ hwinfo-14.19/src/hd/kbd.c -@@ -21,26 +21,6 @@ - - #ifdef __sparc__ - --struct serial_struct { -- int type; -- int line; -- unsigned long port; -- int irq; -- int flags; -- int xmit_fifo_size; -- int custom_divisor; -- int baud_base; -- unsigned short close_delay; -- char io_type; -- char reserved_char[1]; -- int hub6; -- unsigned short closing_wait; /* time to wait before closing */ -- unsigned short closing_wait2; /* no longer used... */ -- unsigned char *iomem_base; -- unsigned short iomem_reg_shift; -- int reserved[2]; --}; -- - #ifdef DIET - typedef unsigned int u_int; - #endif diff -urN hwinfo-16.0/debian/patches/series hwinfo-20.1/debian/patches/series --- hwinfo-16.0/debian/patches/series 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/series 2014-03-16 08:05:35.302247214 +0900 @@ -1,11 +1,12 @@ hwinfo.8-strip_suse new_archs sparc_kioc -serial_struct +#serial_struct merged kbd.c-tiocgdev_undefined cpu.c-alpha_bogo -fix-ftbfs +#fix-ftbfs ? changed sh_support.patch dbus_pkg_config.patch -as-needed.patch +#as-needed.patch merged fix_segfault_in_hd_is_xen_on_amd64 +remove_git_dependency_from_Makefile.patch diff -urN hwinfo-16.0/debian/patches/sh_support.patch hwinfo-20.1/debian/patches/sh_support.patch --- hwinfo-16.0/debian/patches/sh_support.patch 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/sh_support.patch 2014-03-16 07:41:04.212209542 +0900 @@ -1,7 +1,8 @@ -diff -ruN hwinfo-16.0/src/hd/hd.c hwinfo-16.0.a/src/hd/hd.c ---- hwinfo-16.0/src/hd/hd.c 2009-09-11 15:10:30.000000000 +0900 -+++ hwinfo-16.0.a/src/hd/hd.c 2009-09-11 15:10:05.000000000 +0900 -@@ -150,6 +150,10 @@ +Index: hwinfo-20.1/src/hd/hd.c +=================================================================== +--- hwinfo-20.1.orig/src/hd/hd.c 2014-03-16 07:40:59.700302112 +0900 ++++ hwinfo-20.1/src/hd/hd.c 2014-03-16 07:40:59.688302359 +0900 +@@ -151,6 +151,10 @@ #define HD_ARCH "ppc64" #endif diff -urN hwinfo-16.0/debian/patches/sparc_kioc hwinfo-20.1/debian/patches/sparc_kioc --- hwinfo-16.0/debian/patches/sparc_kioc 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/patches/sparc_kioc 2014-03-16 07:37:57.060053294 +0900 @@ -1,16 +1,10 @@ -Index: src/hd/kbd.c +Based on DebianBug#378653 + +Index: hwinfo-20.1/src/hd/kbd.c =================================================================== ---- hwinfo-14.19.orig/src/hd/kbd.c.orig -+++ hwinfo-14.19/src/hd/kbd.c -@@ -45,7 +45,6 @@ - typedef unsigned int u_int; - #endif - --#include <asm/kbio.h> - #include <asm/openpromio.h> - #endif - -@@ -253,8 +252,6 @@ +--- hwinfo-20.1.orig/src/hd/kbd.c 2014-03-16 07:37:06.613090793 +0900 ++++ hwinfo-20.1/src/hd/kbd.c 2014-03-16 07:37:06.605090957 +0900 +@@ -251,8 +251,6 @@ if((fd = open(DEV_KBD, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) { diff -urN hwinfo-16.0/debian/rules hwinfo-20.1/debian/rules --- hwinfo-16.0/debian/rules 2014-03-16 07:20:39.000000000 +0900 +++ hwinfo-20.1/debian/rules 2014-03-16 11:04:55.682381983 +0900 @@ -1,24 +1,6 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make - -# This has to be exported to make some magic below work. -export DH_OPTIONS -export QUILT_PATCHES=debian/patches -export QUILT_DIFF_ARGS="--no-timestamps -p 0" -export QUILT_REFRESH_ARGS="--no-timestamps -p 0" CFLAGS = -Wall -g @@ -47,36 +29,26 @@ done; \ fi -patch: patch-stamp -patch-stamp: - dh_testdir - quilt push -a || test $$? = 2 - touch $@ - - #Architecture build: build-arch build-indep build-arch: build-arch-stamp -build-arch-stamp: patch-stamp +build-arch-stamp: + echo $(UPVERSION) > $(CURDIR)/VERSION $(MAKE) touch $@ build-indep: build-indep-stamp -build-indep-stamp: patch-stamp +build-indep-stamp: $(MAKE) doc touch $@ clean: dh_testdir dh_testroot - rm -f build-arch-stamp build-indep-stamp patch-stamp + rm -f build-arch-stamp build-indep-stamp [ ! -f Makefile ] || $(MAKE) distclean - - -quilt pop -a - rm -rf .pc - dh_clean install: install-indep install-arch @@ -104,7 +76,7 @@ binary-common: dh_testdir dh_testroot - dh_installchangelogs Changelog + dh_installchangelogs dh_installdocs dh_installman dh_link @@ -126,4 +98,4 @@ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch get-orig-source +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch get-orig-source diff -urN hwinfo-16.0/debian/source/format hwinfo-20.1/debian/source/format --- hwinfo-16.0/debian/source/format 1970-01-01 09:00:00.000000000 +0900 +++ hwinfo-20.1/debian/source/format 2014-03-16 07:59:53.501173169 +0900 @@ -0,0 +1 @@ +3.0 (quilt)
