Bug#544991: Patch using in NMU for version 3.8.A-2.2
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 <pere@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�u�Lopes <andrelop@debian.org>, 2007.
+# Eder L. Marques (frolic) <frolic@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: csmall@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�u�Lopes <andrelop@debian.org>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"PO-Revision-Date: 2008-08-20 11:20-0300\n"
+"Last-Translator: Eder L. Marques (frolic) <frolic@debian-ce.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@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�ossui 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�3.6.16-"
-"1, esse arquivo deveria estar somente no diret� /etc/lprng. Por favor, "
-"cheque ambos os arquivos e remova o arquivo /etc/lpd.conf."
+"Voc�em um arquivo lpd.conf em uma localiza� antiga (/etc/lpd.conf) e na "
+"nova localiza� (/etc/lprng/lpd.conf). A partir da vers�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�ossui 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�3.6.16-"
-"1, esse arquivo deveria estar somente no diret� /etc/lprng. Por favor, "
-"cheque ambos os arquivos e remova o arquivo /etc/lpd.perms."
+"Voc�em um arquivo lpd.perms em uma localiza� antiga (/etc/lpd.perms) e "
+"na nova localiza� (/etc/lprng/lpd.perms). A partir da vers�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�recisa tornar esses programas "
-"setuid root. Isto se deve principalmente a a eles poderem criar um socket "
-"com um n� de porta baixo. O n� de porta baixo pode ser importante "
-"caso voc�ossua impressoras de rede ou tenha ajustado o arquivo /etc/lprng/"
-"lpd.perms para restringir o acesso a portas n�privilegiadas. Para o t�co "
-"cen�o da impressora conectada localmente a porta paralela (e muitos "
-"outros) voc�ode manter esses progrmas sem o bit stuid root ligado."
+"Para compatibilidade total com a RFC1179 voc�recisa tornar esses programas "
+"setuid root. Isto se deve principalmente a eles poderem criar um socket com "
+"um n� de porta baixo. O n� de porta baixo pode ser importante caso "
+"voc�ossua impressoras de rede ou tenha ajustado o arquivo /etc/lprng/lpd."
+"perms para restringir o acesso a portas n�privilegiadas. Para o t�co "
+"cen�o da impressora conectada localmente �orta paralela (e muitos "
+"outros) voc�ode 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� na inicializa� da m�ina ?"
+msgstr "Iniciar o lpd (Daemon de Impress� na inicializa� da m�ina?"
#. Type: boolean
#. Description
@@ -106,3 +99,3 @@
-"Algumas pessoas, por v�as raz� n�desejam iniciar o lpd. Caso voc��"
-"aceite esta op� o lpd n�ser�niciado. A menos que voc�ealmente n�"
-"deseje que o lpd seja iniciado, aceite o padr�"
+"Algumas pessoas por v�as raz�n�desejam iniciar o lpd. Recusando esta "
+"op� significa que o lpd n�ir�niciar. A menos que voc�aiba por que "
+"quer que o lpd n�inicie, apenas aceite o padr�"
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: csmall@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 <outrataj@upcase.inf.upol.cz>\n"
-"Language-Team: Czech <provoz@debian.cz>\n"
+"PO-Revision-Date: 2009-06-28 17:31+0200\n"
+"Last-Translator: Jan Outrata <outrata@upcase.inf.upol.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@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�va soubory lpd.conf"
+msgstr "Existuj�va 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� lpd.conf na star�m��/etc/lpd.conf) i na nov�m��/etc/lprng/"
-"lpd.conf). Od lprng verze 3.6.16-1 by tento soubor m�b� v /etc/lprng, "
-"zkontrolujte pros�oba soubory a odstra�/etc/lpd.conf"
+"M� lpd.conf na star�m��� (/etc/lpd.conf) i na nov�m��� (/etc/lprng/"
+"lpd.conf). Od lprng verze 3.6.16-1 by tento soubor m��l b� v /etc/lprng, "
+"zkontrolujte pros�oba soubory a odstra��te /etc/lpd.conf"
#. Type: note
#. Description
#: ../templates:2001
msgid "There are two lpd.perms files"
-msgstr "Existuj�va soubory lpd.perms"
+msgstr "Existuj�va 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� lpd.perms na star�m��/etc/lpd.perms) i na nov�m��/etc/lprng/"
-"lpd.perms). Od lprng verze 3.6.16-1 by tento soubor m�b� v /etc/"
-"lprng, zkontrolujte pros�oba soubory a odstra�/etc/lpd.perms"
+"M� lpd.perms na star�m��� (/etc/lpd.perms) i na nov�m��� (/etc/lprng/"
+"lpd.perms). Od lprng verze 3.6.16-1 by tento soubor m��l b� v /etc/"
+"lprng, zkontrolujte pros�oba soubory a odstra��te /etc/lpd.perms"
#. Type: boolean
#. Description
#: ../templates:3001
msgid "Make lpr, lprm and lpq setuid root?"
-msgstr "Maj��lpr, lprm a lpq nastaven� bit?"
+msgstr "Maj��lpr, lprm a lpq nastaven� 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�yhov� norm�FC1179 mus��tyto programy nastaven� bit. "
-"Je to hlavn� d� mo�nosti vytvo�ocket s n��lem portu. N��
-"�lo portu m��e�it�pokud m� s�v�isk�y nebo m� "
-"upraven�/lprng/lpd.perms s omezen�p�pu k neprivilegovan�t�
-"Pro typick�ad tisk�y p�en�ok�� paraleln� portu (a mnoha "
-"dal�� tyto programy nastaven� bit m�nemus�
+"Pro pln�yhov��n�orm�� RFC1179 mus��tyto programy nastaven� bit. "
+"Je to hlavn�� z důvodu možnosti vytvo��it socket s n���em portu. N��
+"���o portu může b�ležit�pokud m� s�ov�isk�y nebo m� "
+"upraven�/lprng/lpd.perms s omezen�p���upu k neprivilegovan�tům. "
+"Pro typick��d tisk�y p��ipojen�ok��� k paraleln� portu (a mnoha "
+"dalš� tyto programy nastaven� bit m�nemus�
#. Type: boolean
#. Description
#: ../templates:4001
msgid "Start lpd (Printer Daemon) at boot?"
-msgstr "Startovat lpd (Printer Daemon - D�n tisk�y) p�u�t� syst�?"
+msgstr "Startovat lpd (Printer Daemon - D�n tisk�y) p��i spušt��n�yst�?"
#. Type: boolean
#. Description
@@ -102,3 +101,3 @@
-"N�e�d�echt� z r�h d� lpd startovat. Zam�ut�� volby "
-"znamen��e se lpd nebude spou�t� Pokud nev�, pro�yste necht� lpd "
-"spou�t� jednodu�e p�te v� nastaven�
+"N��kte���id�echt��j� různ��vodů lpd startovat. Zam�ut�� volby "
+"znamen�že se lpd nebude spoušt��t. Pokud nev�, pro�� byste necht��li lpd "
+"spoušt��t, jednoduše p��ijm��te v� 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 to: