rev 7340 - trunk/packages/kdebase/debian
Sune Vuorela
pusling-guest at alioth.debian.org
Thu Oct 4 09:13:28 UTC 2007
Author: pusling-guest
Date: 2007-10-04 09:13:27 +0000 (Thu, 04 Oct 2007)
New Revision: 7340
Modified:
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/control
trunk/packages/kdebase/debian/control.in
trunk/packages/kdebase/debian/kdebase.README.Debian
trunk/packages/kdebase/debian/rules
Log:
remove hotplug
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2007-10-04 09:09:13 UTC (rev 7339)
+++ trunk/packages/kdebase/debian/changelog 2007-10-04 09:13:27 UTC (rev 7340)
@@ -15,6 +15,9 @@
smb printers work. Also adapt the description. (Closes: #445182)
* Lower gdb recommends to a suggests now that recommends get installed by
default. (Closes: 442432)
+ * Stop recommending hotplug and don't install hotplug configuration files.
+ Hotplug has been removed from debian and adapt descriptions and
+ documentation. (Closes: 436503)
-- Ana Beatriz Guerrero Lopez <ana at debian.org> Mon, 01 Oct 2007 17:34:05 +0200
Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control 2007-10-04 09:09:13 UTC (rev 7339)
+++ trunk/packages/kdebase/debian/control 2007-10-04 09:13:27 UTC (rev 7340)
@@ -71,7 +71,7 @@
Section: kde
Architecture: any
Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), usbutils
-Recommends: udev | hotplug
+Recommends: udev
Suggests: khelpcenter, ntpdate | ntp-simple
Conflicts: kdebase-libs (<< 4:3.0.0)
Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
@@ -83,7 +83,7 @@
but the control center organizes all of these programs into a convenient
location.
.
- In combination with udev or hotplug, KControl supports the advanced
+ In combination with udev KControl supports the advanced
configuration of Logitech mice, though the user must be a member of the
plugdev group.
.
Modified: trunk/packages/kdebase/debian/control.in
===================================================================
--- trunk/packages/kdebase/debian/control.in 2007-10-04 09:09:13 UTC (rev 7339)
+++ trunk/packages/kdebase/debian/control.in 2007-10-04 09:13:27 UTC (rev 7340)
@@ -71,7 +71,7 @@
Section: kde
Architecture: any
Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), usbutils
-Recommends: udev | hotplug
+Recommends: udev
Suggests: khelpcenter, ntpdate | ntp-simple
Conflicts: kdebase-libs (<< 4:3.0.0)
Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
@@ -83,7 +83,7 @@
but the control center organizes all of these programs into a convenient
location.
.
- In combination with udev or hotplug, KControl supports the advanced
+ In combination with udev KControl supports the advanced
configuration of Logitech mice, though the user must be a member of the
plugdev group.
.
Modified: trunk/packages/kdebase/debian/kdebase.README.Debian
===================================================================
--- trunk/packages/kdebase/debian/kdebase.README.Debian 2007-10-04 09:09:13 UTC (rev 7339)
+++ trunk/packages/kdebase/debian/kdebase.README.Debian 2007-10-04 09:13:27 UTC (rev 7340)
@@ -25,20 +25,15 @@
KControl and Logitech mice
==========================
-In combination with the udev or hotplug packages, KControl supports the
+In combination with the udev packages, KControl supports the
advanced configuration of many models of Logitech mice, though regular users
must be members of the plugdev group for this to work.
-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
-your mouse, in order to force udev or hotplug to grant special permissions
+your mouse, in order to force udev to grant special permissions
to your mouse, so that KControl can perform advanced configuration.
-Rebooting or restarting udev/hotplug will of course accomplish the same
+Rebooting or restarting udev will of course accomplish the same
thing.
Modified: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules 2007-10-04 09:09:13 UTC (rev 7339)
+++ trunk/packages/kdebase/debian/rules 2007-10-04 09:13:27 UTC (rev 7340)
@@ -68,9 +68,6 @@
install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np
binary-install/kcontrol::
- install -p -D -m755 kcontrol/input/consoleUserPerms debian/kcontrol/etc/hotplug/usb/logitechmouse
- cat kcontrol/input/logitechmouse.usermap | sed -e 's/consoleUserPerms/logitechmouse/' \
- > debian/kcontrol/etc/hotplug/usb/logitechmouse.usermap
mkdir -p debian/kcontrol/etc/udev/rules.d
chmod +x debian/usermap.pl
debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules
More information about the pkg-kde-commits
mailing list