diff -Nru sysvinit-2.96/debian/changelog sysvinit-2.96/debian/changelog --- sysvinit-2.96/debian/changelog 2020-10-25 02:04:47.000000000 +0000 +++ sysvinit-2.96/debian/changelog 2021-03-17 17:02:02.000000000 +0000 @@ -1,3 +1,26 @@ +sysvinit (2.96-6ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + * Dropped changes, no longer needed: + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Wed, 17 Mar 2021 10:02:02 -0700 + +sysvinit (2.96-6) unstable; urgency=medium + + [ Matthew Vernon ] + * Team upload + * Recommend orphan-sysvinit-scripts (Closes: #981801) + * Update Spanish translation (thanks to Javier Fernández-Sanguino) + (Closes: #981479) + + [ Adam Borowski ] + * Update Brazillian translations (thanks to Adriano Rafael Gomes) + (Closes: #972837) + + -- Matthew Vernon Sun, 21 Feb 2021 13:53:09 +0000 + sysvinit (2.96-5ubuntu1) hirsute; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru sysvinit-2.96/debian/control sysvinit-2.96/debian/control --- sysvinit-2.96/debian/control 2020-09-10 21:14:57.000000000 +0000 +++ sysvinit-2.96/debian/control 2021-02-21 21:14:10.000000000 +0000 @@ -37,6 +37,8 @@ runit-init, Suggests: bootlogd, +Recommends: + orphan-sysvinit-scripts, Description: System-V-like init This package contains programs required for booting a Debian system and doing basic process management. diff -Nru sysvinit-2.96/debian/patches/fix-glibc.patch sysvinit-2.96/debian/patches/fix-glibc.patch --- sysvinit-2.96/debian/patches/fix-glibc.patch 2018-10-04 15:32:29.000000000 +0000 +++ sysvinit-2.96/debian/patches/fix-glibc.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: Make mountpoint.c compile with new glibc. -Author: Dimitri John Ledkov - ---- sysvinit-2.88dsf.orig/src/mountpoint.c -+++ sysvinit-2.88dsf/src/mountpoint.c -@@ -23,6 +23,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include - #include - #include - #include diff -Nru sysvinit-2.96/debian/patches/series sysvinit-2.96/debian/patches/series --- sysvinit-2.96/debian/patches/series 2020-09-10 21:14:58.000000000 +0000 +++ sysvinit-2.96/debian/patches/series 2021-03-17 17:02:02.000000000 +0000 @@ -1,5 +1,4 @@ 11_run_nologin.patch -fix-glibc.patch 0002-Fix-FTBFS-on-kfreebsd-any.patch 0003-Fix-formatting-of-bootlogd-8.patch 0004-fix-manpage-typo.patch diff -Nru sysvinit-2.96/debian/po/es.po sysvinit-2.96/debian/po/es.po --- sysvinit-2.96/debian/po/es.po 2020-09-10 21:14:58.000000000 +0000 +++ sysvinit-2.96/debian/po/es.po 2021-02-21 21:14:11.000000000 +0000 @@ -6,7 +6,7 @@ # - Initial translation # Francisco Javier Cuadrado , 2009 # - Translation update -# Javier Fernández-Sanguino , 2012 +# Javier Fernández-Sanguino , 2012, 2020 # # Traductores, si no conocen el formato PO, merece la pena leer la # documentación de gettext, especialmente las secciones dedicadas a este @@ -31,20 +31,21 @@ "Project-Id-Version: sysvinit 2.87dsf-5\n" "Report-Msgid-Bugs-To: sysvinit@packages.debian.org\n" "POT-Creation-Date: 2018-10-26 08:14+0000\n" -"PO-Revision-Date: 2012-09-05 16:29+0200\n" +"PO-Revision-Date: 2021-01-31 19:43+0100\n" "Last-Translator: Javier Fernández-Sanguino \n" "Language-Team: Debian l10n Spanish \n" -"Language: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POFile-SpellExtra: sysv dpkg SUGGESTION rc\n" +"X-POFile-SpellExtra: sysv dpkg SUGGESTION rc libexec console inittab\n" +"X-POFile-SpellExtra: sysvinit getty new old Hurd hurd\n" #. Type: boolean #. Description #: ../sysvinit-core.templates:1001 msgid "Update getty pathnames and add hurd-console?" -msgstr "" +msgstr "¿Actualizar las rutas de getty y añadir «hurd-console»?" #. Type: boolean #. Description @@ -56,6 +57,11 @@ "Hurd system for long, so any errors in that file would not have shown up " "earlier." msgstr "" +"Su «/etc/inittab» parece que utiliza /libexec/getty como getty y/o no tiene " +"la entrada «hurd-console». El fichero «inittab» por omisión ha cambiado, " +"pero su «/etc/inittab» no se ha modificado. Tenga en cuenta que sysvinit no " +"se ha utilizado para arrancar un sistema Hurd desde hace mucho, por lo que " +"los problemas en ese fichero no se podían haber mostrado antes." #. Type: boolean #. Description @@ -63,6 +69,8 @@ msgid "" "If you allow this change, a backup will be stored in /etc/inittab.dpkg-old." msgstr "" +"Se guardará una copia de seguridad del fichero en «/etc/inittab.dpkg-old» si " +"permite que se realice este cambio." #. Type: boolean #. Description @@ -72,6 +80,9 @@ "inittab.dpkg-new. Please review the changes and update your /etc/inittab " "accordingly." msgstr "" +"Si no quiere hacer esta modificación, se generará un fichero inittab " +"actualizado en «/etc/inittab.dpkg-new». Revise los cambios y actualice su " +"fichero «/etc/inittab» como sea necesario." #~ msgid "Unable to migrate to dependency-based boot system" #~ msgstr "" diff -Nru sysvinit-2.96/debian/po/pt_BR.po sysvinit-2.96/debian/po/pt_BR.po --- sysvinit-2.96/debian/po/pt_BR.po 2020-09-10 21:14:58.000000000 +0000 +++ sysvinit-2.96/debian/po/pt_BR.po 2021-02-21 21:14:11.000000000 +0000 @@ -1,15 +1,15 @@ # Debconf translations for sysvinit. # Copyright (C) 2009 THE sysvinit'S COPYRIGHT HOLDER # This file is distributed under the same license as the sysvinit package. -# Adriano Rafael Gomes , 2009, 2010, 2012. +# Adriano Rafael Gomes , 2009-2020. # msgid "" msgstr "" "Project-Id-Version: sysvinit 2.88dsf-32.1\n" "Report-Msgid-Bugs-To: sysvinit@packages.debian.org\n" "POT-Creation-Date: 2018-10-26 08:14+0000\n" -"PO-Revision-Date: 2012-09-05 19:34-0300\n" -"Last-Translator: Adriano Rafael Gomes \n" +"PO-Revision-Date: 2020-09-12 18:59-0300\n" +"Last-Translator: Adriano Rafael Gomes \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -21,7 +21,7 @@ #. Description #: ../sysvinit-core.templates:1001 msgid "Update getty pathnames and add hurd-console?" -msgstr "" +msgstr "Atualizar nomes dos caminhos do getty e adicionar hurd-console?" #. Type: boolean #. Description @@ -33,6 +33,11 @@ "Hurd system for long, so any errors in that file would not have shown up " "earlier." msgstr "" +"Seu arquivo /etc/inittab parece usar /libexec/getty como getty e/ou faltar " +"uma entrada hurd-console. A inittab padrão foi alterada, portanto seu " +"arquivo /etc/inittab foi modificado. Note que o sysvinit não tem sido usado " +"para inicializar um sistema Hurd por muito tempo, de modo que quaisquer " +"erros nesse arquivo não teriam aparecido antes." #. Type: boolean #. Description @@ -40,6 +45,8 @@ msgid "" "If you allow this change, a backup will be stored in /etc/inittab.dpkg-old." msgstr "" +"Se você permitir essa alteração, uma cópia de segurança será armazenada em /" +"etc/inittab.dpkg-old." #. Type: boolean #. Description @@ -49,6 +56,9 @@ "inittab.dpkg-new. Please review the changes and update your /etc/inittab " "accordingly." msgstr "" +"Se você não permitir essa alteração, uma inittab atualizada será escrita em /" +"etc/inittab.dpkg-new. Por favor, revise as alterações e atualize seu " +"arquivo /etc/inittab de acordo." #~ msgid "Unable to migrate to dependency-based boot system" #~ msgstr ""