[arch-commits] Commit in sane/repos (6 files)

[Tobias Powalowski]

    Date: Saturday, May 9, 2009 @ 09:24:54
  Author: tpowa
Revision: 38591

Merged revisions 38589 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/sane/trunk

........
  r38589 | tpowa | 2009-05-09 15:23:53 +0200 (Sa, 09 Mai 2009) | 2 lines
  
  'removed unneeded files'
........

Modified:
  sane/repos/extra-x86_64/	(properties)
  sane/repos/extra-x86_64/PKGBUILD
Deleted:
  sane/repos/extra-x86_64/convert-usermap-sane.sh
  sane/repos/extra-x86_64/libusbscanner.udev.sh
  sane/repos/extra-x86_64/patch-sane.sh.patch
  sane/repos/extra-x86_64/post-1.0.18.patch.bz2

-------------------------+
 PKGBUILD                |    2 ++
 convert-usermap-sane.sh |   44 --------------------------------------------
 libusbscanner.udev.sh   |   35 -----------------------------------
 patch-sane.sh.patch     |   14 --------------
 4 files changed, 2 insertions(+), 93 deletions(-)


Property changes on: sane/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /sane/trunk:1-38586
   + /sane/trunk:1-38589

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-09 13:24:38 UTC (rev 38590)
+++ extra-x86_64/PKGBUILD	2009-05-09 13:24:54 UTC (rev 38591)
@@ -38,3 +38,5 @@
   # install xinetd file
   install -D -m644 $startdir/src/sane.xinetd $startdir/pkg/etc/xinetd.d/sane
 }
+md5sums=('a0cfdfdebca2feb4f2ba5d3418b15a42'
+         'da946cc36fb83612162cf9505986d4b2')

Deleted: extra-x86_64/convert-usermap-sane.sh
===================================================================
--- extra-x86_64/convert-usermap-sane.sh	2009-05-09 13:24:38 UTC (rev 38590)
+++ extra-x86_64/convert-usermap-sane.sh	2009-05-09 13:24:54 UTC (rev 38591)
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Converts libsane.usermap to an udev rules file
-#
-
-if [ ! -e sane.rules ]; then
-    cat > sane.rules <<EOF
-# This file is part of the SANE distribution
-#
-# udev rules file for supported scanners
-#
-#
-# For now, only USB scanners are listed/supported by this set of rules;
-# feel free to add support for other busses.
-#
-# To add an USB scanner, add a rule to the list below between the SUBSYSTEM...
-# and LABEL... lines.
-#
-# To run a script when your scanner is plugged in, add RUN="/path/to/script"
-# to the appropriate rule.
-#
-
-SUBSYSTEM!="usb_device", ACTION!="add", GOTO="libsane_rules_end"
-
-EOF
-fi
-
-cat "$1" | { while read map; do
-    if $(echo "$map" | grep -q ^# > /dev/null); then
-	echo $map >> sane.rules
-    else
-	set $map
-
-	vid=$(echo $3 | cut -b3-)
-	pid=$(echo $4 | cut -b3-)
-
-	echo -e "SYSFS{idVendor}==\"$vid\", SYSFS{idProduct}==\"$pid\", GROUP=\"scanner\"" >> sane.rules
-    fi
-done }
-
-echo >> sane.rules
-echo "LABEL=\"libsane_rules_end\"" >> sane.rules
-
-exit 0

Deleted: extra-x86_64/libusbscanner.udev.sh
===================================================================
--- extra-x86_64/libusbscanner.udev.sh	2009-05-09 13:24:38 UTC (rev 38590)
+++ extra-x86_64/libusbscanner.udev.sh	2009-05-09 13:24:54 UTC (rev 38591)
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# This file is part of sane-backends.
-#
-# This script changes the permissions and ownership of a USB device under
-# /proc/bus/usb to grant access to this device to users in the scanner group.
-#
-# Ownership is set to root:scanner, permissions are set to 0660.
-#
-# Arguments :
-# -----------
-# ACTION=[add|remove]
-# DEVICE=/proc/bus/usb/BBB/DDD
-# TYPE=usb
-
-# latest hotplug doesn't set DEVICE on 2.6.x kernels
-if [ -z "$DEVICE" ] ; then
-  IF=`echo $DEVPATH | sed 's/\(bus\/usb\/devices\/\)\(.*\)-\(.*\)/\2/'`
-  DEV=$(cat /sys/${DEVPATH}/devnum)
-  DEVICE=`printf '/proc/bus/usb/%.03d/%.03d' $IF $DEV`
-fi
-
-#if [ "$ACTION" = "add" -a "$SUBSYSTEM" = "usb" ]; then
-  chown root:scanner "$DEVICE"
-  chmod 0660 "$DEVICE"
-#fi
-
-
-# That's an insecure but simple alternative
-# Everyone has access to the scanner
-
-# if [ "$ACTION" = "add" -a "$TYPE" = "usb" ]; then
-#  chmod 0666 "$DEVICE"
-# fi
-

Deleted: extra-x86_64/patch-sane.sh.patch
===================================================================
--- extra-x86_64/patch-sane.sh.patch	2009-05-09 13:24:38 UTC (rev 38590)
+++ extra-x86_64/patch-sane.sh.patch	2009-05-09 13:24:54 UTC (rev 38591)
@@ -1,14 +0,0 @@
---- patch-sane.sh~	2004-11-21 14:28:11.000000000 +0100
-+++ patch-sane.sh	2007-04-15 17:23:40.000000000 +0200
-@@ -94,9 +94,9 @@
- 
- # Adds a line with 'hp_rts88xx' to dll.conf
- echo -n "Modifying backend/dll.conf..."
--if [ -z $(grep hp_rts88xx $sane/backend/dll.conf) ]
-+if [ -z $(grep hp_rts88xx $sane/backend/dll.conf.in) ]
-     then
--    echo "hp_rts88xx" >> $sane/backend/dll.conf
-+    echo "hp_rts88xx" >> $sane/backend/dll.conf.in
- fi
- evaluate_retval
- 

Deleted: extra-x86_64/post-1.0.18.patch.bz2
===================================================================
(Binary files differ)