rpms/sane-backends/F-10 sane-backends-1.0.20-hal.patch, 1.1, 1.2 sane-backends.spec, 1.116, 1.117
Nils Philippsen
nphilipp at fedoraproject.org
Mon Jun 22 16:34:25 UTC 2009
Author: nphilipp
Update of /cvs/pkgs/rpms/sane-backends/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28928
Modified Files:
sane-backends-1.0.20-hal.patch sane-backends.spec
Log Message:
separate HAL information and policy files (#457645)
sane-backends-1.0.20-hal.patch:
Index: sane-backends-1.0.20-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-10/sane-backends-1.0.20-hal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sane-backends-1.0.20-hal.patch 17 Jun 2009 08:53:11 -0000 1.1
+++ sane-backends-1.0.20-hal.patch 22 Jun 2009 16:34:24 -0000 1.2
@@ -1,11 +1,17 @@
-commit d83247c03d05bd386bd62ba4aee5f0f6725a9937
+commit b4b171c4918d39c38d03bafe98bc52684e7927e1
Author: Nils Philippsen <nils at 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 at redhat.com>
+ Date: Mon Jun 22 18:23:27 2009 +0200
+
+ separate HAL information and policy
+
commit a50c619ddbb869612e99a9457b1f39492f34b141
Author: Nils Philippsen <nils at 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");
Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-10/sane-backends.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- sane-backends.spec 17 Jun 2009 11:17:04 -0000 1.116
+++ sane-backends.spec 22 Jun 2009 16:34:24 -0000 1.117
@@ -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 %{
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
@@ -121,7 +122,8 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root)
%dir /etc/sane.d
-%config(noreplace) /etc/sane.d/*
+%dir /etc/sane.d/dll.d
+%config(noreplace) /etc/sane.d/*.conf
%{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
%{_libexecdir}/hal-usb-scanner-add
%{_mandir}/*/*
@@ -154,6 +156,12 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc
%changelog
+* Mon Jun 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-4
+- separate HAL information and policy files (#457645)
+
+* Thu Jun 18 2009 Nils Philippsen <nils at redhat.com>
+- mark /etc/sane.d/dll.d as %%dir, not %%config
+
* Wed Jun 17 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-3
- disable rpath
- make sane-config multilib-aware
More information about the fedora-extras-commits
mailing list