rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f16'

Browse Source
This commit is contained in:
Tim Waugh 2011-10-05 18:49:09 +01:00
commit 28b8a9f72a
6 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -235,3 +235,4 @@ pycups-1.9.51.tar.bz2
/system-config-printer-1.3.4.tar.xz
/system-config-printer-1.3.5.tar.xz
/system-config-printer-1.3.6.tar.xz
/system-config-printer-1.3.7.tar.xz

2
sources
View File

@ -1 +1 @@
dc7a22fc1151f903b516e5cf40982d9d system-config-printer-1.3.6.tar.xz
f579ba287403d8ae3028377c6641feed system-config-printer-1.3.7.tar.xz

BIN
system-config-printer-1.3.6.tar.xz.sig
View File

Binary file not shown.

BIN
system-config-printer-1.3.7.tar.xz.sig Normal file
View File

Binary file not shown.

30
system-config-printer-hp-scannable.patch
View File

@ -1,30 +0,0 @@
diff -up system-config-printer-1.3.0/newprinter.py.hp-scannable system-config-printer-1.3.0/newprinter.py
--- system-config-printer-1.3.0/newprinter.py.hp-scannable 2011-02-16 13:02:45.000000000 +0000
+++ system-config-printer-1.3.0/newprinter.py 2011-02-17 09:58:51.867125793 +0000
@@ -971,7 +971,8 @@ class NewPrinterGUI(GtkGUI):
ready (self.NewPrinterWindow)
return
- if (self.device.hp_scannable and
+ if (hasattr (self.device, 'hp_scannable') and
+ self.device.hp_scannable and
not os.access ("/etc/sane.d/dll.d/hpaio", os.R_OK)):
try:
pk = installpackage.PackageKit ()
@@ -2467,15 +2468,6 @@ class NewPrinterGUI(GtkGUI):
physicaldevice.add_device (faxdev)
physicaldevice.set_data ('hp-scannable', True)
- if hp_scannable and not os.access ("/etc/sane.d/dll.d/hpaio",
- os.R_OK):
- try:
- pk = installpackage.PackageKit ()
- xid = self.NewPrinterWindow.window.xid
- pk.InstallPackageName (xid, 0, "libsane-hpaio")
- except:
- pass
-
physicaldevice.set_data ('checked-hplip', True)
device.hp_scannable = physicaldevice.get_data ('hp-scannable')
diff -up system-config-printer-1.3.0/system-config-printer.py.hp-scannable system-config-printer-1.3.0/system-config-printer.py

21
system-config-printer.spec
View File

@ -1,6 +1,6 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.3.6
Version: 1.3.7
Release: 1%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
@ -197,6 +197,25 @@ if [ $1 -ge 1 ] ; then
fi
%changelog
* Wed Oct 5 2011 Tim Waugh <twaugh@redhat.com> 1.3.7-1
- 1.3.7:
- Show private job attributes for "my jobs" (bug #742279).
- Enable Test Page button when application/postscript is supported.
- Some preferreddrivers.xml fixes (Ubuntu #855412).
- Handle errors saving troubleshoot.txt (Ubuntu #789602).
- Removed some stale code.
- Make connections list more easily accessible (Ubuntu #842092).
- Improved handling of remote CUPS queues via DNS-SD, and IPP devices.
- Better display of CUPS servers from "Find Network Printer".
- Fixed SMB method for printer finder.
- Don't handle tooltips during mainloop recursion (bug #664044,
bug #739734).
- Fixed bold print of tab labels on option conflicts.
- Preserve installable options on driver change.
- Update printer properties dialog correctly when PPD changed.
- Fixed typo triggered by private job attributes (Ubuntu #827573).
- Marked some translatable strings that weren't (bug #734313).
* Mon Aug 22 2011 Tim Waugh <twaugh@redhat.com> 1.3.6-1
- 1.3.6:
- Updated translations.