Bug#544991: Patch using in NMU for version 3.8.A-2.2

Fri, 04 Sep 2009 03:43:47 -0700 

Package: lprng
Version: 3.8.A-2.2
Severity: wishlist

Here is the patch I used for the NMU I just uploaded.

Happy hacking,
-- 
Petter Reinholdtsen

diff -u lprng-3.8.A/debian/changelog lprng-3.8.A/debian/changelog
--- lprng-3.8.A/debian/changelog
+++ lprng-3.8.A/debian/changelog
@@ -1,3 +1,17 @@
+lprng (3.8.A-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Corrected runlevel settings in init.d script header, and add postinst
+    code to recover installations affected by this bug (Closes:
+    #541233).
+  * Fixed build problem on kfreebsd (Closes: #537857).  Patch from
+    Petr Salinger.
+  * Updated debconf translations for Brazilian Portuguese from
+    Eder L. Marques (Closes: 511890).
+  * Updated debconf translation for Czech from Jan Outrata (Closes: #534967)
+
+ -- Petter Reinholdtsen <p...@debian.org>  Fri,  4 Sep 2009 10:24:59 +0200
+
 lprng (3.8.A-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u lprng-3.8.A/debian/init.d lprng-3.8.A/debian/init.d
--- lprng-3.8.A/debian/init.d
+++ lprng-3.8.A/debian/init.d
@@ -1,10 +1,10 @@
 #! /bin/sh -e
 ### BEGIN INIT INFO
-# Provides: lpd
+# Provides: lprng
 # Required-Start: $network $remote_fs $syslog
 # Required-Stop: $network
-# Default-Start: 2 3 5
-# Default-Stop: 0 1 4 6
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
 # Short-Description: Start lpd to allow printing
 # Description: lpd is the print daemon required for lpr to work properly.
 #   It is basically a server that arbitrates print jobs to printer(s).
diff -u lprng-3.8.A/debian/postinst lprng-3.8.A/debian/postinst
--- lprng-3.8.A/debian/postinst
+++ lprng-3.8.A/debian/postinst
@@ -76,6 +76,15 @@
         ;;
 esac
 
+# Those using dependency based boot sequencing with sysv-rc and installing
+# lprng before version 3.8.A-2.2 would miss the runlevel 4 symlink.
+# Recover from this.
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "3.8.A-2.2" \
+   && [ -f /etc/rc2.d/[SK][0-9][0-9]lprng ] && [ -f /etc/rc4.d/K[0-9][0-9]lprng ]
+then
+   update-rc.d -f lprng remove
+fi
+
 # Have to manually start lprng as a failed startup is not a failed install
 if [ -x "/etc/init.d/lprng" ]; then
 	update-rc.d lprng defaults >/dev/null
diff -u lprng-3.8.A/debian/po/pt_BR.po lprng-3.8.A/debian/po/pt_BR.po
--- lprng-3.8.A/debian/po/pt_BR.po
+++ lprng-3.8.A/debian/po/pt_BR.po
@@ -1,54 +1,47 @@
+# lprng Brazilian Portuguese translation
+# Copyright (C) 2008 lprng's PACKAGE COPYRIGHT HOLDER
+# This file is distributed under the same license as the lprng package.
+# André Luís Lopes <andre...@debian.org>, 2007.
+# Eder L. Marques (frolic) <fro...@debian-ce.org>, 2008.
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lprng_3.8.22-2\n"
+"Project-Id-Version: lprng\n"
 "Report-Msgid-Bugs-To: csm...@debian.org\n"
 "POT-Creation-Date: 2006-08-01 21:12+1000\n"
-"PO-Revision-Date: 2003-11-09 17:22-0300\n"
-"Last-Translator: André Luís Lopes <andre...@debian.org>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portugu...@lists.debian.org>\n"
+"PO-Revision-Date: 2008-08-20 11:20-0300\n"
+"Last-Translator: Eder L. Marques (frolic) <fro...@debian-ce.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portugu...@lists.debian."
+"org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
 
 #. Type: note
 #. Description
 #: ../templates:1001
 msgid "There are two lpd.conf files"
-msgstr "Existem dois arquivo lpd.conf"
+msgstr "Existem dois arquivos lpd.conf"
 
 #. Type: note
 #. Description
 #: ../templates:1001
-#, fuzzy
 msgid ""
 "You have a lpd.conf in the old location (/etc/lpd.conf) and the new location "
 "(/etc/lprng/lpd.conf). From lprng version 3.6.16-1 this file should be only "
 "in /etc/lprng, please check both files and remove /etc/lpd.conf"
 msgstr ""
-"Vocę possui um arquivo lpd.conf no local antigo, em /etc/lpd.conf, e um "
-"arquivo no novo local, em /etc/lprng/lpd.conf. Desde o lprng versăo 3.6.16-"
-"1, esse arquivo deveria estar somente no diretório /etc/lprng. Por favor, "
-"cheque ambos os arquivos e remova o arquivo /etc/lpd.conf."
+"Vocę tem um arquivo lpd.conf em uma localizaçăo antiga (/etc/lpd.conf) e na "
+"nova localizaçăo (/etc/lprng/lpd.conf). A partir da versăo 3.6.16-1 este "
+"arquivo deveria estar somente em /etc/lprng. Por favor, verifique ambos os "
+"arquivos e remova o /etc/lpd.conf."
 
 #. Type: note
 #. Description
 #: ../templates:2001
 msgid "There are two lpd.perms files"
-msgstr "Existem dois arquivo lpd.perms"
+msgstr "Existem dois arquivos lpd.perms"
 
 #. Type: note
 #. Description
@@ -59,16 +52,16 @@
 "should be only in /etc/lprng, please check both files and remove /etc/lpd."
 "perms"
 msgstr ""
-"Vocę possui um arquivo lpd.perms no local antigo, em /etc/lpd.perms, e um "
-"arquivo no novo local, em /etc/lprng/lpd.perms. Desde o lprng versăo 3.6.16-"
-"1, esse arquivo deveria estar somente no diretório /etc/lprng. Por favor, "
-"cheque ambos os arquivos e remova o arquivo /etc/lpd.perms."
+"Vocę tem um arquivo lpd.perms em uma localizaçăo antiga (/etc/lpd.perms) e "
+"na nova localizaçăo (/etc/lprng/lpd.perms). A partir da versăo 3.6.16-1 este "
+"arquivo deveria estar somente em /etc/lprng. Por favor, verifique ambos os "
+"arquivos e remova o /etc/lpd.perms."
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
 msgid "Make lpr, lprm and lpq setuid root?"
-msgstr "Tornar o lpr, lprm e lpq setuid root ?"
+msgstr "Tornar o lpr, lprm e lpq setuid root?"
 
 #. Type: boolean
 #. Description
@@ -81,19 +74,19 @@
 "typical printer connected locally to parallel port (and many other) scenario "
 "you can leave these programs non setuid root."
 msgstr ""
-"Para compatibilidade total com a RFC1179 vocę precisa tornar esses programas "
-"setuid root. Isto se deve principalmente a a eles poderem criar um socket "
-"com um número de porta baixo. O número de porta baixo pode ser importante "
-"caso vocę possua impressoras de rede ou tenha ajustado o arquivo /etc/lprng/"
-"lpd.perms para restringir o acesso a portas năo privilegiadas. Para o típico "
-"cenário da impressora conectada localmente a porta paralela (e muitos "
-"outros) vocę pode manter esses progrmas sem o bit stuid root ligado."
+"Para compatibilidade total com a RFC1179 vocę precisa tornar esses programas "
+"setuid root. Isto se deve principalmente a eles poderem criar um socket com "
+"um número de porta baixo. O número de porta baixo pode ser importante caso "
+"vocę possua impressoras de rede ou tenha ajustado o arquivo /etc/lprng/lpd."
+"perms para restringir o acesso a portas năo privilegiadas. Para o típico "
+"cenário da impressora conectada localmente ŕ porta paralela (e muitos "
+"outros) vocę pode manter esses programas sem o bit setuid root habilitado."
 
 #. Type: boolean
 #. Description
 #: ../templates:4001
 msgid "Start lpd (Printer Daemon) at boot?"
-msgstr "Iniciar o lpd (Daemon de Impressăo) na inicializaçăo da máquina ?"
+msgstr "Iniciar o lpd (Daemon de Impressăo) na inicializaçăo da máquina?"
 
 #. Type: boolean
 #. Description
@@ -106,3 +99,3 @@
-"Algumas pessoas, por várias razőes. năo desejam iniciar o lpd. Caso vocę năo "
-"aceite esta opçăo o lpd năo será iniciado. A menos que vocę realmente năo "
-"deseje que o lpd seja iniciado, aceite o padrăo."
+"Algumas pessoas por várias razőes năo desejam iniciar o lpd. Recusando esta "
+"opçăo significa que o lpd năo irá iniciar. A menos que vocę saiba por que "
+"quer que o lpd năo inicie, apenas aceite o padrăo."
diff -u lprng-3.8.A/debian/po/cs.po lprng-3.8.A/debian/po/cs.po
--- lprng-3.8.A/debian/po/cs.po
+++ lprng-3.8.A/debian/po/cs.po
@@ -16,37 +16,36 @@
 "Project-Id-Version: lprng\n"
 "Report-Msgid-Bugs-To: csm...@debian.org\n"
 "POT-Creation-Date: 2006-08-01 21:12+1000\n"
-"PO-Revision-Date: 2004-07-23 12:17+0200\n"
-"Last-Translator: Jan Outrata <outra...@upcase.inf.upol.cz>\n"
-"Language-Team: Czech <pro...@debian.cz>\n"
+"PO-Revision-Date: 2009-06-28 17:31+0200\n"
+"Last-Translator: Jan Outrata <outr...@upcase.inf.upol.cz>\n"
+"Language-Team: Czech <debian-l10n-cz...@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: note
 #. Description
 #: ../templates:1001
 msgid "There are two lpd.conf files"
-msgstr "Existují dva soubory lpd.conf"
+msgstr "Existují dva soubory lpd.conf"
 
 #. Type: note
 #. Description
 #: ../templates:1001
-#, fuzzy
 msgid ""
 "You have a lpd.conf in the old location (/etc/lpd.conf) and the new location "
 "(/etc/lprng/lpd.conf). From lprng version 3.6.16-1 this file should be only "
 "in /etc/lprng, please check both files and remove /etc/lpd.conf"
 msgstr ""
-"Máte lpd.conf na starém místě (/etc/lpd.conf) i na novém místě (/etc/lprng/"
-"lpd.conf). Od lprng verze 3.6.16-1 by tento soubor měl být jen v /etc/lprng, "
-"zkontrolujte prosím oba soubory a odstraňte /etc/lpd.conf"
+"Máte lpd.conf na starém místÄ› (/etc/lpd.conf) i na novém místÄ› (/etc/lprng/"
+"lpd.conf). Od lprng verze 3.6.16-1 by tento soubor mÄ›l být jen v /etc/lprng, "
+"zkontrolujte prosím oba soubory a odstraĹˆte /etc/lpd.conf"
 
 #. Type: note
 #. Description
 #: ../templates:2001
 msgid "There are two lpd.perms files"
-msgstr "Existují dva soubory lpd.perms"
+msgstr "Existují dva soubory lpd.perms"
 
 #. Type: note
 #. Description
@@ -57,15 +56,15 @@
 "should be only in /etc/lprng, please check both files and remove /etc/lpd."
 "perms"
 msgstr ""
-"Máte lpd.perms na starém místě (/etc/lpd.perms) i na novém místě (/etc/lprng/"
-"lpd.perms). Od lprng verze 3.6.16-1 by tento soubor měl být jen v /etc/"
-"lprng, zkontrolujte prosím oba soubory a odstraňte /etc/lpd.perms"
+"Máte lpd.perms na starém místÄ› (/etc/lpd.perms) i na novém místÄ› (/etc/lprng/"
+"lpd.perms). Od lprng verze 3.6.16-1 by tento soubor mÄ›l být jen v /etc/"
+"lprng, zkontrolujte prosím oba soubory a odstraĹˆte /etc/lpd.perms"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
 msgid "Make lpr, lprm and lpq setuid root?"
-msgstr "Mají mít lpr, lprm a lpq nastavený SUID bit?"
+msgstr "Mají mít lpr, lprm a lpq nastavený SUID bit?"
 
 #. Type: boolean
 #. Description
@@ -78,18 +77,18 @@
 "typical printer connected locally to parallel port (and many other) scenario "
 "you can leave these programs non setuid root."
 msgstr ""
-"Pro plné vyhovění normě RFC1179 musí mít tyto programy nastavený SUID bit. "
-"Je to hlavně z důvodu možnosti vytvořit socket s nízkým číslem portu. Nízké "
-"číslo portu může být důležité, pokud máte síťové tiskárny nebo máte "
-"upravený /etc/lprng/lpd.perms s omezením přístupu k neprivilegovaným portům. "
-"Pro typický případ tiskárny připojené lokálně k paralelnímu portu (a mnoha "
-"dalším) tyto programy nastavený SUID bit mít nemusí."
+"Pro plné vyhovÄ›ní normÄ› RFC1179 musí mít tyto programy nastavený SUID bit. "
+"Je to hlavnÄ› z dĹŻvodu moĹžnosti vytvoĹ™it socket s nízkým číslem portu. Nízké "
+"číslo portu mĹŻĹže být dĹŻleĹžité, pokud máte síĹĽové tiskárny nebo máte "
+"upravený /etc/lprng/lpd.perms s omezením pĹ™ístupu k neprivilegovaným portĹŻm. "
+"Pro typický pĹ™ípad tiskárny pĹ™ipojené lokálnÄ› k paralelnímu portu (a mnoha "
+"dalĹĄím) tyto programy nastavený SUID bit mít nemusí."
 
 #. Type: boolean
 #. Description
 #: ../templates:4001
 msgid "Start lpd (Printer Daemon) at boot?"
-msgstr "Startovat lpd (Printer Daemon - Démon tiskárny) při spuštění systému?"
+msgstr "Startovat lpd (Printer Daemon - Démon tiskárny) pĹ™i spuĹĄtÄ›ní systému?"
 
 #. Type: boolean
 #. Description
@@ -102,3 +101,3 @@
-"Někteří lidé nechtějí z různých důvodů lpd startovat. Zamítnutí této volby "
-"znamená, že se lpd nebude spouštět. Pokud nevíte, proč byste nechtěli lpd "
-"spouštět, jednoduše přijměte výchozí nastavení."
+"NÄ›kteĹ™í lidé nechtÄ›jí z rĹŻzných dĹŻvodĹŻ lpd startovat. Zamítnutí této volby "
+"znamená, Ĺže se lpd nebude spouĹĄtÄ›t. Pokud nevíte, proč byste nechtÄ›li lpd "
+"spouĹĄtÄ›t, jednoduĹĄe pĹ™ijmÄ›te výchozí nastavení."
diff -u lprng-3.8.A/debian/patches/00list lprng-3.8.A/debian/patches/00list
--- lprng-3.8.A/debian/patches/00list
+++ lprng-3.8.A/debian/patches/00list
@@ -2,0 +3 @@
+20_kfreebsd_stty
only in patch2:
unchanged:
--- lprng-3.8.A.orig/debian/patches/20_kfreebsd_stty.dpatch
+++ lprng-3.8.A/debian/patches/20_kfreebsd_stty.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_kfreebsd_stty.dpatch by Petr Salinger.
+
+Fix build problem om kfreebsd.
+BTS report #537857.
+
+...@dpatch@
+--- lprng-3.8.A.orig/src/common/stty.c
++++ lprng-3.8.A/src/common/stty.c
+@@ -154,8 +154,12 @@
+     { "raw", RAW, 0, 0, 0 },
+     { "-raw", 0, RAW, 0, 0 },
+     { "tab0", TAB0, XTABS, 0, 0 },
++#ifdef TAB1
+     { "tab1", TAB1, XTABS, 0, 0 },
++#endif
++#ifdef TAB2
+     { "tab2", TAB2, XTABS, 0, 0 },
++#endif
+     { "tabs", 0, XTABS, 0, 0 },
+     { "-tabs", XTABS, 0, 0, 0 },
+     { "tandem", TANDEM, 0, 0, 0 },

Reply via email to