[Pkg-kde-commits] rev 2198 - trunk/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2005-11-11 16:02:59 +0000 (Fri, 11 Nov 2005)
New Revision: 2198

Modified:
   trunk/packages/kdebase/debian/kcontrol.README.Debian
   trunk/packages/kdebase/debian/usermap.pl
Log:
Proper udev support, but needs 2.6.14.


Modified: trunk/packages/kdebase/debian/kcontrol.README.Debian
===================================================================
--- trunk/packages/kdebase/debian/kcontrol.README.Debian	2005-11-11 16:01:42 UTC (rev 2197)
+++ trunk/packages/kdebase/debian/kcontrol.README.Debian	2005-11-11 16:02:59 UTC (rev 2198)
@@ -5,7 +5,10 @@
 advanced configuration of many models of Logitech mice, though regular users
 must be members of the plugdev group for this to work.
 
-The system's kernel must also support hotplugging, as well as usbdevfs.
+Additionally, the system's kernel must be 2.6.14 or later if you are using
+udev, though earlier kernels are also supported if the hotplug package is being
+used instead. Kernel hotplugging support is essential, as is usbfs/usbdevfs if
+hotplug is being used.
 
 After installing KControl for the first time, or updating to KControl 3.4.x
 or later from an earlier package, you will need to unplug and then replug

Modified: trunk/packages/kdebase/debian/usermap.pl
===================================================================
--- trunk/packages/kdebase/debian/usermap.pl	2005-11-11 16:01:42 UTC (rev 2197)
+++ trunk/packages/kdebase/debian/usermap.pl	2005-11-11 16:02:59 UTC (rev 2198)
@@ -17,8 +17,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-my $script = '/etc/hotplug/usb/logitechmouse';
-
 my %flags = (
     idVendor => 0x0001,
     idProduct => 0x0002,
@@ -40,12 +38,16 @@
     }
     push @rule,
     (
-     qq(RUN+="$script"),
+     qq(MODE="660",),
      );
+    push @rule,
+    (
+     qq(GROUP="plugdev"),
+     );
     print join(' ', @rule) . "\n";
 }
 
-print "BUS!=\"usb\", ACTION!=\"add\"\, GOTO=\"kcontrol_rules_end\"\n\n";
+print "BUS!=\"usb\", ACTION!=\"add\"\, SUBSYSTEM!==\"usb_device\"\, GOTO=\"kcontrol_rules_end\"\n\n";
 
 foreach my $usermap (@ARGV) {
     open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap";