- put usb.ids in /usr/share/misc,

- do not use external getopt() (use libc avalaible).

Changed files:
    usbutils-hwdata_in_misc.patch -> 1.1
    usbutils-no_external_getopt.patch -> 1.1

diff --git a/usbutils-hwdata_in_misc.patch b/usbutils-hwdata_in_misc.patch
new file mode 100644 (file)
index 0000000..f34e0e9
--- /dev/null
+++ b/usbutils-hwdata_in_misc.patch
@@ -0,0 +1,130 @@
+--- usbutils-0.9/configure.in~ Tue May 28 01:14:51 2002
++++ usbutils-0.9/configure.in  Tue May 28 01:14:51 2002
+@@ -23,15 +23,7 @@
+ AC_CHECK_HEADERS(getopt.h sys/ioctl.h syslog.h errno.h linux/usb.h linux/usbdevice_fs.h)
+ 
+ dnl set USBIDS_FILE in config.h.
+-if test "x${datadir}" = 'x${prefix}/share'; then
+-  if test "x${prefix}" = "xNONE"; then
+-    AC_DEFINE_UNQUOTED(USBIDS_FILE, "${ac_default_prefix}/share/usb.ids")
+-  else
+-    AC_DEFINE_UNQUOTED(USBIDS_FILE, "${prefix}/share/usb.ids")
+-  fi
+-else
+-  AC_DEFINE_UNQUOTED(USBIDS_FILE, "${datadir}/usb.ids")
+-fi
++AC_DEFINE_UNQUOTED(USBIDS_FILE, "${prefix}/share/misc/usb.ids")
+ 
+ AC_CONFIG_SUBDIRS([libusb])
+ 
+--- usbutils-0.9/configure.hwdata      Wed Jan 30 19:45:49 2002
++++ usbutils-0.9/configure     Wed Jan 30 19:46:15 2002
+@@ -1761,18 +1761,18 @@
+ if test "x${datadir}" = 'x${prefix}/share'; then
+   if test "x${prefix}" = "xNONE"; then
+     cat >> confdefs.h <<EOF
+-#define USBIDS_FILE "${ac_default_prefix}/share/usb.ids"
++#define USBIDS_FILE "${ac_default_prefix}/share/misc/usb.ids"
+ EOF
+ 
+   else
+     cat >> confdefs.h <<EOF
+-#define USBIDS_FILE "${prefix}/share/usb.ids"
++#define USBIDS_FILE "${prefix}/share/misc/usb.ids"
+ EOF
+ 
+   fi
+ else
+   cat >> confdefs.h <<EOF
+-#define USBIDS_FILE "${datadir}/usb.ids"
++#define USBIDS_FILE "${prefix}/share/misc/usb.ids"
+ EOF
+ 
+ fi
+--- usbutils-0.9/libusb/configure.hwdata       Wed Jan 30 19:44:12 2002
++++ usbutils-0.9/libusb/configure      Wed Jan 30 19:44:56 2002
+@@ -2326,18 +2326,18 @@
+ if test "x${datadir}" = 'x${prefix}/share'; then
+   if test "x${prefix}" = "xNONE"; then
+     cat >> confdefs.h <<EOF
+-#define USBIDS_FILE "${ac_default_prefix}/share/usb.ids"
++#define USBIDS_FILE "${ac_default_prefix}/share/misc/usb.ids"
+ EOF
+ 
+   else
+     cat >> confdefs.h <<EOF
+-#define USBIDS_FILE "${prefix}/share/usb.ids"
++#define USBIDS_FILE "${prefix}/share/misc/usb.ids"
+ EOF
+ 
+   fi
+ else
+   cat >> confdefs.h <<EOF
+-#define USBIDS_FILE "${datadir}/usb.ids"
++#define USBIDS_FILE "{prefix}/share/misc/usb.ids"
+ EOF
+ 
+ fi
+--- usbutils-0.9/lsusb.8.hwdata        Wed Jan 30 19:45:15 2002
++++ usbutils-0.9/lsusb.8       Wed Jan 30 19:45:23 2002
+@@ -47,7 +47,7 @@
+ 
+ .SH FILES
+ .TP
+-.B /usr/share/usb.ids
++.B /usr/share/misc/usb.ids
+ A list of all known USB ID's (vendors, products, classes, subclasses and protocols).
+ .TP
+ .B /proc/bus/usb
+--- usbutils-0.9/Makefile.am~  Tue May 28 01:17:37 2002
++++ usbutils-0.9/Makefile.am   Tue May 28 01:17:37 2002
+@@ -10,8 +10,9 @@
+ 
+ usbmodules_SOURCES = usbmodules.c
+ 
+-data_DATA = usb.ids
++hwdata_DATA = usb.ids
++hwdatadir = $(prefix)/share/misc
+ 
+ man_MANS = lsusb.8 usbmodules.8
+ 
+-EXTRA_DIST = $(man_MANS) $(data_DATA) usbutils.spec getopt.h
++EXTRA_DIST = $(man_MANS) $(hwdata_DATA) usbutils.spec getopt.h
+--- usbutils-0.10/libusb/configure.in~ Sun Jun 30 10:50:39 2002
++++ usbutils-0.10/libusb/configure.in  Sun Jun 30 10:50:39 2002
+@@ -4,34 +4,16 @@
+ AM_INIT_AUTOMAKE(libusb, 0.1)
+ AM_CONFIG_HEADER(config.h)
+ 
+-dnl AC_CHECK_TOOL()
+-
+ AM_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+-dnl AC_PROG_RANLIB
+ AC_C_CONST
+ AC_C_INLINE
+ AC_HEADER_STDC
+ 
+-AC_CHECK_PROG(RANLIB, ranlib, ranlib, :)
+-AC_CHECK_PROG(DLLTOOL, dlltool, dlltool, dlltool)
+-AC_CHECK_PROG(AS, as, as, as, as)
+-AC_CHECK_PROG(AR, ar, ar, ar, ar)
+-
+-AC_CHECK_HEADERS(getopt.h sys/ioctl.h syslog.h errno.h linux/usb.h)
+-
+ dnl set USBIDS_FILE in config.h.
+-if test "x${datadir}" = 'x${prefix}/share'; then
+-  if test "x${prefix}" = "xNONE"; then
+-    AC_DEFINE_UNQUOTED(USBIDS_FILE, "${ac_default_prefix}/share/usb.ids")
+-  else
+-    AC_DEFINE_UNQUOTED(USBIDS_FILE, "${prefix}/share/usb.ids")
+-  fi
+-else
+-  AC_DEFINE_UNQUOTED(USBIDS_FILE, "${datadir}/usb.ids")
+-fi
++AC_DEFINE_UNQUOTED(USBIDS_FILE, "${prefix}/share/misc/usb.ids")
+ 
+ AC_OUTPUT([Makefile])

