[arch-commits] Commit in udev/repos (3 files)

[Tobias Powalowski]

    Date: Saturday, December 5, 2009 @ 14:05:11
  Author: tpowa
Revision: 60614

Merged revisions 60612 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/udev/trunk

........
  r60612 | tpowa | 2009-12-05 19:02:02 +0000 (Sa, 05 Dez 2009) | 2 lines
  
  upgpkg: udev 149-1
      bump to latest version
........

Modified:
  udev/repos/testing-i686/	(properties)
  udev/repos/testing-i686/PKGBUILD
  udev/repos/testing-i686/arch-udev-rules.patch

-----------------------+
 PKGBUILD              |    8 ++++----
 arch-udev-rules.patch |   12 ++----------
 2 files changed, 6 insertions(+), 14 deletions(-)


Property changes on: udev/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /udev/trunk:1-59753
   + /udev/trunk:1-60613

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-12-05 19:02:43 UTC (rev 60613)
+++ testing-i686/PKGBUILD	2009-12-05 19:05:11 UTC (rev 60614)
@@ -5,7 +5,7 @@
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=147
+pkgver=149
 pkgrel=1
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -16,14 +16,15 @@
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
         81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
         arch-udev-rules.patch ignore-remove.sh)
-md5sums=('aed0129c5a00e01d1be75ffda7d2e0f1'
+md5sums=('b218bd15939e8afc6368e1907a48bb26'
          'cc6406e8b67b2b8711942098a66cde6b'
          'f4951f61438d69894b728212dac7318b'
          '64a0169dc9d883a63ff9f8f491fdc34a'
          '2e808ee78d237c478b57af2a68d43769'
          '2d6dc6842464f107bccc68cd505a6c31'
-         'bbfa83a7a5fa889b663343b920603f3c'
+         '22c1f059cdeddaac5e7fe33b007da6a3'
          '35fa97500243a79b2370fa4684828e69')
+
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix="" --mandir=/usr/share/man\
@@ -133,4 +134,3 @@
   install -d -m755 ${pkgdir}/lib/${pkgname}/rules.d
   install -D -m644 ${srcdir}/${pkgname}-${pkgver}/rules/gentoo/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
 }
-

Modified: testing-i686/arch-udev-rules.patch
===================================================================
--- testing-i686/arch-udev-rules.patch	2009-12-05 19:02:43 UTC (rev 60613)
+++ testing-i686/arch-udev-rules.patch	2009-12-05 19:05:11 UTC (rev 60614)
@@ -1,23 +1,15 @@
 diff -Nur rules.d/50-udev-default.rules rules.d.arch/50-udev-default.rules
 --- rules.d/50-udev-default.rules	2009-03-07 22:22:48.200242883 +0100
 +++ rules.d.arch/50-udev-default.rules	2009-03-07 22:23:26.134434516 +0100
-@@ -64,20 +64,20 @@
+@@ -59,15 +59,15 @@
+ KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
  
- # floppy
- KERNEL=="fd[0-9]", GROUP="floppy"
--KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
--KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
-+KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k"
-+KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions", GROUP="floppy"
- 
  # cdrom
 -SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
--SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
 -SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
 -KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
 -KERNEL=="pktcdvd", GROUP="cdrom"
 +SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="optical", MODE="0660"
-+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="optical", MODE="0660"
 +SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical", MODE="0660"
 +KERNEL=="pktcdvd[0-9]*", GROUP="optical", MODE="0660"
 +KERNEL=="pktcdvd", GROUP="optical", MODE="0660"