[hplip/f21: 4/4] Merge branch 'f20' into f21

[Tim Waugh]

commit d20386e89af2ec3b92445b597af7e87b748bfe3c
Merge: a4ca4ad 298dff8
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Aug 26 13:04:27 2014 +0100

    Merge branch 'f20' into f21

 hplip-lineart.patch    |   14 ++++++++++++++
 hplip-udev-rules.patch |   13 -------------
 hplip.spec             |    7 ++++++-
 3 files changed, 20 insertions(+), 14 deletions(-)
---
diff --cc hplip.spec
index e201cbc,86946ed..18ca29a
--- a/hplip.spec
+++ b/hplip.spec
@@@ -488,8 -488,13 +488,13 @@@ rm -f %{buildroot}%{_sysconfdir}/xdg/au
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Tue Aug 26 2014 Tim Waugh <twaugh at redhat.com> - 3.14.6-7
+ - Reverted previous change as it didn't help (bug #1076954).
+ - Updated udev-rules patch so that firmware is reloaded on demand, now
+   the command to do it just does that (bug #1033952).
+ 
 -* Wed Jul 23 2014 Tim Waugh <twaugh at redhat.com> - 3.14.6-6
 -- Potential fix for lineart scanning (bug #1076954).
 +* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.14.6-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
  
  * Mon Jul 21 2014 Tim Waugh <twaugh at redhat.com> - 3.14.6-5
  - Main package requires gnupg (bug #1118724).