diff --git a/usbutils-no_external_getopt.patch b/usbutils-no_external_getopt.patch
new file mode 100644 (file)
index 0000000..ddfa521
--- /dev/null
+++ b/usbutils-no_external_getopt.patch
@@ -0,0 +1,35 @@
+--- usbutils-0.9/Makefile.am~  Tue May 28 01:09:58 2002
++++ usbutils-0.9/Makefile.am   Tue May 28 01:09:58 2002
+@@ -7,13 +7,11 @@
+ noinst_HEADERS = names.h usb.h usbdevice_fs.h devtree.h list.h usbmodules.h
+ 
+ lsusb_SOURCES = lsusb.c names.c devtree.c
+-lsusb_LDADD = @LIBOBJS@
+ 
+ usbmodules_SOURCES = usbmodules.c
+-usbmodules_LDADD = @LIBOBJS@
+ 
+ data_DATA = usb.ids
+ 
+ man_MANS = lsusb.8 usbmodules.8
+ 
+-EXTRA_DIST = $(man_MANS) $(data_DATA) usbutils.spec getopt.h getopt.c getopt1.c
++EXTRA_DIST = $(man_MANS) $(data_DATA) usbutils.spec getopt.h
+--- usbutils-0.9/configure.in~ Tue May 28 01:11:05 2002
++++ usbutils-0.9/configure.in  Tue May 28 01:11:05 2002
+@@ -21,7 +21,6 @@
+ AC_CHECK_PROG(AR, ar, ar, ar, ar)
+ 
+ AC_CHECK_HEADERS(getopt.h sys/ioctl.h syslog.h errno.h linux/usb.h linux/usbdevice_fs.h)
+-AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
+ 
+ dnl set USBIDS_FILE in config.h.
+ if test "x${datadir}" = 'x${prefix}/share'; then
+--- usbutils-0.10/configure.in~        Sun Jun 30 09:09:08 2002
++++ usbutils-0.10/configure.in Sun Jun 30 09:09:08 2002
+@@ -27,5 +27,4 @@
+ 
+ AC_CONFIG_SUBDIRS([libusb])
+ 
+-AC_SUBST(LIBOBJS)
+ AC_OUTPUT([Makefile])