Description: add type to IMPORT keyword in ifrename's udev rules file
Author: Guus Sliepen <guus@debian.org>
Bug-Debian: http://bugs.debian.org/650606

--- wireless-tools-30~pre9.orig/19-udev-ifrename.rules
+++ wireless-tools-30~pre9/19-udev-ifrename.rules
@@ -5,9 +5,9 @@
 # when udev runs (i.e. on boot partition).
 
 # Enable this rule to test with udevtest.
-#ENV{UDEV_LOG}=="6", SUBSYSTEM=="net", ACTION=="add", IMPORT="/sbin/ifrename -D -V -u -i %k", NAME:="$env{INTERFACE}"
+#ENV{UDEV_LOG}=="6", SUBSYSTEM=="net", ACTION=="add", IMPORT{program}="/sbin/ifrename -D -V -u -i %k", NAME:="$env{INTERFACE}"
 
 # Main ifrename rule.
 # If interface is found in /etc/iftab, subsequent rename rules are bypassed.
 # If interface is not found in /etc/iftab, subsequent rename rules applies.
-SUBSYSTEM=="net", ACTION=="add", IMPORT="/sbin/ifrename -u -i %k", NAME:="$env{INTERFACE}"
+SUBSYSTEM=="net", ACTION=="add", IMPORT{program}="/sbin/ifrename -u -i %k", NAME:="$env{INTERFACE}"
--- wireless-tools-30~pre8.orig/Makefile
+++ wireless-tools-30~pre8/Makefile
@@ -19,7 +19,7 @@
 ## a local version (non-root).
 ## Standard distros should comment that option to save space and to
 ## build libiw.so used by third parties...
-BUILD_STATIC = y
+# BUILD_STATIC = y
 
 ## Uncomment this to build without using libm (less efficient).
 ## This is mostly useful for embedded platforms without maths.
@@ -75,8 +75,8 @@
 # Install directories
 INSTALL_DIR= $(PREFIX)/sbin
 INSTALL_LIB= $(PREFIX)/lib
-INSTALL_INC= $(PREFIX)/include
-INSTALL_MAN= $(PREFIX)/man
+INSTALL_INC= $(PREFIX)/usr/include
+INSTALL_MAN= $(PREFIX)/usr/share/man
 
 # Various commands
 RM = rm -f
--- wireless-tools-29.orig/iftab.5
+++ wireless-tools-29/iftab.5
@@ -50,11 +50,7 @@
 (logical or), specify two different mappings with the same interface
 name (one on each line).
 .B Ifrename
-always use the first matching mapping starting from the
-.I end
-of
-.BR iftab ,
-therefore more restrictive mapping should be specified last.
+always uses the last matching mapping in iftab.
 .\"
 .\" INTERFACE NAME part
 .\"
--- wireless-tools-30~pre8.orig/iwlib.c
+++ wireless-tools-30~pre8/iwlib.c
@@ -676,6 +676,7 @@
 {
   struct iwreq		wrq;
 
+  memset((char *) &wrq, 0, sizeof(struct iwreq));
   memset((char *) info, 0, sizeof(struct wireless_config));
 
   /* Get wireless name */