← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sane-backends/saucy

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_udev_noperm.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-02-14 14:28:56 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110214142856-6gxjetg88q9zctid
Tags: 1.0.22-0ubuntu1
* New upstream release
* debian/control:
  - Use standards version 3.9.1
* debian/patches/allow_dll.d_symlinks.patch:
* debian/patches/fix_epson2_cancel.patch:
* debian/patches/fix_epson2_commands.patch:
* debian/patches/fix_xerox_mfp_color_mode.patch:
* debian/patches/genesys_disable_raw_data_log.patch:
* debian/patches/no_translations.patch:
* debian/patches/saned_exit_avahi_process.patch:
* debian/patches/scsi_perfection_2450.patch:
* debian/patches/scsi_scanjet_4c.patch:
* debian/patches/xerox_mfp_new_ids.patch:
  - Applied upstream
* debian/watch:
  - Dropped, the URL is not consistent between releases

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_udev_noperm.patch
3
3
 Do not cover SCSI scanners (already covered by udev-extra's 70-acl.rules).
4
4
Author: Martin Pitt <martin.pitt@ubuntu.com>
5
5
 
6
 
Index: sane-backends-1.0.21/tools/sane-desc.c
 
6
Index: sane-backends-1.0.22/tools/sane-desc.c
7
7
===================================================================
8
 
--- sane-backends-1.0.21.orig/tools/sane-desc.c 2010-06-17 17:55:12.000000000 +1000
9
 
+++ sane-backends-1.0.21/tools/sane-desc.c      2010-06-17 17:58:14.443990870 +1000
 
8
--- sane-backends-1.0.22.orig/tools/sane-desc.c 2011-02-14 15:06:22.000000000 +1100
 
9
+++ sane-backends-1.0.22/tools/sane-desc.c      2011-02-14 15:08:02.101347265 +1100
10
10
@@ -3441,16 +3441,10 @@
11
11
 
12
12
   printf 
71
71
-  printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
72
72
-  printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
73
73
-  printf ("# Generic: SCSI device type 6 indicates a scanner\n");
74
 
-  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
 
74
-  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", DEVMODE, DEVGROUP);
75
75
-  printf ("# Some scanners advertise themselves as SCSI device type 3\n");
76
76
-
77
77
-  while (scsiid)
104
104
-           }
105
105
-        }
106
106
-      printf ("\n");
107
 
-      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
 
107
-      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
108
108
-             scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
109
109
-      scsiid = scsiid->next;
110
110
-    }