Changeset 6490

Timestamp:

04/05/10 03:31:38 (3 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 151-3
  • Re-applied no-warning patch

Location:

pkg/frankie/main/udev/trunk

Files:

• debian/changelog (modified) (1 diff)
• debian/control (modified) (2 diffs)
• debian/patches/by_path_links_for_pci_input (added)
• debian/patches/input_id_linking (added)
• debian/patches/logitech_bluetooth_hci (added)
• debian/patches/series (modified) (2 diffs)
• debian/rules (modified) (4 diffs)
• rules/debian/50-udev-default.rules (modified) (1 diff)

pkg/frankie/main/udev/trunk/debian/changelog

@@ -1 @@
-udev (151-2.1) unstable; urgency=low
-
-  * Sync'd with Debian 151-2
-  * Merge no-warning.patch
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 07 Mar 2010 12:40:59 -0800
+udev (153-3.1) unstable; urgency=low
+
+  * Sync'd with Debian 151-3
+  * Re-applied no-warning patch 
+
+ -- Alan Baghumian <alan@technotux.org>  Sun, 04 Apr 2010 18:30:55 -0700
+
+udev (151-3) unstable; urgency=low
+
+  * Fix switching Logitech bluetooth adapters into hci mode. (Closes: #567237)
+  * Have libudev0 depend on the same version of udev because the private
+    udev data is guaranteed to be unstable. (Closes: #573255)
+  * persistent-input.rules: added again by-path links for PCI input devices.
+    (Closes: #573352)
+  * Added the udev-gtk-udeb udeb package which contains libudev and input_id
+    for the graphical installer.
+    Based on a patch provided by Cyril Brulebois. (Closes: #573111)
+
+ -- Marco d'Itri <md@linux.it>  Mon, 15 Mar 2010 02:18:20 +0100
 
 udev (151-2) unstable; urgency=high

pkg/frankie/main/udev/trunk/debian/control

@@ -22 +22 @@
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev (= ${binary:Version})
 Description: libudev shared library
  This library provides access to udev device information.
@@ -43 +43 @@
  udev is a daemon which dynamically creates and removes device nodes from
  /dev/, handles hotplug events and loads drivers at boot time.
+ .
+ This is a minimal version, only for use in the installation system.
+
+Package: udev-gtk-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev-udeb
+Description: libudev shared library
+ This library provides access to udev device information.
+ The package additionally contains input_id and the related rules.
  .
  This is a minimal version, only for use in the installation system.

pkg/frankie/main/udev/trunk/debian/patches/series

@@ +1 @@
+input_id_linking
+
 # fixes to be pushed upstream
+logitech_bluetooth_hci
+by_path_links_for_pci_input
 fix_gtkdoc_oot
 
@@ -9 +13 @@
 old_cloexec
 
-# parsix
+# Parsix
 no-warning.patch

pkg/frankie/main/udev/trunk/debian/rules

@@ -12 +12 @@
 D  := $(CURDIR)/debian/udev
 DU := $(CURDIR)/debian/udev-udeb
+DGU:= $(CURDIR)/debian/udev-gtk-udeb
 
 CONFFLAGS := --prefix=/usr --sysconfdir=/etc --sbindir=/sbin \
@@ -35 +36 @@
 BUILD_UDEB_TARGET := .stamp-build-udeb
 else
-NO_PACKAGE := --no-package=udev-udeb
+NO_PACKAGE := --no-package=udev-udeb --no-package=udev-gtk-udeb
 endif
 
@@ -144 +145 @@
         install --mode=755 extra/udev.base-installer \
                 $(DU)/usr/lib/base-installer.d/05udev
+
+        cp -a build-udeb/libudev/.libs/libudev.so.0* $(DGU)/lib/
+        install --mode=755 build-udeb/extras/input_id/input_id $(DGU)/lib/udev/
+        cp rules/rules.d/60-persistent-input.rules $(DGU)/lib/udev/rules.d/
 endif
 
@@ -173 +178 @@
         dh_compress
         dh_fixperms
-        dh_makeshlibs -- -c4
+        dh_makeshlibs --add-udeb=udev-gtk-udeb -- -c4
         dh_shlibdeps --exclude=/lib/udev/udev-acl -- --warnings=7
         dh_girepository

pkg/frankie/main/udev/trunk/rules/debian/50-udev-default.rules

@@ -49 +49 @@
 
 # virtio serial / console ports
-KERNEL=="vport*",               SYMLINK+="virtio-ports/$ATTR{name}"
+KERNEL=="vport*",               SYMLINK+="virtio-ports/$attr{name}"
 
 # misc devices