rpms/system-config-printer/devel system-config-printer-git-1.1.x.patch, 1.5, 1.6 system-config-printer.spec, 1.250, 1.251

Tim Waugh twaugh at fedoraproject.org
Fri Feb 20 15:44:49 UTC 2009 

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15548

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-git-1.1.x.patch 
Log Message:
* Fri Feb 20 2009 Tim Waugh <twaugh at redhat.com> 1.1.4-2
- Updated from git:
  - Prevent traceback when adding new printer (bug #486587).


system-config-printer-git-1.1.x.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 system-config-printer-git-1.1.x.patch
Index: system-config-printer-git-1.1.x.patch
===================================================================
RCS file: system-config-printer-git-1.1.x.patch
diff -N system-config-printer-git-1.1.x.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ system-config-printer-git-1.1.x.patch	20 Feb 2009 15:44:48 -0000	1.6
@@ -0,0 +1,3662 @@
+diff -up system-config-printer-1.1.4/po/pt.po.git-1.1.x system-config-printer-1.1.4/po/pt.po
+--- system-config-printer-1.1.4/po/pt.po.git-1.1.x	2009-02-18 17:51:17.000000000 +0000
++++ system-config-printer-1.1.4/po/pt.po	2009-02-20 15:36:01.000000000 +0000
+@@ -5,8 +5,8 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: system-config-printer\n"
+ "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
+-"POT-Creation-Date: 2009-02-18 11:32+0000\n"
+-"PO-Revision-Date: 2009-02-17 18:55+0100\n"
++"POT-Creation-Date: 2009-02-19 01:19+0000\n"
++"PO-Revision-Date: 2009-02-19 15:19+0100\n"
+ "Last-Translator: Rui Gouveia <rui.gouveia at globaltek.pt>\n"
+ "Language-Team: pt <morais at kde.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -54,23 +54,20 @@ msgid "Browse Servers"
+ msgstr "Navegue pelos Servidores"
+ 
+ #: ../AdvancedServerSettings.py:93
+-msgid ""
+-"Usually print servers broadcast their queues.  Specify print servers below "
+-"to periodically ask for queues instead."
+-msgstr ""
+-"Normalmente os servidores anunciam as suas filas de impressão. "
+-"Alternativamente, especifique servidores de impressão que periodicamente são "
+-"consultados para obtenção de filas de impressão."
++msgid "Usually print servers broadcast their queues.  Specify print servers below to periodically ask for queues instead."
++msgstr "Normalmente os servidores anunciam as suas filas de impressão. Alternativamente, especifique servidores de impressão que periodicamente são consultados para obtenção de filas de impressão."
+ 
+ #: ../AdvancedServerSettings.py:214
+ msgid "Enter IP address"
+ msgstr "Insira endereço IP"
+ 
+-#: ../authconn.py:35 ../glade/NewPrinterWindow.glade.h:107
++#: ../authconn.py:35
++#: ../glade/NewPrinterWindow.glade.h:107
+ msgid "Username:"
+ msgstr "Utilizador:"
+ 
+-#: ../authconn.py:36 ../glade/NewPrinterWindow.glade.h:77
++#: ../authconn.py:36
++#: ../glade/NewPrinterWindow.glade.h:77
+ msgid "Password:"
+ msgstr "Senha:"
+ 
+@@ -86,7 +83,8 @@ msgstr "Autenticação"
+ msgid "Remember password"
+ msgstr "Lembrar senha"
+ 
+-#: ../authconn.py:211 ../authconn.py:232
++#: ../authconn.py:211
++#: ../authconn.py:232
+ msgid "Operation canceled"
+ msgstr "Operação Cancelada"
+ 
+@@ -95,7 +93,8 @@ msgstr "Operação Cancelada"
+ msgid "CUPS server error (%s)"
+ msgstr "Erro no servidor CUPS (%s)"
+ 
+-#: ../authconn.py:255 ../errordialogs.py:57
++#: ../authconn.py:255
++#: ../errordialogs.py:57
+ #: ../troubleshoot/PrintTestPage.py:400
+ #, python-format
+ msgid "There was an error during the CUPS operation: '%s'."
+@@ -105,12 +104,16 @@ msgstr "Houve um erro durante a operaçÃ
+ msgid "Retry"
+ msgstr "Tentar Novamente"
+ 
+-#: ../authconn.py:379 ../authconn.py:381 ../errordialogs.py:65 ../pysmb.py:75
++#: ../authconn.py:379
++#: ../authconn.py:381
++#: ../errordialogs.py:65
++#: ../pysmb.py:75
+ #: ../pysmb.py:77
+ msgid "Not authorized"
+ msgstr "Não autorizado"
+ 
+-#: ../authconn.py:382 ../pysmb.py:78
++#: ../authconn.py:382
++#: ../pysmb.py:78
+ msgid "The password may be incorrect."
+ msgstr "A senha pode estar incorrecta."
+ 
+@@ -119,17 +122,14 @@ msgstr "A senha pode estar incorrecta."
+ msgid "Authentication (%s)"
+ msgstr "Autenticação (%s)"
+ 
+-#: ../errordialogs.py:56 ../errordialogs.py:70
++#: ../errordialogs.py:56
++#: ../errordialogs.py:70
+ msgid "CUPS server error"
+ msgstr "Erro no servidor CUPS"
+ 
+ #: ../errordialogs.py:66
+-msgid ""
+-"The password may be incorrect, or the server may be configured to deny "
+-"remote administration."
+-msgstr ""
+-"A senha pode estar incorrecta ou o servidor poderá estar configurado para "
+-"negar a administração remota."
++msgid "The password may be incorrect, or the server may be configured to deny remote administration."
++msgstr "A senha pode estar incorrecta ou o servidor poderá estar configurado para negar a administração remota."
+ 
+ #: ../errordialogs.py:72
+ msgid "Bad request"
+@@ -151,7 +151,8 @@ msgstr "É necessária uma actualizaçã
+ msgid "Server error"
+ msgstr "Erro no servidor"
+ 
+-#: ../errordialogs.py:82 ../system-config-printer.py:1217
++#: ../errordialogs.py:82
++#: ../system-config-printer.py:1217
+ msgid "Not connected"
+ msgstr "Não ligada"
+ 
+@@ -173,13 +174,14 @@ msgstr "_Novo Grupo"
+ msgid "_New Group from Selection"
+ msgstr "_Novo Grupo a partir da Selecção"
+ 
+-#: ../GroupsPane.py:98 ../system-config-printer.py:391
++#: ../GroupsPane.py:98
++#: ../system-config-printer.py:391
+ msgid "_Rename"
+-msgstr "_Mudar o nome"
++msgstr "_Alterar o nome"
+ 
+ #: ../GroupsPane.py:170
+ msgid "The item could not be renamed."
+-msgstr "Incapaz de mudar o nome do item."
++msgstr "Incapaz de alterar o nome do item."
+ 
+ #: ../GroupsPane.py:171
+ #, python-format
+@@ -192,12 +194,8 @@ msgid "Are you sure you want to permanen
+ msgstr "Tem a certeza de que deseja apagar definitivamente \"%s\"?"
+ 
+ #: ../GroupsPane.py:296
+-msgid ""
+-"This will not delete any printer queues from your computer. To delete queues "
+-"completely, you must delete them from the 'All Printers' group."
+-msgstr ""
+-"Isto não apagará nenhuma fila de impressão do seu computador. Para apagar "
+-"filas completamente, precisa de as apagar do grupo 'Todas as Impressoras'."
++msgid "This will not delete any printer queues from your computer. To delete queues completely, you must delete them from the 'All Printers' group."
++msgstr "Isto não apagará nenhuma fila de impressão do seu computador. Para apagar filas completamente, precisa de as apagar do grupo 'Todas as Impressoras'."
+ 
+ #: ../GroupsPane.py:318
+ msgid "New Group"
+@@ -227,7 +225,8 @@ msgstr "Im_primir de novo"
+ msgid "_Authenticate"
+ msgstr "_Autenticar"
+ 
+-#: ../jobviewer.py:209 ../troubleshoot/PrintTestPage.py:82
++#: ../jobviewer.py:209
++#: ../troubleshoot/PrintTestPage.py:82
+ msgid "Job"
+ msgstr "Tarefa"
+ 
+@@ -235,12 +234,15 @@ msgstr "Tarefa"
+ msgid "User"
+ msgstr "Utilizador"
+ 
+-#: ../jobviewer.py:211 ../troubleshoot/PrintTestPage.py:86
++#: ../jobviewer.py:211
++#: ../troubleshoot/PrintTestPage.py:86
+ msgid "Document"
+ msgstr "Documento"
+ 
+-#: ../jobviewer.py:212 ../my-default-printer.py:153
+-#: ../system-config-printer.py:364 ../system-config-printer.py:1365
++#: ../jobviewer.py:212
++#: ../my-default-printer.py:153
++#: ../system-config-printer.py:364
++#: ../system-config-printer.py:1365
+ #: ../troubleshoot/PrintTestPage.py:84
+ msgid "Printer"
+ msgstr "Impressora"
+@@ -253,7 +255,8 @@ msgstr "Tamanho"
+ msgid "Time submitted"
+ msgstr "Hora de envio"
+ 
+-#: ../jobviewer.py:215 ../troubleshoot/PrintTestPage.py:87
++#: ../jobviewer.py:215
++#: ../troubleshoot/PrintTestPage.py:87
+ msgid "Status"
+ msgstr "Estado"
+ 
+@@ -275,17 +278,26 @@ msgstr "todas as tarefas"
+ msgid "Document Print Status (%s)"
+ msgstr "Estado de impressão do documento (%s)"
+ 
+-#: ../jobviewer.py:386 ../jobviewer.py:451 ../jobviewer.py:452
+-#: ../jobviewer.py:492 ../jobviewer.py:600 ../jobviewer.py:727
[...3269 lines suppressed...]
+ #~ msgstr "Insira o nome da partilha"
+-
+ #~ msgid "Use control-F to search"
+ #~ msgstr "Utilize control-F para procurar"
+-
+ #~ msgid "_A4 PostScript test page"
+ #~ msgstr "Página de teste PostScript _A4"
+-
+ #~ msgid "_Add..."
+ #~ msgstr "_Adicionar..."
+-
+ #~ msgid "_All hosts"
+ #~ msgstr "Tod_as as máquinas"
+-
+ #~ msgid "_Apply"
+ #~ msgstr "_Aplicar"
+-
+ #~ msgid "_Automatically find remote shared queues"
+ #~ msgstr "Procurar _automaticamente as filas remotas partilhadas"
+-
+ #~ msgid "_Big5 text test page"
+ #~ msgstr "Página de teste de texto _Big5"
+-
+ #~ msgid "_CUPS test page"
+ #~ msgstr "Página de teste do _CUPS"
+-
+ #~ msgid "_Contents"
+ #~ msgstr "_Conteúdo"
+-
+ #~ msgid "_Custom device"
+ #~ msgstr "Dispositivo _personalizado"
+-
+ #~ msgid "_Delete queue"
+ #~ msgstr "Apa_gar a fila"
+-
+ #~ msgid "_Duplex test"
+ #~ msgstr "Teste _duplex"
+-
+ #~ msgid "_Edit queue"
+ #~ msgstr "_Editar a fila"
+-
+ #~ msgid "_Edit..."
+ #~ msgstr "_Editar..."
+-
+ #~ msgid "_Import PPD..."
+ #~ msgstr "_Importar PPD..."
+-
+ #~ msgid "_Network address"
+ #~ msgstr "E_ndereço de rede"
+-
+ #~ msgid "_Notes..."
+ #~ msgstr "_Notas..."
+-
+ #~ msgid "_Rescan devices"
+ #~ msgstr "Procu_rar dispositivos"
+-
+ #~ msgid "_This queue is available to other computers"
+ #~ msgstr "Es_ta fila está disponível a outros computadores"
+-
+ #~ msgid "_US Letter PostScript test page"
+ #~ msgstr "Página de teste PostScript _US Letter"
+-
+ #~ msgid "_none"
+ #~ msgstr "_nada"
+-
+ #~ msgid "ipp"
+ #~ msgstr "ipp"
+-
+ #~ msgid "jetdirect"
+ #~ msgstr "jetdirect"
+-
+ #~ msgid "lpd"
+ #~ msgstr "lpd"
+-
+ #~ msgid "ncp"
+ #~ msgstr "ncp"
++
+diff -up system-config-printer-1.1.4/po/zh_CN.po.git-1.1.x system-config-printer-1.1.4/po/zh_CN.po
+--- system-config-printer-1.1.4/po/zh_CN.po.git-1.1.x	2009-02-18 17:51:17.000000000 +0000
++++ system-config-printer-1.1.4/po/zh_CN.po	2009-02-20 15:36:01.000000000 +0000
+@@ -15,13 +15,13 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: system-config-printer.1.1.x\n"
+ "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
+-"POT-Creation-Date: 2009-02-18 11:32+0000\n"
+-"PO-Revision-Date: 2009-02-18 21:30+0800\n"
++"POT-Creation-Date: 2009-02-19 01:19+0000\n"
++"PO-Revision-Date: 2009-02-19 20:21+0800\n"
+ "Last-Translator: TianShixiong <tiansworld at gmail.com>\n"
+ "Language-Team: Chinese/Simplified <i18n-translation at lists.linux.net.cn>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+-"Content-Transfer-Encoding: 8bit\n"
++"Content-Transfer-Encoding: 8bit"
+ 
+ #: ../AdvancedServerSettings.py:41
+ msgid "Advanced Server Settings"
+@@ -1314,39 +1314,35 @@ msgstr "没有可用队列。"
+ 
+ #: ../system-config-printer.py:5500
+ msgid "Parallel Port"
+-msgstr ""
++msgstr "并口"
+ 
+ #: ../system-config-printer.py:5502
+-#, fuzzy
+ msgid "Serial Port"
+ msgstr "串口"
+ 
+ #: ../system-config-printer.py:5504
+-#, fuzzy
+ msgid "USB"
+-msgstr "SMB"
++msgstr "USB"
+ 
+ #: ../system-config-printer.py:5506 ../system-config-printer.py:5509
+ msgid "HP Linux Imaging and Printing (HPLIP)"
+-msgstr ""
++msgstr "HP Linux成像和打印(HPLIP)"
+ 
+ #: ../system-config-printer.py:5511
+-#, fuzzy
+ msgid "Hardware Abstraction Layer (HAL)"
+-msgstr "Hardware Abstraction Layer (HAL) 发现了本地打印机。"
++msgstr "硬件抽象层(HAL)"
+ 
+ #: ../system-config-printer.py:5513
+ msgid "AppSocket/HP JetDirect"
+-msgstr ""
++msgstr "应用接口/HP JetDirect"
+ 
+ #: ../system-config-printer.py:5515
+-#, fuzzy
+ msgid "LPD/LPR"
+-msgstr "LPD"
++msgstr "LPD/LPR"
+ 
+ #: ../system-config-printer.py:5517
+ msgid "Windows Printer via SAMBA"
+-msgstr ""
++msgstr "通过SAMBA连接的Windows打印机"
+ 
+ #: ../system-config-printer.py:5519 ../glade/NewPrinterWindow.glade.h:66
+ msgid "IPP"
+@@ -1354,7 +1350,7 @@ msgstr "IPP"
+ 
+ #: ../system-config-printer.py:5521
+ msgid "HTTP"
+-msgstr ""
++msgstr "HTTP"
+ 
+ #: ../system-config-printer.py:5606
+ msgid "A printer connected to the parallel port."
+diff -up system-config-printer-1.1.4/system-config-printer.py.git-1.1.x system-config-printer-1.1.4/system-config-printer.py
+--- system-config-printer-1.1.4/system-config-printer.py.git-1.1.x	2009-02-18 16:41:17.000000000 +0000
++++ system-config-printer-1.1.4/system-config-printer.py	2009-02-20 15:36:01.000000000 +0000
+@@ -4874,13 +4874,13 @@ class NewPrinterGUI(GtkGUI):
+         self.devices.sort()
+         other = cupshelpers.Device('', **{'device-info' :_("Other")})
+         self.devices.append (PhysicalDevice (other))
+-        device_select_path = 0
++        device_select_index = 0
+         if current_uri:
+             current_device = PhysicalDevice (current)
+             try:
+                 i = self.devices.index (current_device)
+                 self.devices[i].add_device (current)
+-                device_select_path = i
++                device_select_index = i
+                 devs = self.devices[i].get_devices ()
+             except ValueError:
+                 self.devices.insert(0, current_device)
+@@ -4902,6 +4902,7 @@ class NewPrinterGUI(GtkGUI):
+         self.tvNPDevices.set_model (model)
+ 
+         i = 0
++        device_select_path = None
+         for device in self.devices:
+             devs = device.get_devices ()
+             network = devs[0].device_class == 'network'
+@@ -4915,16 +4916,16 @@ class NewPrinterGUI(GtkGUI):
+                     # If this is the currently selected device we need
+                     # to expand the "Network Printer" row so that it
+                     # is visible.
+-                    if device_select_path == i:
++                    if device_select_index == i:
+                         network_path = model.get_path (network_iter)
+                         self.tvNPDevices.expand_row (network_path, False)
+                 else:
+                     # Just a method of finding one.
+-                    model.append (network_iter, row=row)
++                    iter = model.append (network_iter, row=row)
+             else:
+                 iter = model.insert_before(None, network_iter, row=row)
+ 
+-            if device_select_path == i:
++            if device_select_index == i:
+                 device_select_path = model.get_path (iter)
+                 self.tvNPDevices.scroll_to_cell (device_select_path,
+                                                  row_align=0.5)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- system-config-printer.spec	18 Feb 2009 18:17:19 -0000	1.250
+++ system-config-printer.spec	20 Feb 2009 15:44:48 -0000	1.251
@@ -7,13 +7,14 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.4
-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.1/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.1.x.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -63,6 +64,7 @@
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .git-1.1.x
 
 %build
 %configure
@@ -164,6 +166,10 @@
 exit 0
 
 %changelog
+* Fri Feb 20 2009 Tim Waugh <twaugh at redhat.com> 1.1.4-2
+- Updated from git:
+  - Prevent traceback when adding new printer (bug #486587).
+
 * Wed Feb 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.4-1
 - 1.1.4:
   - Skip model selection screen when adding a new printer for which we

More information about the fedora-extras-commits mailing list