Magellan Linux

Contents of /trunk/hwinfo/patches/hwinfo-16.10-debian-1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 908 - (show annotations) (download)
Tue Oct 27 10:13:46 2009 UTC (14 years, 6 months ago) by niro
File size: 26744 byte(s)
-re-diffed for 16.10

1 --- hwinfo-13.41.orig/debian/patches/kbd.c-tiocgdev_undefined
2 +++ hwinfo-13.41/debian/patches/kbd.c-tiocgdev_undefined
3 @@ -0,0 +1,18 @@
4 +Index: src/hd/kbd.c
5 +===================================================================
6 +--- src/hd/kbd.c.orig
7 ++++ src/hd/kbd.c
8 +@@ -121,11 +121,13 @@
9 + }
10 +
11 + if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {
12 ++ /* Removing since TIOCGDEV isn't supported in the mainline kernel
13 + if(ioctl(fd, TIOCGDEV, &u) != -1) {
14 + tty_major = (u >> 8) & 0xfff;
15 + tty_minor = (u & 0xff) | ((u >> 12) & 0xfff00);
16 + ADD2LOG(DEV_CONSOLE ": major %u, minor %u\n", tty_major, tty_minor);
17 + }
18 ++ */
19 +
20 + if(tty_major == 229 /* iseries hvc */) {
21 + if (tty_minor >= 128) {
22 --- hwinfo-13.41.orig/debian/patches/series
23 +++ hwinfo-13.41/debian/patches/series
24 @@ -0,0 +1,6 @@
25 +hwinfo.8-strip_suse -p0
26 +new_archs -p0
27 +sparc_kioc -p0
28 +serial_struct -p0
29 +kbd.c-tiocgdev_undefined -p0
30 +cpu.c-alpha_bogo -p0
31 --- hwinfo-13.41.orig/debian/patches/new_archs
32 +++ hwinfo-13.41/debian/patches/new_archs
33 @@ -0,0 +1,19 @@
34 +Index: src/hd/hd.c
35 +===================================================================
36 +--- src/hd/hd.c.orig
37 ++++ src/hd/hd.c
38 +@@ -142,6 +142,14 @@
39 + #define HD_ARCH "hppa"
40 + #endif
41 +
42 ++#ifdef __mc68000__
43 ++#define HD_ARCH "m68k"
44 ++#endif
45 ++
46 ++#ifdef __powerpc64__
47 ++#define HD_ARCH "ppc64"
48 ++#endif
49 ++
50 + typedef struct disk_s {
51 + struct disk_s *next;
52 + unsigned crc;
53 --- hwinfo-13.41.orig/debian/patches/sparc_kioc
54 +++ hwinfo-13.41/debian/patches/sparc_kioc
55 @@ -0,0 +1,21 @@
56 +Index: src/hd/kbd.c
57 +===================================================================
58 +--- src/hd/kbd.c.orig
59 ++++ src/hd/kbd.c
60 +@@ -45,7 +45,6 @@
61 + typedef unsigned int u_int;
62 + #endif
63 +
64 +-#include <asm/kbio.h>
65 + #include <asm/openpromio.h>
66 + #endif
67 +
68 +@@ -253,8 +252,6 @@
69 +
70 + if((fd = open(DEV_KBD, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0)
71 + {
72 +- if(ioctl(fd, KIOCTYPE, &kid)) kid = -1;
73 +- if(ioctl(fd, KIOCLAYOUT, &klay)) klay = -1;
74 + close(fd);
75 +
76 + if(kid != -1)
77 --- hwinfo-13.41.orig/debian/patches/cpu.c-alpha_bogo
78 +++ hwinfo-13.41/debian/patches/cpu.c-alpha_bogo
79 @@ -0,0 +1,28 @@
80 +Index: src/hd/cpu.c
81 +===================================================================
82 +--- src/hd/cpu.c.orig
83 ++++ src/hd/cpu.c
84 +@@ -104,6 +104,7 @@
85 + #ifdef __alpha__
86 + char model_id[80], system_id[80], serial_number[80], platform[80];
87 + unsigned cpu_variation, cpu_revision, u, hz;
88 ++ double bogo;
89 + cpu_info_t *ct1;
90 + #endif
91 +
92 +@@ -133,6 +134,7 @@
93 + #ifdef __alpha__
94 + *model_id = *system_id = *serial_number = *platform = 0;
95 + cpu_variation = cpu_revision = hz = 0;
96 ++ bogo = 0;
97 +
98 + for(sl = hd_data->cpu; sl; sl = sl->next) {
99 + if(sscanf(sl->str, "cpu model : %79[^\n]", model_id) == 1) continue;
100 +@@ -143,6 +145,7 @@
101 + if(sscanf(sl->str, "cpus detected : %u", &cpus) == 1) continue;
102 + if(sscanf(sl->str, "cycle frequency [Hz] : %u", &hz) == 1) continue;
103 + if(sscanf(sl->str, "system variation : %79[^\n]", platform) == 1) continue;
104 ++ if(sscanf(sl->str, "BogoMIPS : %lg", &bogo) == 1) continue;
105 + }
106 +
107 + if(*model_id || *system_id) { /* at least one of those */
108 --- hwinfo-13.41.orig/debian/patches/serial_struct
109 +++ hwinfo-13.41/debian/patches/serial_struct
110 @@ -0,0 +1,31 @@
111 +Index: src/hd/kbd.c
112 +===================================================================
113 +--- src/hd/kbd.c.orig
114 ++++ src/hd/kbd.c
115 +@@ -21,26 +21,6 @@
116 +
117 + #ifdef __sparc__
118 +
119 +-struct serial_struct {
120 +- int type;
121 +- int line;
122 +- unsigned long port;
123 +- int irq;
124 +- int flags;
125 +- int xmit_fifo_size;
126 +- int custom_divisor;
127 +- int baud_base;
128 +- unsigned short close_delay;
129 +- char io_type;
130 +- char reserved_char[1];
131 +- int hub6;
132 +- unsigned short closing_wait; /* time to wait before closing */
133 +- unsigned short closing_wait2; /* no longer used... */
134 +- unsigned char *iomem_base;
135 +- unsigned short iomem_reg_shift;
136 +- int reserved[2];
137 +-};
138 +-
139 + #ifdef DIET
140 + typedef unsigned int u_int;
141 + #endif
142 --- hwinfo-13.41.orig/debian/hwinfo.8
143 +++ hwinfo-13.41/debian/hwinfo.8
144 @@ -0,0 +1,46 @@
145 +.\" Process this file with
146 +.\" groff -man -Tascii hwinfo.8
147 +.\"
148 +.TH HWINFO 8 "SEPTEMBER 2006"
149 +.SH NAME
150 +hwinfo \- probe for hardware
151 +.SH SYNOPSIS
152 +.B hwinfo [ options ]
153 +.SH DESCRIPTION
154 +.B hwinfo
155 +is used to probe for the hardware present in the system.
156 +.SH OPTIONS
157 +.TP
158 +.B \-\^\-debug level
159 +The debug info is shown only in the log file. If you specify a log file, the
160 +debug level is implicitly set to a reasonable value.
161 +.TP
162 +.B \-\^\-dump\-db n
163 +.RB "Dump hardware database, " n " is either " 0
164 +.RB " for the external database, or " 1 " for the internal database."
165 +.TP
166 +.B \-\^\-help
167 +Print a usage and exit.
168 +.TP
169 +.B \-\^\-log logfile
170 +Write info to logfile.
171 +.TP
172 +.B \-\^\-short
173 +Print a short listing.
174 +.TP
175 +.B \-\^\-<hwitem>
176 +Probe for the particular hardware item. Available hardware items are:
177 +.B cdrom, floppy, disk, network, gfxcard, framebuffer, monitor, camera,
178 +.B storage-ctrl, netcard, printer, tv, dvb, scanner, braille, sys, bios,
179 +.B cpu, partition, usb-ctrl, usb, pci, isapnp, ide, scsi, bridge, hub,
180 +.B memory, smp, ppoe, all
181 +and
182 +.B reallyall.
183 +.SH BUGS
184 +Not all hardware can be detected.
185 +.SH AUTHOR
186 +\(md Steffen Winterfeldt snwint@suse.de - hwinfo
187 +.TP
188 +\(md Michal Svec msvec@suse.cz - man page
189 +.SH "SEE ALSO"
190 +discover (8).
191 --- hwinfo-13.41.orig/debian/copyright
192 +++ hwinfo-13.41/debian/copyright
193 @@ -0,0 +1,29 @@
194 +This package was debianized by Morten Werner Olsen <werner@skolelinux.no> on
195 +Sun, 30 May 2004 21:39:25 +0200.
196 +
197 +It was downloaded from:
198 + http://mirrors.kernel.org/pub/opensuse/distribution/SL-OSS-factory/inst-source/suse/src/
199 +
200 +Copyright:
201 +
202 + SuSE Linux AG, Nuernberg, Germany
203 + (http://www.suse.de/feedback)
204 +
205 +License:
206 +
207 + This package is free software; you can redistribute it and/or modify
208 + it under the terms of the GNU General Public License as published by
209 + the Free Software Foundation; version 2 dated June, 1991.
210 +
211 + This package is distributed in the hope that it will be useful,
212 + but WITHOUT ANY WARRANTY; without even the implied warranty of
213 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
214 + GNU General Public License for more details.
215 +
216 + You should have received a copy of the GNU General Public License
217 + along with this package; if not, write to the Free Software Foundation,
218 + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
219 +
220 +On Debian systems, the complete text of the GNU General
221 +Public License can be found in `/usr/share/common-licenses/GPL'.
222 +
223 --- hwinfo-13.41.orig/debian/libhd13-doc.doc-base
224 +++ hwinfo-13.41/debian/libhd13-doc.doc-base
225 @@ -0,0 +1,9 @@
226 +Document: hwinfo
227 +Title: C hwinfo Library
228 +Section: Apps/Programming
229 +
230 +Format: HTML
231 +Index: /usr/share/doc/libhd13-doc/html/index.html
232 +Files: /usr/share/doc/libhd13-doc/html/*.html
233 +
234 +
235 --- hwinfo-13.41.orig/debian/TODO
236 +++ hwinfo-13.41/debian/TODO
237 @@ -0,0 +1,9 @@
238 +TODO for the hwinfo Debian package
239 +----------------------------------
240 +
241 + * Write man-pages for check_hd, convert_hd, getsysinfo and mk_isdnhwdb.
242 + * Include the binaries that isn't included, and maybe make it possible to
243 + use hwinfo as the hardware detection tool that loads modules at boot.
244 +
245 + -- Morten Werner Olsen <werner@skolelinux.no> Sun, 30 May 2004 21:26:11 +0200
246 +
247 --- hwinfo-13.41.orig/debian/changelog
248 +++ hwinfo-13.41/debian/changelog
249 @@ -0,0 +1,280 @@
250 +hwinfo (13.41-1) unstable; urgency=low
251 +
252 + * New upstream release
253 +
254 + -- William Vera <billy@billy.com.mx> Thu, 09 Aug 2007 09:34:01 -0500
255 +
256 +hwinfo (13.39-1) unstable; urgency=low
257 +
258 + * New upstream release
259 + * Added command in debian/rules to erase .pc, related with quilt
260 +
261 + -- William Vera <billy@billy.com.mx> Wed, 01 Aug 2007 05:03:00 -0500
262 +
263 +hwinfo (13.35-2) unstable; urgency=low
264 +
265 + * New maintainer (Closes: #412637).
266 + * Changed deprecated variables at control file.
267 +
268 + -- William Vera <billy@billy.com.mx> Tue, 03 Jul 2007 01:16:03 -0500
269 +
270 +hwinfo (13.35-1) unstable; urgency=low
271 +
272 + * New upstream releases.
273 + * Refresh patches against new upstream
274 + * Update debian/watch to handle multi-digit revisions of a single version of
275 + the upstream source rpm.
276 + * Orphan package.
277 + - Set maintainer to Debian QA Group
278 +
279 + -- James Vega <jamessan@debian.org> Mon, 18 Jun 2007 20:54:02 +0100
280 +
281 +hwinfo (13.28-1) unstable; urgency=low
282 +
283 + * New upstream releases.
284 + - Fixes usage of x86 asm on non-x86 architectures
285 + (Closes: #412713, #414723)
286 +
287 + -- James Vega <jamessan@debian.org> Tue, 13 Mar 2007 10:38:19 -0400
288 +
289 +hwinfo (13.23-1) unstable; urgency=low
290 +
291 + * New upstream releases
292 + * debian/rules: Add a get-orig-source target which fetches the upstream RPM
293 + and repacks as a tarball.
294 +
295 + -- James Vega <jamessan@debian.org> Mon, 26 Feb 2007 07:24:26 -0500
296 +
297 +hwinfo (13.11-3) unstable; urgency=low
298 +
299 + * Add cpu.c-alpha_bogo patch, which fixes a FTBFS on alpha because of an
300 + undefined variable.
301 +
302 + -- James Vega <jamessan@debian.org> Fri, 3 Nov 2006 07:28:15 -0500
303 +
304 +hwinfo (13.11-2) unstable; urgency=low
305 +
306 + * Stop shipping our own hwinfo manpage, and use a patched version of
307 + upstream's. The patch removes references to items that are SUSE-specific.
308 +
309 + -- James Vega <jamessan@debian.org> Thu, 2 Nov 2006 23:19:47 -0500
310 +
311 +hwinfo (13.11-1) unstable; urgency=low
312 +
313 + * New upstream version.
314 + * Re-add a previous patch (tiocgdev_undefined) which removes use of
315 + TIOCGDEV, an ioctl that isn't supported in the mainline kernel anymore.
316 +
317 + -- James Vega <jamessan@debian.org> Thu, 2 Nov 2006 22:35:50 -0500
318 +
319 +hwinfo (13.4-1) unstable; urgency=low
320 +
321 + * New upstream version.
322 + * Switch from dbs to quilt
323 + - Revamp debian/rules
324 + - Add quilt and remove dbs from Build-Depends in debian/control
325 + * Remove reference to hwscan(8) from manpage. (closes: #388245)
326 + * Re-wrote manpage from scratch. Drop docbook-to-man from Build-Depends.
327 + * Remove NEWS.Debian since it is no longer applicable.
328 +
329 + -- James Vega <jamessan@debian.org> Thu, 28 Sep 2006 20:56:06 -0400
330 +
331 +hwinfo (13.3-3) unstable; urgency=low
332 +
333 + * Add debian/patches/93_serial_struct to fix a FTBFS on sparc. Thanks Clint
334 + Adams. (closes: #387952)
335 +
336 + -- James Vega <jamessan@debian.org> Sun, 17 Sep 2006 13:56:18 -0400
337 +
338 +hwinfo (13.3-2) unstable; urgency=low
339 +
340 + * debian/control:
341 + - Move doxygen from Build-Depends-Indep to Build-Depends.
342 + (closes: #387872)
343 + * debian/copyright:
344 + - Update the download URL.
345 +
346 + -- James Vega <jamessan@debian.org> Sun, 17 Sep 2006 09:30:12 -0400
347 +
348 +hwinfo (13.3-1) unstable; urgency=low
349 +
350 + * New maintainer. (closes: #386035)
351 + * New upstream releases.
352 + - hwinfo --pci no longer lists everything as an ISDN adapter
353 + (closes: #381387)
354 + * debian/patches:
355 + - Remove 01_sysfsutils2 and 02_sysfsutils2_s390, sysfs isn't used in the
356 + new release.
357 + - Remove 03_dbus-api-fix-thoenig, applied upstream.
358 + * debian/control:
359 + - Update maintainer address.
360 + - Remove libsysfs-dev Build-Depends.
361 + - Remove libhd13-dev's libsysfs-dev Depends.
362 + - Add libhd13-doc package.
363 + - Add doxygen Build-Depends-Indep.
364 + * debian/rules:
365 + - Add build/binary-indep to build libhd's documentation.
366 + * Add debian/watch file.
367 +
368 + -- James Vega <jamessan@debian.org> Fri, 15 Sep 2006 01:15:00 -0400
369 +
370 +hwinfo (13.0-6) unstable; urgency=low
371 +
372 + * Added patch from upstream to change dbus connection-close function.
373 + Thanks to Sebastian Dröge for bugreport and patch. (Closes: #385527)
374 +
375 + -- Morten Werner Olsen <werner@debian.org> Mon, 4 Sep 2006 21:47:48 +0200
376 +
377 +hwinfo (13.0-5) unstable; urgency=low
378 +
379 + * Fixed a cut'n'paste error in sysfsutils2 patch which caused all the PCI
380 + interfaces to be reported as ISDN adapters. (Closes: #381387)
381 + * Corrected a typo in debian/copyright (URL to .src.rpm).
382 +
383 + -- Morten Werner Olsen <werner@debian.org> Sun, 20 Aug 2006 13:34:08 +0200
384 +
385 +hwinfo (13.0-4) unstable; urgency=low
386 +
387 + * Patch src/hd/kbd.c to not include asm/kbio.h or use KIOC* defines
388 + (thanks to Clint Adams). (Closes: #378653)
389 +
390 + -- Morten Werner Olsen <werner@debian.org> Tue, 18 Jul 2006 11:23:17 +0200
391 +
392 +hwinfo (13.0-3) unstable; urgency=low
393 +
394 + * Added separate Section-fileds for libhd13 and libhd13-dev in
395 + debian/control. Thanks to the Debian distribution maintenance software
396 + for notifying me. :)
397 +
398 + -- Morten Werner Olsen <werner@debian.org> Sun, 16 Jul 2006 16:16:08 +0200
399 +
400 +hwinfo (13.0-2) unstable; urgency=low
401 +
402 + * New sysfsutils2-patch for src/hd/s390.c to fix FTBFS on S/390.
403 + (Closes: #377611)
404 + * New patch to remove the redefine of serial_struct in src/hd/kbd.c.
405 + * Added linux-kernel-headers to Build-Depends as it has some files needed
406 + for at least Sparc.
407 +
408 + -- Morten Werner Olsen <werner@debian.org> Sun, 16 Jul 2006 15:12:43 +0200
409 +
410 +hwinfo (13.0-1) unstable; urgency=low
411 +
412 + * New upstream release.
413 + * Upstream is bumping the soname, so changing libhd12 and libhd12-dev
414 + to libhd13 and libhd13-dev.
415 + * Removed debian/patches/02_tiocgdev_undeclared as the TIOCGDEV is
416 + commented out by upstream.
417 + * Added patch from Steinar H. Gunderson and Filippo Giunchedi that ports
418 + hwinfo to use sysfsutils2. Thanks a lot for this patch, Steinar and
419 + Filippo! (Closes: #356352)
420 +
421 + -- Morten Werner Olsen <werner@debian.org> Sun, 9 Jul 2006 21:26:26 +0200
422 +
423 +hwinfo (12.9-2experimental1) experimental; urgency=low
424 +
425 + * Added the libhd12 and libhd12-dev packages again. (Closes: #362865)
426 + * Added Build-Dependency to perl (dbs-script in debian/rules).
427 + * Bumped Standards-Version to 3.7.2 (no changes needed).
428 +
429 + -- Morten Werner Olsen <werner@debian.org> Sun, 4 Jun 2006 13:53:40 +0200
430 +
431 +hwinfo (12.9-2) unstable; urgency=low
432 +
433 + * Added patch that prevents segfault on architectures where the size
434 + of a pointer is greater than the size of an integer (thanks to
435 + Dann Frazier). (Closes: #356393)
436 +
437 + -- Morten Werner Olsen <werner@debian.org> Sun, 30 Apr 2006 23:00:25 +0200
438 +
439 +hwinfo (12.9-1) unstable; urgency=low
440 +
441 + * New upstream release.
442 + - Rewrote debian/patches/800_new_arches to debian/patches/80_new_archs
443 + as some parts was included upstream and other parts is afaik not
444 + needed.
445 + - Removed debian/patches/810_gcc4_fix (fixed upstream).
446 + - Removed debian/patches/820_amd64_fix (fixed upstream)
447 + * Updated debian/copyright:
448 + - Changed Copyright to License (thanks to Justin Pryzby).
449 + (Closes: #290182)
450 + - FSF's address (thanks to Lintian).
451 + * Added Build-Dependency on libdbus-1-dev and libhal-dev.
452 + * Now building against the new version of sysfsutils (2.0.0).
453 + (Closes: #347633, #355335)
454 + * Added debian/patches/01_sysfsutils with missing structs and functions
455 + from old version of sysfsutils (thanks to Petter Reinholdtsen).
456 + * Added debian/NEWS with info about the missing functionality due to the
457 + changes in debian/patches/01_sysfsutils.
458 + * Added debian/patches/02_tiocgdev_undefined which remove one test in a
459 + serial console test where TIOCGDEV is used (a SuSE-specific thing). :/
460 + * New maintainer email address. :)
461 +
462 + -- Morten Werner Olsen <werner@debian.org> Sat, 11 Mar 2006 09:25:08 +0100
463 +
464 +hwinfo (8.38-5) unstable; urgency=low
465 +
466 + * The patches/820_amd64_fix seems to have disappeared. (Closes: #329185)
467 +
468 + -- Morten Werner Olsen <werner@skolelinux.no> Sat, 26 Nov 2005 23:18:52 +0100
469 +
470 +hwinfo (8.38-4) unstable; urgency=low
471 +
472 + * Replaced 810_hppa_and_m68k_port with 800_new_archs which now includes
473 + hppa, m68k, and ppc64 (thanks to Andreas Jochens).
474 + (Closes: #304079, #329240)
475 + * Added 810_gcc4_fix to make hwinfo build with gcc4 (thanks to
476 + Andreas Johens). (Closes: #304079)
477 + * Added 820_amd64_fix which fixes some assembly bugs with 64bit arch
478 + (thanks to Andreas Johens). (Closes: #329185)
479 + * Bumped Standards-Version to 3.6.2 (no changes).
480 +
481 + -- Morten Werner Olsen <werner@skolelinux.no> Mon, 14 Nov 2005 18:58:17 +0100
482 +
483 +hwinfo (8.38-3) unstable; urgency=low
484 +
485 + * 810_hppa_and_m68k_port: replaced both occurances of __m68k__ with
486 + __mc68000__ to make hwinfo build on m68k-archs (thanks to Adam Conrad).
487 + (Closes: #270408)
488 +
489 + -- Morten Werner Olsen <werner@skolelinux.no> Tue, 5 Oct 2004 19:29:14 +0200
490 +
491 +hwinfo (8.38-2) unstable; urgency=low
492 +
493 + * Removed conflicts to libhd, libhd-dev and libhd-doc to provide an easier
494 + upgrade path.
495 +
496 + -- Morten Werner Olsen <werner@skolelinux.no> Mon, 2 Aug 2004 12:25:30 +0200
497 +
498 +hwinfo (8.38-1) unstable; urgency=low
499 +
500 + * New upstream release.
501 + * Major change: now building a static version of the hwinfo binary, and
502 + dropping the libhd* packages due to upstream's way of maintaining the
503 + otherwise shared library in the hwinfo package (thanks to my AM,
504 + Michael Banck, for pointing out this problem for me).
505 + * Added conflicts to libhd, libhd-dev and libhd-doc.
506 + * Added man-page for hwinfo.
507 + * Added patch to make hwinfo build on hppa and m68k (thanks to Joel Soete
508 + and Martin-Ãric Racine). (Closes: #252298, #253673)
509 + * Tried to improve package descriptions. (Closes: #245080)
510 + * Removed the binary hwscan from the package.
511 +
512 + -- Morten Werner Olsen <werner@skolelinux.no> Mon, 5 Jul 2004 22:13:29 +0000
513 +
514 +hwinfo (7.30-2) unstable; urgency=low
515 +
516 + * Moved /usr/lib/libhd.a and /usr/lib/libhd_tiny.a from libhd to libhd-dev.
517 + (Thanks to Petter Reinholdtsen for pointing this out.)
518 + * Added gcc option -D_REENTRANT to Makefile and Makefile.common
519 + (debian/patches/010_makefile and debian/patches/020_makefile_common).
520 + * Fixed a typo in debian/control (hdlib -> libhd).
521 +
522 + -- Morten Werner Olsen <werner@skolelinux.no> Sun, 18 Apr 2004 11:29:18 +0200
523 +
524 +hwinfo (7.30-1) unstable; urgency=low
525 +
526 + * Initial Release. (Closes: #242208)
527 +
528 + -- Morten Werner Olsen <werner@skolelinux.no> Tue, 6 Apr 2004 09:50:03 +0200
529 +
530 --- hwinfo-13.41.orig/debian/libhd13-dev.install
531 +++ hwinfo-13.41/debian/libhd13-dev.install
532 @@ -0,0 +1,4 @@
533 +debian/tmp/usr/include/hd.h
534 +debian/tmp/usr/lib/libhd.a
535 +debian/tmp/usr/lib/libhd.so
536 +debian/tmp/usr/lib/pkgconfig/
537 --- hwinfo-13.41.orig/debian/watch
538 +++ hwinfo-13.41/debian/watch
539 @@ -0,0 +1,6 @@
540 +# Example watch control file for uscan
541 +# Rename this file to "watch" and then you can run the "uscan" command
542 +# to check for upstream updates and more.
543 +# Site Directory Pattern Version Script
544 +version=3
545 +ftp://mirrors.kernel.org/pub/opensuse/distribution/SL-OSS-factory/inst-source/suse/src/hwinfo-([\d.]+)-\d+.src.rpm
546 --- hwinfo-13.41.orig/debian/hwinfo.manpages
547 +++ hwinfo-13.41/debian/hwinfo.manpages
548 @@ -0,0 +1 @@
549 +doc/hwinfo.8
550 --- hwinfo-13.41.orig/debian/rules
551 +++ hwinfo-13.41/debian/rules
552 @@ -0,0 +1,128 @@
553 +#!/usr/bin/make -f
554 +# -*- makefile -*-
555 +# Sample debian/rules that uses debhelper.
556 +#
557 +# This file was originally written by Joey Hess and Craig Small.
558 +# As a special exception, when this file is copied by dh-make into a
559 +# dh-make output file, you may use that output file without restriction.
560 +# This special exception was added by Craig Small in version 0.37 of dh-make.
561 +#
562 +# Modified to make a template file for a multi-binary package with separated
563 +# build-arch and build-indep targets by Bill Allombert 2001
564 +
565 +# Uncomment this to turn on verbose mode.
566 +#export DH_VERBOSE=1
567 +
568 +# This has to be exported to make some magic below work.
569 +export DH_OPTIONS
570 +export QUILT_PATCHES=debian/patches
571 +export QUILT_DIFF_ARGS="--no-timestamps -p 0"
572 +export QUILT_REFRESH_ARGS="--no-timestamps -p 0"
573 +
574 +CFLAGS = -Wall -g
575 +
576 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
577 + CFLAGS += -O0
578 +else
579 + CFLAGS += -O2
580 +endif
581 +
582 +UPURL=ftp://mirrors.kernel.org/pub/opensuse/distribution/SL-OSS-factory/inst-source/suse/src/
583 +UPVERSION=$(shell dpkg-parsechangelog | grep '^Version' | sed -e 's/^[^ ]* //' -e 's/-[^-]*$$//')
584 +
585 +get-orig-source:
586 + @dh_testdir
587 + @if [ ! -d ../tarballs ]; then \
588 + mkdir ../tarballs; \
589 + fi
590 + @if [ ! -e ../tarballs/hwinfo_$(UPVERSION).orig.tar.gz ]; then \
591 + echo "Fetching hwinfo $(UPVERSION)..."; \
592 + for f in $$(w3m -dump $(UPURL) | grep -o 'hwinfo-$(UPVERSION)-[[:digit:]]\+.src.rpm' | tail -n 1); do \
593 + cd ../tarballs && wget -q -O $$f $(UPURL)$$f; \
594 + echo "Repacking RPM as a tarball..."; \
595 + alien -d --nopatch -s $$f >/dev/null 2>&1; \
596 + bzcat hwinfo-$(UPVERSION)/hwinfo-$(UPVERSION).tar.bz2 | gzip -c - > hwinfo_$(UPVERSION).orig.tar.gz; \
597 + rm -rf hwinfo-$(UPVERSION) $$f; \
598 + done; \
599 + fi
600 +
601 +patch: patch-stamp
602 +patch-stamp:
603 + dh_testdir
604 + quilt push -a
605 + touch $@
606 +
607 +
608 +#Architecture
609 +build: build-arch build-indep
610 +
611 +build-arch: build-arch-stamp
612 +build-arch-stamp: patch-stamp
613 + $(MAKE)
614 + touch $@
615 +
616 +build-indep: build-indep-stamp
617 +build-indep-stamp: patch-stamp
618 + $(MAKE) doc
619 + touch $@
620 +
621 +clean:
622 + dh_testdir
623 + dh_testroot
624 + rm -f build-arch-stamp build-indep-stamp patch-stamp
625 +
626 + [ ! -f Makefile ] || $(MAKE) distclean
627 +
628 + -quilt pop -a
629 + rm -rf .pc
630 +
631 + dh_clean
632 +
633 +install: install-indep install-arch
634 +install-indep:
635 + dh_testdir
636 + dh_testroot
637 + dh_clean -k -i
638 + dh_installdirs -i
639 +
640 + dh_install -i doc/libhd/html usr/share/doc/libhd13-doc
641 +
642 +install-arch:
643 + dh_testdir
644 + dh_testroot
645 + dh_clean -k -s
646 + dh_installdirs -s
647 +
648 + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
649 + install -D -m 644 src/libhd.a debian/tmp/usr/lib/libhd.a
650 +
651 + dh_install -s
652 +# Must not depend on anything. This is to be called by
653 +# binary-arch/binary-indep
654 +# in another 'make' thread.
655 +binary-common:
656 + dh_testdir
657 + dh_testroot
658 + dh_installchangelogs Changelog
659 + dh_installdocs
660 + dh_installman
661 + dh_link
662 + dh_strip
663 + dh_compress
664 + dh_fixperms
665 + dh_makeshlibs
666 + dh_installdeb
667 + dh_shlibdeps
668 + dh_gencontrol
669 + dh_md5sums
670 + dh_builddeb
671 +# Build architecture independant packages using the common target.
672 +binary-indep: build-indep install-indep
673 + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
674 +
675 +# Build architecture dependant packages using the common target.
676 +binary-arch: build-arch install-arch
677 + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
678 +
679 +binary: binary-arch binary-indep
680 +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch get-orig-source
681 --- hwinfo-13.41.orig/debian/control
682 +++ hwinfo-13.41/debian/control
683 @@ -0,0 +1,81 @@
684 +Source: hwinfo
685 +Section: admin
686 +Priority: optional
687 +Maintainer: William Vera <billy@billy.com.mx>
688 +Build-Depends: debhelper (>= 4.0.0), quilt, perl, flex, libdbus-1-dev, libhal-dev, linux-kernel-headers, doxygen
689 +Standards-Version: 3.7.2
690 +
691 +Package: hwinfo
692 +Architecture: any
693 +Depends: ${shlibs:Depends}, ${misc:Depends}
694 +Description: Hardware identification system
695 + hwinfo is the hardware detection tool used in SuSE Linux.
696 + .
697 + In Debian-Edu (Skolelinux) hwinfo has shown better results than discover when
698 + detecting mouse, keyboard and monitor.
699 + .
700 + hwinfo collects information about the hardware installed on a system. Among
701 + others, libhd contains information about cdrom, zip, floppy, disks and
702 + partitions, network card, graphics card, monitor, camera, mouse, sound, pppoe,
703 + isdn, modem, printer, scanner, bios, cpu, usb, memory and smp.
704 + .
705 + This package does not include the binaries hwscan, hwscand and hwscanqueue. If
706 + you think one or more of these should be included in the package, please
707 + contact the maintainer at hwinfo@packages.debian.org.
708 +
709 +Package: libhd13
710 +Section: libs
711 +Architecture: any
712 +Depends: ${shlibs:Depends}, ${misc:Depends}
713 +Description: Hardware identification system library
714 + hwinfo is the hardware detection tool used in SuSE Linux.
715 + .
716 + In Debian-Edu (Skolelinux) hwinfo has shown better results than discover when
717 + detecting mouse, keyboard and monitor.
718 + .
719 + hwinfo collects information about the hardware installed on a system. Among
720 + others, libhd contains information about cdrom, zip, floppy, disks and
721 + partitions, network card, graphics card, monitor, camera, mouse, sound, pppoe,
722 + isdn, modem, printer, scanner, bios, cpu, usb, memory and smp.
723 + .
724 + This package contains the shared library from the hwinfo package.
725 +
726 +Package: libhd13-doc
727 +Section: doc
728 +Architecture: all
729 +Suggests: doc-base
730 +Enhances: libhd13-dev
731 +Description: Hardware identification system library documentation
732 + hwinfo is the hardware detection tool used in SuSE Linux.
733 + .
734 + In Debian-Edu (Skolelinux) hwinfo has shown better results than discover when
735 + detecting mouse, keyboard and monitor.
736 + .
737 + hwinfo collects information about the hardware installed on a system. Among
738 + others, libhd contains information about cdrom, zip, floppy, disks and
739 + partitions, network card, graphics card, monitor, camera, mouse, sound, pppoe,
740 + isdn, modem, printer, scanner, bios, cpu, usb, memory and smp.
741 + .
742 + This package contains the documentation for the libhd13-dev package.
743 +
744 +Package: libhd13-dev
745 +Section: libdevel
746 +Architecture: any
747 +Depends: libhd13 (= ${binary:Version}), libdbus-1-dev (>= 0.61), libhal-dev (>= 0.5)
748 +Suggests: libhd13-doc
749 +Provides: libhd12-dev
750 +Replaces: libhd12-dev
751 +Conflicts: libhd12-dev
752 +Description: Hardware identification system library and headers
753 + hwinfo is the hardware detection tool used in SuSE Linux.
754 + .
755 + In Debian-Edu (Skolelinux) hwinfo has shown better results than discover when
756 + detecting mouse, keyboard and monitor.
757 + .
758 + hwinfo collects information about the hardware installed on a system. Among
759 + others, libhd contains information about cdrom, zip, floppy, disks and
760 + partitions, network card, graphics card, monitor, camera, mouse, sound, pppoe,
761 + isdn, modem, printer, scanner, bios, cpu, usb, memory and smp.
762 + .
763 + This package contains the static library and header files from the hwinfo
764 + package.
765 --- hwinfo-13.41.orig/debian/hwinfo.install
766 +++ hwinfo-13.41/debian/hwinfo.install
767 @@ -0,0 +1 @@
768 +debian/tmp/usr/sbin/hwinfo
769 --- hwinfo-13.41.orig/debian/libhd13.install
770 +++ hwinfo-13.41/debian/libhd13.install
771 @@ -0,0 +1 @@
772 +debian/tmp/usr/lib/libhd.so.*
773 --- hwinfo-13.41.orig/debian/README.Debian
774 +++ hwinfo-13.41/debian/README.Debian
775 @@ -0,0 +1,12 @@
776 +hwinfo for Debian
777 +-----------------
778 +
779 +The source for this package was downloaded from Suse's FTP-archives:
780 +http://ftp.opensuse.org/pub/opensuse/distribution/SL-OSS-factory/inst-source/suse/src/hwinfo-13.0-2.src.rpm
781 +
782 +This package does not include the binaries hwscan, hwscand and
783 +hwscanqueue. If you miss one of those, please contact the maintainer at
784 +hwinfo@packages.debian.org.
785 +
786 + -- Morten Werner Olsen <werner@debian.org>, Sun, 9 Jul 2006 14:12:04 +0200
787 +
788 --- hwinfo-13.41.orig/debian/compat
789 +++ hwinfo-13.41/debian/compat
790 @@ -0,0 +1 @@
791 +4