[hplip: 4/4] Merge branch 'f16'
Tim Waugh
twaugh at fedoraproject.org
Tue Oct 25 16:32:20 UTC 2011
commit 92d23919a820041ec5fd89d47beb8f47a88bb860
Merge: 275aca3 8dcda33
Author: Tim Waugh <twaugh at redhat.com>
Date: Tue Oct 25 16:12:55 2011 +0100
Merge branch 'f16'
hplip-systray-dbus-exception.patch | 18 ++++++++++++++++++
hplip.spec | 9 ++++++++-
2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --cc hplip.spec
index 3683fb3,ece2a94..d8c6015
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -1,7 +1,7 @@@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.11.10
--Release: 6%{?dist}
++Release: 7%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@@ -527,9 -531,9 +531,12 @@@ f
%postun libs -p /sbin/ldconfig
%changelog
-* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-6
++* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-7
+ - Catch DBusException in hp-systray (bug #746024).
+
+* Mon Oct 24 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
+- Move udev rules to /lib/udev/rules.d (bug #748208).
+
* Thu Oct 20 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
- Pay attention to the SANE localOnly flag in hpaio (bug #743593).
More information about the scm-commits
mailing list