Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 334 - (show annotations) (download)
Wed Sep 5 20:01:43 2007 UTC (16 years, 8 months ago) by niro
File size: 27275 byte(s)
-added debian patches

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