[Pkg-cups-devel] r413 - in cupsys/branches/cups-1.2-ubuntu/debian:
. patches po
Martin Pitt
mpitt at alioth.debian.org
Fri Nov 24 17:10:04 UTC 2006
Author: mpitt
Date: Fri Nov 24 18:10:03 2006
New Revision: 413
Added:
cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po
- copied unchanged from r412, cupsys/branches/cups-1.2/debian/po/eu.po
cupsys/branches/cups-1.2-ubuntu/debian/printer.schema
- copied unchanged from r412, cupsys/branches/cups-1.2/debian/printer.schema
Removed:
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_r6068.dpatch
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples
cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
cupsys/branches/cups-1.2-ubuntu/debian/patches/47_pid.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po
Log:
merge to Debian, release as 1.2.7-1ubuntu1
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Fri Nov 24 18:10:03 2006
@@ -1,3 +1,42 @@
+cupsys (1.2.7-1ubuntu1) feisty; urgency=low
+
+ * Merge to Debian unstable to get new upstream bugfix release.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 24 Nov 2006 17:53:12 +0100
+
+cupsys (1.2.7-1) unstable; urgency=low
+
+ * New upstream release
+ - Added Italian translation
+
+ [ Kenshi Muto ]
+ * Add printer.schema to /usr/share/doc/cupsys/examples for LDAP.
+ (closes: #399122)
+
+ -- Kenshi Muto <kmuto at debian.org> Sat, 18 Nov 2006 10:03:30 +0900
+
+cupsys (1.2.6-2) unstable; urgency=low
+
+ [ Kenshi Muto ]
+ * Debconf translation
+ - Brazillian Portuguese (closes: #397842)
+ - Basque (closes: #398574)
+ * 00_r6100: Apply SVN r6100.
+ - Fixed an inefficiency in the SNMP IPP detection code
+ (closes: #397833)
+
+ -- Kenshi Muto <kmuto at debian.org> Tue, 14 Nov 2006 22:29:08 +0900
+
+cupsys (1.2.6-1) unstable; urgency=low
+
+ * New upstream release
+ Fixes bugs include
+ - "lpc status" did not show the number of queued jobs for
+ disabled queues
+ - The lpstat program could hang
+
+ -- Kenshi Muto <kmuto at debian.org> Tue, 7 Nov 2006 21:09:33 +0900
+
cupsys (1.2.5-1ubuntu1) feisty; urgency=low
* Merge to Debian svn head. Remaining Ubuntu changes:
@@ -42,13 +81,6 @@
-- Martin Pitt <martin.pitt at ubuntu.com> Fri, 3 Nov 2006 11:15:14 +0100
-cupsys (1.2.5-2) UNRELEASED; urgency=low
-
- [ Kenshi Muto ]
- * 00_r6068: Apply SVN r6068.
-
- -- Kenshi Muto <kmuto at debian.org> Tue, 31 Oct 2006 22:35:07 +0900
-
cupsys (1.2.5-1) unstable; urgency=medium
* New upstream release.
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples Fri Nov 24 18:10:03 2006
@@ -1 +1,2 @@
debian/filters/*
+debian/printer.schema
Modified: cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs Fri Nov 24 18:10:03 2006
@@ -1 +1 @@
-libcups 2 libcupsys2 (>= 1.2.5)
+libcups 2 libcupsys2 (>= 1.2.7)
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Fri Nov 24 18:10:03 2006
@@ -1,4 +1,3 @@
-00_r6068.dpatch
02_configure.dpatch
#03_manext.dpatch
03_clean.dpatch
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/47_pid.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/47_pid.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/47_pid.dpatch Fri Nov 24 18:10:03 2006
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.1.99.b2~/scheduler/conf.c cupsys-1.1.99.b2/scheduler/conf.c
---- cupsys-1.1.99.b2~/scheduler/conf.c 2006-03-11 13:31:04.000000000 +0000
-+++ cupsys-1.1.99.b2/scheduler/conf.c 2006-03-11 13:31:16.000000000 +0000
+diff -urNad cupsys-1.2.6~/scheduler/conf.c cupsys-1.2.6/scheduler/conf.c
+--- cupsys-1.2.6~/scheduler/conf.c 2006-11-15 09:52:47.000000000 +0900
++++ cupsys-1.2.6/scheduler/conf.c 2006-11-15 09:52:47.000000000 +0900
@@ -170,7 +170,8 @@
{ "StateDir", &StateDir, CUPSD_VARTYPE_STRING },
{ "TempDir", &TempDir, CUPSD_VARTYPE_STRING },
@@ -18,18 +18,18 @@
};
#define NUM_VARS (sizeof(variables) / sizeof(variables[0]))
-@@ -287,6 +288,7 @@
+@@ -288,6 +289,7 @@
cupsdSetString(&RemoteRoot, "remroot");
cupsdSetString(&ServerHeader, "CUPS/1.2");
cupsdSetString(&StateDir, CUPS_STATEDIR);
+ cupsdSetString(&PidFile, "/var/run/cups/cupsd.pid");
- strlcpy(temp, ConfigurationFile, sizeof(temp));
- if ((slash = strrchr(temp, '/')) != NULL)
-diff -urNad cupsys-1.1.99.b2~/scheduler/conf.h cupsys-1.1.99.b2/scheduler/conf.h
---- cupsys-1.1.99.b2~/scheduler/conf.h 2006-03-11 13:31:04.000000000 +0000
-+++ cupsys-1.1.99.b2/scheduler/conf.h 2006-03-11 13:31:16.000000000 +0000
-@@ -186,6 +186,7 @@
+ if (!strcmp(CUPS_DEFAULT_PRINTCAP, "/etc/printers.conf"))
+ PrintcapFormat = PRINTCAP_SOLARIS;
+diff -urNad cupsys-1.2.6~/scheduler/conf.h cupsys-1.2.6/scheduler/conf.h
+--- cupsys-1.2.6~/scheduler/conf.h 2006-06-27 03:34:20.000000000 +0900
++++ cupsys-1.2.6/scheduler/conf.h 2006-11-15 09:52:47.000000000 +0900
+@@ -187,6 +187,7 @@
/* Server key file */
# endif /* HAVE_LIBSSL || HAVE_GNUTLS */
#endif /* HAVE_SSL */
@@ -37,22 +37,21 @@
#ifdef HAVE_LAUNCHD
VAR int LaunchdTimeout VALUE(DEFAULT_TIMEOUT);
-diff -urNad cupsys-1.1.99.b2~/scheduler/main.c cupsys-1.1.99.b2/scheduler/main.c
---- cupsys-1.1.99.b2~/scheduler/main.c 2006-03-11 13:31:04.000000000 +0000
-+++ cupsys-1.1.99.b2/scheduler/main.c 2006-03-11 13:32:41.000000000 +0000
-@@ -89,7 +89,8 @@
- static void sigterm_handler(int sig);
- static long select_timeout(int fds);
- static void usage(int status);
--
-+int write_pid(void);
-+int remvoe_pid(void);
+diff -urNad cupsys-1.2.6~/scheduler/main.c cupsys-1.2.6/scheduler/main.c
+--- cupsys-1.2.6~/scheduler/main.c 2006-11-15 09:52:46.000000000 +0900
++++ cupsys-1.2.6/scheduler/main.c 2006-11-15 09:54:01.000000000 +0900
+@@ -92,6 +92,8 @@
+ static void sigterm_handler(int sig);
+ static long select_timeout(int fds);
+ static void usage(int status);
++int write_pid(void);
++int remove_pid(void);
+
/*
- * Local globals...
-@@ -501,6 +502,11 @@
- kill(i, SIGUSR1);
+@@ -506,6 +508,11 @@
}
+ #endif /* __sgi */
+ if (write_pid() == 0) {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to write pid file");
@@ -60,9 +59,9 @@
+ }
+
/*
- * Start power management framework...
+ * Initialize authentication certificates...
*/
-@@ -1095,9 +1101,39 @@
+@@ -1161,9 +1168,39 @@
free(input);
free(output);
Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po Fri Nov 24 18:10:03 2006
@@ -12,12 +12,12 @@
# Developers do not need to manually edit POT or PO files.
#
msgid ""
-msgstr ""
+msgstr "pt_BR utf-8\n"
"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-03-29 14:05+0000\n"
-"PO-Revision-Date: 2006-06-19 02:39-0300\n"
-"Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-08 04:31+0100\n"
+"PO-Revision-Date: 2006-11-09 20:17-0200\n"
+"Last-Translator: Felipe Augusto van de Wiel (faw) <faw at cathedrallabs.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid "Do you want to set up the BSD lpd compatibility server?"
-msgstr "Você quer configurar o servidor de compatibilidade BSD lpd ?"
+msgstr "Você quer configurar o servidor de compatibilidade BSD lpd?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:4
+#: ../cupsys-bsd.templates:1001
msgid ""
"This package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if you have other computers "
@@ -46,14 +46,15 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
-msgstr "Você deseja que o CUPS imprima trabalhos desconhecidos como trabalhos "
-"\"raw\" ?"
+msgstr ""
+"Você deseja que o CUPS imprima trabalhos desconhecidos como trabalhos "
+"\"raw\"?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid ""
"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
"can attach an appropriate type, many jobs get submitted as the MIME type "
@@ -63,15 +64,14 @@
msgstr ""
"Todos os trabalhos de impressão em IPP possuem um tipo MIME. Uma vez que nem "
"todas as fontes de trabalhos de impressão podem anexar um tipo apropriado, "
-"muitos trabalhos são submetidos com seu tipo MIME como "
-"appliction/octet-stream. Devido a isso, quando o CUPS recebe um trabalho com "
-"esse tipo MIME, o mesmo tenta adivinhar em qual formato o trabalho está. Por "
-"padrão, caso o CUPS não consiga adivinhar o tipo correto, o trabalho é "
-"rejeitado."
+"muitos trabalhos são submetidos com seu tipo MIME como appliction/octet-"
+"stream. Devido a isso, quando o CUPS recebe um trabalho com esse tipo MIME, "
+"o mesmo tenta adivinhar em qual formato o trabalho está. Por padrão, caso o "
+"CUPS não consiga adivinhar o tipo correto, o trabalho é rejeitado."
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid ""
"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
"type as \"raw\" jobs, which causes them to be sent directly to the printer "
@@ -83,7 +83,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:4
+#: ../cupsys.templates:1001
msgid ""
"If you will be accepting print jobs from Windows computers, you probably "
"want this option set, as Windows gives all IPP print jobs processed by a "
@@ -98,55 +98,61 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "parallel"
msgstr "paralelo"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "serial"
msgstr "serial"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:22
+#: ../cupsys.templates:2001
msgid "usb"
msgstr "usb"
#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:2001
+msgid "snmp"
+msgstr "snmp"
+
+#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2002
msgid "Printer communication backends:"
-msgstr "Backends de comunicação com impressoras :"
+msgstr "Backends de comunicação com impressoras:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2002
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
@@ -155,7 +161,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2002
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -165,7 +171,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:24
+#: ../cupsys.templates:2002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
@@ -173,103 +179,70 @@
"Por favor, selecione o programa backend a ser usado pelo CUPS. A escolha "
"padrão deve se encaixar na maiorias dos ambientes."
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "Port or/and host name where CUPS will listen to:"
-msgstr "Porta e/ou nome de host onde o CUPS irá ouvir :"
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"Please specify the port or the host name CUPS daemon will listen to. The "
-"following formats are allowed:"
-msgstr ""
-"Por favor, especifique em qual porta ou nome de host o daemon CUPS "
-"irá ouvir. Os formatos a seguir são suportados :"
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-" - Port number (631);\n"
-" - Host name (debian.example.com);\n"
-" - Host:Port (debian.example.com:631);\n"
-" - File domain socket (/var/run/cups/cups.sock)."
-msgstr ""
-" - Número de porta (631);\n"
-" - Nome de host (debian.exemplo.com);\n"
-" - Host:Porta (debian.exemplo.com:631);\n"
-" - Socket de domínio em arquivo (/var/run/cups/cups.sock)."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid "You can combine any of these by delimiting in a space-separated list."
-msgstr ""
-"Você pode combinar quaisquer um desses formatos especificando os mesmos "
-"em uma lista separada por espaços."
-
-#. Type: string
-#. Description
-#: ../cupsys.templates:36
-msgid ""
-"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
-"\"localhost:631\" is recommended to setup a standalone environment for "
-"security reasons."
-msgstr ""
-"A porta padrão 631 é reservada para o Protocolo de Impressão Internet "
-"(IPP). \"localhost:631\" é o recomendado para configuração de um "
-"ambiente de trabalho fora de uma rede por razões de segurança."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid "Broadcast and/or listen for CUPS printer information on the network?"
-msgstr ""
-"Enviar broadcast e/ou ouvir por informações de impressoras CUPS na "
-"rede ?"
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"CUPS daemon can broadcast printer information for clients on the network, "
-"and detect printers on the network automatically."
-msgstr ""
-"O daemon CUPS pode enviar informações sobre impressoras via broadcasts "
-"para clientes na rede e também detectar impressoras na rede "
-"automaticamente."
-
-#. Type: boolean
-#. Description
-#: ../cupsys.templates:54
-msgid ""
-"If you choose this option, the CUPS daemon will periodically send UDP "
-"broadcasts to detect printers."
-msgstr ""
-"Caso você habilite esta opção, o daemon CUPS irá periodicamente "
-"enviar broadcasts UDP para detectar impressoras."
-
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Incorrect value entered"
-msgstr "Valor incorreto informado"
+#~ msgid "Port or/and host name where CUPS will listen to:"
+#~ msgstr "Porta e/ou nome de host onde o CUPS irá ouvir :"
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "an error occurred while parsing the port number or the host name."
-msgstr ""
-"um erro ocorreu durante a leitura do número de porta ou do nome de host."
+#~ msgid ""
+#~ "Please specify the port or the host name CUPS daemon will listen to. The "
+#~ "following formats are allowed:"
+#~ msgstr ""
+#~ "Por favor, especifique em qual porta ou nome de host o daemon CUPS irá "
+#~ "ouvir. Os formatos a seguir são suportados :"
+
+#~ msgid ""
+#~ " - Port number (631);\n"
+#~ " - Host name (debian.example.com);\n"
+#~ " - Host:Port (debian.example.com:631);\n"
+#~ " - File domain socket (/var/run/cups/cups.sock)."
+#~ msgstr ""
+#~ " - Número de porta (631);\n"
+#~ " - Nome de host (debian.exemplo.com);\n"
+#~ " - Host:Porta (debian.exemplo.com:631);\n"
+#~ " - Socket de domínio em arquivo (/var/run/cups/cups.sock)."
+
+#~ msgid ""
+#~ "You can combine any of these by delimiting in a space-separated list."
+#~ msgstr ""
+#~ "Você pode combinar quaisquer um desses formatos especificando os mesmos "
+#~ "em uma lista separada por espaços."
+
+#~ msgid ""
+#~ "The default port 631 is reserved for the Internet Printing Protocol "
+#~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
+#~ "for security reasons."
+#~ msgstr ""
+#~ "A porta padrão 631 é reservada para o Protocolo de Impressão Internet "
+#~ "(IPP). \"localhost:631\" é o recomendado para configuração de um ambiente "
+#~ "de trabalho fora de uma rede por razões de segurança."
+
+#~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
+#~ msgstr ""
+#~ "Enviar broadcast e/ou ouvir por informações de impressoras CUPS na rede ?"
+
+#~ msgid ""
+#~ "CUPS daemon can broadcast printer information for clients on the network, "
+#~ "and detect printers on the network automatically."
+#~ msgstr ""
+#~ "O daemon CUPS pode enviar informações sobre impressoras via broadcasts "
+#~ "para clientes na rede e também detectar impressoras na rede "
+#~ "automaticamente."
+
+#~ msgid ""
+#~ "If you choose this option, the CUPS daemon will periodically send UDP "
+#~ "broadcasts to detect printers."
+#~ msgstr ""
+#~ "Caso você habilite esta opção, o daemon CUPS irá periodicamente enviar "
+#~ "broadcasts UDP para detectar impressoras."
+
+#~ msgid "Incorrect value entered"
+#~ msgstr "Valor incorreto informado"
+
+#~ msgid "an error occurred while parsing the port number or the host name."
+#~ msgstr ""
+#~ "um erro ocorreu durante a leitura do número de porta ou do nome de host."
-#. Type: note
-#. Description
-#: ../cupsys.templates:63
-msgid "Please correct your input."
-msgstr "Por favor, corrija o que foi informado."
+#~ msgid "Please correct your input."
+#~ msgstr "Por favor, corrija o que foi informado."
#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
#~ msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
More information about the Pkg-cups-devel
mailing list