rpms/system-config-printer/F-10 system-config-printer-git-1.0.x.patch, NONE, 1.1 system-config-printer.spec, 1.238, 1.239
Tim Waugh
twaugh at fedoraproject.org
Mon Mar 9 17:00:40 UTC 2009
- Previous message (by thread): rpms/jadetex/devel jadetex.spec,1.21,1.22
- Next message (by thread): rpms/perl-local-lib/devel import.log, NONE, 1.1 perl-local-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4483
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-git-1.0.x.patch
Log Message:
* Mon Mar 9 2009 Tim Waugh <twaugh at redhat.com> 1.0.15-2
- Added patch for 1.0.x changes since 1.0.15:
- Fixed locale save/restore in cupshelpers (bug #489313).
- Troubleshoot: include local printer attributes in diagnostic
output.
- Don't allow LPD probe with an empty hostname.
- Fixed the LPD probe.
- Updated translations.
system-config-printer-git-1.0.x.patch:
--- NEW FILE system-config-printer-git-1.0.x.patch ---
diff -U0 system-config-printer-1.0.15/ChangeLog.git-1.0.x system-config-printer-1.0.15/ChangeLog
--- system-config-printer-1.0.15/ChangeLog.git-1.0.x 2009-02-18 15:47:29.000000000 +0000
+++ system-config-printer-1.0.15/ChangeLog 2009-03-09 16:03:38.000000000 +0000
@@ -0,0 +1,25 @@
+2009-03-09 Tim Waugh <twaugh at redhat.com>
+
+ * cupshelpers/cupshelpers.py (Printer._expand_flags): Use
+ setlocale() to save current LC_CTYPE value, not getlocale() (bug
+ #489313).
+
+2009-03-03 Tim Waugh <twaugh at redhat.com>
+
+ * troubleshoot/CheckPrinterSanity.py (CheckPrinterSanity.display):
+ Include local printer attributes in diagnostic output.
+
+2009-03-02 Tim Waugh <twaugh at redhat.com>
+
+ * system-config-printer.py
+ (NewPrinterGUI.on_tvNPDeviceURIs_cursor_changed): Clear LPD
+ drop-down list.
+
+2009-02-25 Tim Waugh <twaugh at redhat.com>
+
+ * system-config-printer.py
+ (NewPrinterGUI.on_tvNPDeviceURIs_cursor_changed): Set initial
+ sensitivity of LPD probe button.
+ (NewPrinterGUI.on_cmbentNPTLpdHost_changed): Adjust button
+ sensitivity when hostname is changed.
+
diff -up system-config-printer-1.0.15/cupshelpers/cupshelpers.py.git-1.0.x system-config-printer-1.0.15/cupshelpers/cupshelpers.py
--- system-config-printer-1.0.15/cupshelpers/cupshelpers.py.git-1.0.x 2009-02-18 15:46:02.000000000 +0000
+++ system-config-printer-1.0.15/cupshelpers/cupshelpers.py 2009-03-09 16:03:38.000000000 +0000
@@ -52,7 +52,7 @@ class Printer:
prefix_length = len(prefix)
# Use the C locale for lower() (trac #151).
- current_ctype = locale.getlocale (locale.LC_CTYPE)
+ current_ctype = locale.setlocale (locale.LC_CTYPE)
locale.setlocale (locale.LC_CTYPE, "C")
# loop over cups constants
diff -up system-config-printer-1.0.15/po/es.po.git-1.0.x system-config-printer-1.0.15/po/es.po
--- system-config-printer-1.0.15/po/es.po.git-1.0.x 2009-02-18 16:11:35.000000000 +0000
+++ system-config-printer-1.0.15/po/es.po 2009-03-09 16:03:38.000000000 +0000
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: system-config-printer.trunk.es\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
-"POT-Creation-Date: 2009-02-11 15:01+0000\n"
-"PO-Revision-Date: 2009-01-15 13:35-0300\n"
+"POT-Creation-Date: 2009-02-17 07:20+0000\n"
+"PO-Revision-Date: 2009-02-21 18:48-0300\n"
"Last-Translator: Domingo Becker <domingobecker at gmail.com>\n"
"Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -54,23 +54,20 @@ msgid "Browse Servers"
msgstr "Navegar Servidores"
#: ../AdvancedServerSettings.py:93
-msgid ""
-"Usually print servers broadcast their queues. Specify print servers below "
-"to periodically ask for queues instead."
-msgstr ""
-"Normalmente los servidores de impresión dan a conocer sus colas de "
-"impresión. Especifique los servidores de impresión abajo a los que "
-"periódicamente se les preguntará acerca de la cola de impresión."
+msgid "Usually print servers broadcast their queues. Specify print servers below to periodically ask for queues instead."
+msgstr "Normalmente los servidores de impresión dan a conocer sus colas de impresión. Especifique los servidores de impresión abajo a los que periódicamente se les preguntará acerca de la cola de impresión."
#: ../AdvancedServerSettings.py:225
msgid "Enter IP address"
msgstr "Ingrese la dirección IP"
-#: ../authconn.py:31 ../system-config-printer.glade.h:253
+#: ../authconn.py:31
+#: ../system-config-printer.glade.h:253
msgid "Username:"
msgstr "Nombre de Usuario:"
-#: ../authconn.py:32 ../system-config-printer.glade.h:187
+#: ../authconn.py:32
+#: ../system-config-printer.glade.h:187
msgid "Password:"
msgstr "Contraseña:"
@@ -86,16 +83,21 @@ msgstr "Autenticación"
msgid "Operation canceled"
msgstr "Operación cancelada"
-#: ../authconn.py:270 ../authconn.py:272 ../errordialogs.py:77 ../pysmb.py:80
+#: ../authconn.py:270
+#: ../authconn.py:272
+#: ../errordialogs.py:77
+#: ../pysmb.py:80
#: ../pysmb.py:82
msgid "Not authorized"
msgstr "No autorizado"
-#: ../authconn.py:273 ../pysmb.py:83
+#: ../authconn.py:273
+#: ../pysmb.py:83
msgid "The password may be incorrect."
msgstr "La contraseña puede ser incorrecta."
-#: ../errordialogs.py:68 ../errordialogs.py:82
+#: ../errordialogs.py:68
+#: ../errordialogs.py:82
msgid "CUPS server error"
msgstr "Error del servidor CUPS"
@@ -104,18 +106,15 @@ msgstr "Error del servidor CUPS"
# ../util/printconf_gui.py:1812 ../util/printconf_gui.py:1829
# ../util/printconf_gui.py:1863 ../util/printconf_tui.py:1805
# ../util/printconf_gui.py:1942 ../util/printconf_tui.py:1834
-#: ../errordialogs.py:69 ../troubleshoot/PrintTestPage.py:327
+#: ../errordialogs.py:69
+#: ../troubleshoot/PrintTestPage.py:327
#, python-format
msgid "There was an error during the CUPS operation: '%s'."
msgstr "Se ha producido un error en CUPS durante la operación: '%s'."
#: ../errordialogs.py:78
-msgid ""
-"The password may be incorrect, or the server may be configured to deny "
-"remote administration."
-msgstr ""
-"La contraseña puede ser incorrecta, o el servidor fue configurado para negar "
-"la administración remota."
+msgid "The password may be incorrect, or the server may be configured to deny remote administration."
+msgstr "La contraseña puede ser incorrecta, o el servidor fue configurado para negar la administración remota."
#: ../errordialogs.py:84
msgid "Bad request"
@@ -137,7 +136,8 @@ msgstr "Se requiere actualización"
msgid "Server error"
msgstr "Error del servidor"
-#: ../errordialogs.py:94 ../system-config-printer.py:828
+#: ../errordialogs.py:94
+#: ../system-config-printer.py:828
msgid "Not connected"
msgstr "No conectado"
@@ -151,7 +151,8 @@ msgstr "estado %s"
msgid "There was an HTTP error: %s."
msgstr "Hubo un error HTTP: %s."
-#: ../jobviewer.py:184 ../troubleshoot/PrintTestPage.py:77
+#: ../jobviewer.py:184
+#: ../troubleshoot/PrintTestPage.py:77
msgid "Job"
msgstr "Trabajo"
@@ -165,16 +166,21 @@ msgstr "Trabajo"
msgid "User"
msgstr "Usuario"
-#: ../jobviewer.py:186 ../troubleshoot/PrintTestPage.py:81
+#: ../jobviewer.py:186
+#: ../troubleshoot/PrintTestPage.py:81
msgid "Document"
msgstr "Documento"
# ../gui/printconf-gui.glade.str:141
# ../gui/printconf-gui.glade.str:153
# ../gui/printconf-gui.glade.str:153
-#: ../jobviewer.py:187 ../jobviewer.py:251 ../my-default-printer.py:158
-#: ../system-config-printer.py:308 ../system-config-printer.py:924
-#: ../system-config-printer.py:3206 ../troubleshoot/PrintTestPage.py:79
+#: ../jobviewer.py:187
+#: ../jobviewer.py:251
+#: ../my-default-printer.py:158
+#: ../system-config-printer.py:308
+#: ../system-config-printer.py:924
+#: ../system-config-printer.py:3206
+#: ../troubleshoot/PrintTestPage.py:79
msgid "Printer"
msgstr "Impresora"
@@ -186,7 +192,8 @@ msgstr "Tamaño"
msgid "Time submitted"
msgstr "Hora de ingreso"
-#: ../jobviewer.py:190 ../troubleshoot/PrintTestPage.py:82
+#: ../jobviewer.py:190
+#: ../troubleshoot/PrintTestPage.py:82
msgid "Status"
msgstr "Estado"
@@ -212,15 +219,23 @@ msgstr "Estado de impresión del documen
msgid "Message"
msgstr "Mensaje"
-#: ../jobviewer.py:411 ../jobviewer.py:477 ../jobviewer.py:478
-#: ../jobviewer.py:531 ../jobviewer.py:561 ../jobviewer.py:645
-#: ../system-config-printer.py:1955 ../troubleshoot/ChooseNetworkPrinter.py:95
+#: ../jobviewer.py:411
+#: ../jobviewer.py:477
+#: ../jobviewer.py:478
[...6216 lines suppressed...]
#~ msgstr "%s-lpd-kö %s@%s"
-
#~ msgid "%s SMB queue on share %s"
#~ msgstr "%s-SMB-kö på utdelningen %s"
-
#~ msgid "%s Novell queue %s on server %s"
#~ msgstr "%s-Novell-kö %s på servern %s"
-
#~ msgid "%s JetDirect queue %s:%s"
#~ msgstr "%s-JetDirect-kö %s:%s"
-
#~ msgid "%s unknown queue type %s"
#~ msgstr "%s okänd kötyp %s"
-
#~ msgid ""
#~ "This queue is in an unknown format.\n"
#~ "Cannot Edit."
#~ msgstr ""
#~ "Denna kö är i ett okänt format.\n"
#~ "Kan inte redigera."
-
#~ msgid ""
#~ "You must select a valid name.\n"
#~ "Use only the characters -,a-z,A-Z,0-9,_ please."
#~ msgstr ""
#~ "Du måste ange ett giltigt namn.\n"
#~ "Använd endast tecknen -,a-z,A-Z,0-9,_ är du snäll."
-
#~ msgid "Another print queue is already using \"%s\" as a name."
#~ msgstr "En annan utskriftskö använder redan \"%s\" som namn."
-
#~ msgid "You must select a valid name for an alias.\n"
#~ msgstr "Du måste välja ett giltigt namn på ett alias.\n"
-
#~ msgid ""
#~ "You do not seem to have the samba client installed.\n"
#~ "You will not be able to print to SMB servers.\n"
@@ -4183,7 +3594,6 @@ msgstr "Välj standardskrivare"
#~ "Du verkar inte ha samba-klienten installerad.\n"
#~ "Du kommer inte att kunna skriva ut till SMB-servrar.\n"
#~ "Överväg att installera rpm-paketet \"samba-client\"."
-
#~ msgid ""
#~ "You do not seem to have the nprint program installed.\n"
#~ "You will not be able to print to NCP servers.\n"
@@ -4192,30 +3602,24 @@ msgstr "Välj standardskrivare"
#~ "Du verkar inte ha programmet nprint installerat.\n"
#~ "Du kommer inte att kunna skriva ut till NCP-servrar.\n"
#~ "Överväg att installera rpm-paketet \"ncpfs\"."
-
#~ msgid ""
#~ "Exiting will discard your unsaved changes.\n"
#~ "Continue?"
#~ msgstr ""
#~ "Att avsluta kommer att förkasta alla osparade ändringar.\n"
#~ "Fortsätta?"
-
#~ msgid ""
#~ "FIXME:%s\n"
#~ "This feature is incomplete, and under development."
#~ msgstr ""
#~ "FIXME:%s\n"
#~ "Denna finess är ofullständig och under utveckling."
-
#~ msgid "<b>Download Printer Driver</b>"
#~ msgstr "<b>Hämta skrivardrivrutin</b>"
-
#~ msgid "<b>Installed Options</b>"
#~ msgstr "<b>Installerade alternativ</b>"
-
#~ msgid "<b>Printers to be members of this Class</b>"
#~ msgstr "<b>Skrivare som ska vara medlemmar av denna klass</b>"
-
#~ msgid "<b>Select Connection</b>"
#~ msgstr "<b>Välj anslutning</b>"
@@ -4772,3 +4176,4 @@ msgstr "Välj standardskrivare"
#, fuzzy
#~ msgid "Unknown printer"
#~ msgstr "Okänd"
+
diff -up system-config-printer-1.0.15/probe_printer.py.git-1.0.x system-config-printer-1.0.15/probe_printer.py
--- system-config-printer-1.0.15/probe_printer.py.git-1.0.x 2009-01-12 16:46:56.000000000 +0000
+++ system-config-printer-1.0.15/probe_printer.py 2009-03-09 16:03:38.000000000 +0000
@@ -1,8 +1,8 @@
## system-config-printer
-## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
+## Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc.
## Copyright (C) 2006 Florian Festi <ffesti at redhat.com>
-## Copyright (C) 2007, 2008 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2007, 2008, 2009 Tim Waugh <twaugh at redhat.com>
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ class LpdServer:
print name
try:
- s.send('\0x02%s\n' % name) # cmd send job to queue
+ s.send('\2%s\n' % name) # cmd send job to queue
data = s.recv(1024) # receive status
print repr(data)
except socket.error, msg:
@@ -73,9 +73,9 @@ class LpdServer:
return False
- if len(data)>0 and data[0]==0:
+ if len(data)>0 and ord(data[0])==0:
try:
- s.send('\0x01\n') # abort job again
+ s.send('\1\n') # abort job again
s.close ()
except:
pass
diff -up system-config-printer-1.0.15/system-config-printer.glade.git-1.0.x system-config-printer-1.0.15/system-config-printer.glade
--- system-config-printer-1.0.15/system-config-printer.glade.git-1.0.x 2009-02-18 15:46:03.000000000 +0000
+++ system-config-printer-1.0.15/system-config-printer.glade 2009-03-09 16:03:38.000000000 +0000
@@ -1795,7 +1795,7 @@
<accessibility>
<atkrelation target="label200" type="labelled-by"/>
</accessibility>
- <signal name="changed" handler="on_entNPTDevice_changed" last_modification_time="Wed, 20 Aug 2008 13:52:26 GMT"/>
+ <signal name="changed" handler="on_cmbentNPTLpdHost_changed" last_modification_time="Wed, 25 Feb 2009 16:40:26 GMT"/>
</widget>
<packing>
<property name="left_attach">1</property>
diff -up system-config-printer-1.0.15/system-config-printer.py.git-1.0.x system-config-printer-1.0.15/system-config-printer.py
--- system-config-printer-1.0.15/system-config-printer.py.git-1.0.x 2009-02-18 15:46:03.000000000 +0000
+++ system-config-printer-1.0.15/system-config-printer.py 2009-03-09 16:03:38.000000000 +0000
@@ -2678,7 +2678,8 @@ class NewPrinterGUI(GtkGUI):
"tvNPDeviceURIs",
"cmbNPTSerialBaud", "cmbNPTSerialParity",
"cmbNPTSerialBits", "cmbNPTSerialFlow",
- "cmbentNPTLpdHost", "cmbentNPTLpdQueue",
+ "btnNPTLpdProbe",
+ "cmbentNPTLpdHost", "cmbentNPTLpdQueue",
"entNPTIPPHostname", "btnIPPFindQueue",
"lblIPPURI", "entNPTIPPQueuename",
"btnIPPVerify",
@@ -4602,7 +4603,11 @@ class NewPrinterGUI(GtkGUI):
self.entNPTIPPQueuename.show()
self.lblIPPURI.hide()
elif device.type=="lpd":
- if device.uri.startswith ("lpd"):
+ self.cmbentNPTLpdHost.child.set_text ('')
+ self.cmbentNPTLpdQueue.child.set_text ('')
+ self.cmbentNPTLpdQueue.get_model().clear ()
+ self.btnNPTLpdProbe.set_sensitive (False)
+ if len (device.uri) > 6:
host = device.uri[6:]
i = host.find ("/")
if i != -1:
@@ -4613,8 +4618,7 @@ class NewPrinterGUI(GtkGUI):
self.cmbentNPTLpdHost.child.set_text (host)
self.cmbentNPTLpdQueue.child.set_text (printer)
location = host
- elif device.uri == "lpd":
- pass
+ self.btnNPTLpdProbe.set_sensitive (True)
elif device.uri == "smb":
self.entSMBURI.set_text('')
self.btnSMBVerify.set_sensitive(False)
@@ -4641,6 +4645,11 @@ class NewPrinterGUI(GtkGUI):
self.setNPButtons()
+ def on_cmbentNPTLpdHost_changed(self, cmbent):
+ hostname = cmbent.get_active_text()
+ self.btnNPTLpdProbe.set_sensitive (len (hostname) > 0)
+ self.setNPButtons()
+
def on_btnNPTLpdProbe_clicked(self, button):
# read hostname, probe, fill printer names
hostname = self.cmbentNPTLpdHost.get_active_text()
diff -up system-config-printer-1.0.15/troubleshoot/CheckPrinterSanity.py.git-1.0.x system-config-printer-1.0.15/troubleshoot/CheckPrinterSanity.py
--- system-config-printer-1.0.15/troubleshoot/CheckPrinterSanity.py.git-1.0.x 2009-02-18 15:46:03.000000000 +0000
+++ system-config-printer-1.0.15/troubleshoot/CheckPrinterSanity.py 2009-03-09 16:03:38.000000000 +0000
@@ -2,8 +2,8 @@
## Printing troubleshooter
-## Copyright (C) 2008 Red Hat, Inc.
-## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2008, 2009 Red Hat, Inc.
+## Copyright (C) 2008, 2009 Tim Waugh <twaugh at redhat.com>
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -55,6 +55,9 @@ class CheckPrinterSanity(Question):
classes = c.getClasses ()
queue = classes[name]
self.answers['cups_class_dict'] = queue
+
+ attrs = c.getPrinterAttributes(name)
+ self.answers['local_cups_queue_attributes'] = attrs
except:
pass
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- system-config-printer.spec 18 Feb 2009 17:25:25 -0000 1.238
+++ system-config-printer.spec 9 Mar 2009 17:00:10 -0000 1.239
@@ -7,13 +7,14 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.0.15
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-printer-%{version}.tar.bz2
Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: system-config-printer-git-1.0.x.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -60,6 +61,7 @@
%prep
%setup -q -a 1 -a 2
+%patch1 -p1 -b .git-1.0.x
%build
%configure
@@ -149,6 +151,15 @@
exit 0
%changelog
+* Mon Mar 9 2009 Tim Waugh <twaugh at redhat.com> 1.0.15-2
+- Added patch for 1.0.x changes since 1.0.15:
+ - Fixed locale save/restore in cupshelpers (bug #489313).
+ - Troubleshoot: include local printer attributes in diagnostic
+ output.
+ - Don't allow LPD probe with an empty hostname.
+ - Fixed the LPD probe.
+ - Updated translations.
+
* Wed Feb 18 2009 Tim Waugh <twaugh at redhat.com> 1.0.15-1
- Updated to 1.0.15:
- Perform lowercase operations in a locale-independent manner
- Previous message (by thread): rpms/jadetex/devel jadetex.spec,1.21,1.22
- Next message (by thread): rpms/perl-local-lib/devel import.log, NONE, 1.1 perl-local-lib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list