From bce1600be33f4a73c01664cbb00896a791825bae Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 22 Jun 2009 16:33:25 +0000
Subject: [PATCH] separate HAL information and policy files (#457645)

---
 sane-backends-1.0.20-hal.patch | 41 +++++++++++++++++++++-------------
 sane-backends.spec             |  8 +++++--
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/sane-backends-1.0.20-hal.patch b/sane-backends-1.0.20-hal.patch
index 0ce11f3..31fa259 100644
--- a/sane-backends-1.0.20-hal.patch
+++ b/sane-backends-1.0.20-hal.patch
@@ -1,11 +1,17 @@
-commit d83247c03d05bd386bd62ba4aee5f0f6725a9937
+commit b4b171c4918d39c38d03bafe98bc52684e7927e1
 Author: Nils Philippsen <nils@redhat.com>
-Date:   Tue Jun 16 17:03:12 2009 +0200
+Date:   Mon Jun 22 18:25:01 2009 +0200
 
     patch: hal
     
     Squashed commit of the following:
     
+    commit 5a4809b0c721ac14b8e56064ee3df573e75e0b67
+    Author: Nils Philippsen <nils@redhat.com>
+    Date:   Mon Jun 22 18:23:27 2009 +0200
+    
+        separate HAL information and policy
+    
     commit a50c619ddbb869612e99a9457b1f39492f34b141
     Author: Nils Philippsen <nils@redhat.com>
     Date:   Tue Jun 16 15:21:59 2009 +0200
@@ -25,8 +31,25 @@ index bd6dd9d..bb26fcb 100644
  	   -d 0 > $@
  
  sane-backends.pc:	$(top_builddir)/config.status
+diff --git a/tools/hal/libsane-policy.fdi b/tools/hal/libsane-policy.fdi
+new file mode 100644
+index 0000000..2ac8211
+--- /dev/null
++++ b/tools/hal/libsane-policy.fdi
+@@ -0,0 +1,11 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<deviceinfo version="0.2">
++  <device>
++    <match key="info.subsystem" string="usb">
++      <!-- The following rule will disable autosuspend for USB scanner devices -->
++      <match key="info.capabilities" contains="scanner">
++        <append key="info.callouts.add" type="strlist">hal-usb-scanner-add</append>
++      </match>
++    </match>
++  </device>
++</deviceinfo>
 diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index 600ab03..db46806 100644
+index 600ab03..c317700 100644
 --- a/tools/sane-desc.c
 +++ b/tools/sane-desc.c
 @@ -3667,7 +3667,6 @@ print_hal (int new)
@@ -37,15 +60,3 @@ index 600ab03..db46806 100644
        printf ("        </match>\n");
  
        usbid = usbid->next;
-@@ -3676,6 +3675,11 @@ print_hal (int new)
-   if (in_match)
-     printf ("      </match>\n");
- 
-+  printf ("\n      <!-- The following rule will disable USB autosuspend for USB scanner devices -->\n");
-+  printf ("      <match key=\"info.capabilities\" contains=\"scanner\">\n");
-+  printf ("        <append key=\"info.callouts.add\" type=\"strlist\">hal-usb-scanner-add</append>\n");
-+  printf ("      </match>\n");
-+
-   printf ("    </match>\n");
- 
-   printf ("  </device>\n");
diff --git a/sane-backends.spec b/sane-backends.spec
index ea6f743..00d8906 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 3%{?dist}
+Release: 4%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -105,7 +105,8 @@ rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
 
 mkdir -p %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty
-install -m 0644 tools/hal/libsane.fdi %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty/19-libsane.fdi
+install -m 0644 tools/hal/libsane.fdi %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty/19-libsane.fdi
+install -m 0644 tools/hal/libsane-policy.fdi %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty/19-libsane.fdi
 mkdir -p %{buildroot}/%{_libexecdir}
 install -m 0755 %{SOURCE2} %{buildroot}/%{_libexecdir}/hal-usb-scanner-add
 
@@ -155,6 +156,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Mon Jun 22 2009 Nils Philippsen <nils@redhat.com> - 1.0.20-4
+- separate HAL information and policy files (#457645)
+
 * Thu Jun 18 2009 Nils Philippsen <nils@redhat.com>
 - mark /etc/sane.d/dll.d as %%dir, not %%config