Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package usrmerge [ Reason ] Adds a new translation and removes years-dead code. [ Impact ] Spanish users will miss the translation for a package which is going to be used to upgrade all Debian systems. [ Tests ] I do not believe that this package can be automatically tested. [ Risks ] Not really. [ Checklist ] [X] all changes are documented in the d/changelog [X] I reviewed all changes and I approve them [X] attach debdiff against the package in testing [ Other info ] (Anything else the release team should know.) unblock usrmerge/25 -- ciao, Marco
diff -Nru usrmerge-24/debian/changelog usrmerge-25/debian/changelog --- usrmerge-24/debian/changelog 2021-01-16 06:02:21.000000000 +0100 +++ usrmerge-25/debian/changelog 2021-04-27 01:21:48.000000000 +0200 @@ -1,3 +1,12 @@ +usrmerge (25) unstable; urgency=medium + + * Remove prerm, which has not been needed or even possibly used since + usrmerge version 19 started removing /etc/dpkg/dpkg.cfg.d/usrmerge on + upgrades. (Closes: #982867) + * New debconf translation(s): es. (Closes: #987519) + + -- Marco d'Itri <m...@linux.it> Tue, 27 Apr 2021 01:21:48 +0200 + usrmerge (24) unstable; urgency=medium * Moved the scripts to /usr/lib/usrmerge/ on request of Ubuntu for better diff -Nru usrmerge-24/debian/po/es.po usrmerge-25/debian/po/es.po --- usrmerge-24/debian/po/es.po 1970-01-01 01:00:00.000000000 +0100 +++ usrmerge-25/debian/po/es.po 2021-04-27 01:17:21.000000000 +0200 @@ -0,0 +1,54 @@ +# usrmerge po-debconf translation to Spanish. +# Copyright (C) 2021 +# This file is distributed under the same license as the usrmerge package. +# Camaleón <noela...@gmail.com>, 2021. +# +msgid "" +msgstr "" +"Project-Id-Version: usrmerge\n" +"Report-Msgid-Bugs-To: usrme...@packages.debian.org\n" +"POT-Creation-Date: 2016-02-12 03:06+0100\n" +"PO-Revision-Date: 2021-04-14 08:41+0200\n" +"Last-Translator: Camaleón <noela...@gmail.com>\n" +"Language-Team: Debian Spanish <debian-l10n-span...@lists.debian.org>\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: title +#. Description +#: ../usrmerge.templates:1001 +msgid "Automatic conversion to merged /usr" +msgstr "Conversión automática a /usr combinado" + +#. Type: boolean +#. Description +#: ../usrmerge.templates:2001 +msgid "" +"Do you want to convert this system to the merged /usr directories scheme?" +msgstr "" +"¿Desea configurar este sistema para usar el esquema de directorios " +"combinados /usr?" + +#. Type: boolean +#. Description +#: ../usrmerge.templates:2001 +msgid "" +"The usrmerge package will automatically convert the system to the merged /" +"usr directory scheme, in which the /{bin,sbin,lib}/ directories are " +"symlinked to their counterparts in /usr/." +msgstr "" +"El paquete usrmerge ajustará automáticamente el sistema para utilizar " +"un esquema de directorios combinados /usr, en el que los directorios " +"/{bin,sbin,lib}/ están enlazados simbólicamente con sus homólogos en /usr/." + +#. Type: boolean +#. Description +#: ../usrmerge.templates:2001 +msgid "" +"There is no automatic method to restore the precedent configuration, so " +"there is no going back once the conversion has been started." +msgstr "" +"No existe un método automático para restablecer la configuración anterior, " +"por lo que una vez iniciado el proceso de conversión, no podrá revertirlo." diff -Nru usrmerge-24/debian/usrmerge.prerm usrmerge-25/debian/usrmerge.prerm --- usrmerge-24/debian/usrmerge.prerm 2016-02-28 01:53:38.000000000 +0100 +++ usrmerge-25/debian/usrmerge.prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -#!/bin/sh -e - -can_remove() { - dpkgconf='/etc/dpkg/dpkg.cfg.d/usrmerge' - - [ -e "$dpkgconf" ] || return 0 - - local pkgs="$(awk '/^# [^ ]+$/ { print $2 }' $dpkgconf)" - [ "$pkgs" ] || return 0 - - local installed="$(dpkg-query --showformat='${Package}\n' --show $pkgs 2> /dev/null)" - - if [ "$installed" ]; then - cat <<END - -Some installed packages have not yet been converted to support usrmove: -$installed - -If you remove this package then updating them will fail. -Please delete $dpkgconf to confirm that you understand this. - -END - exit 1 - fi -} - -case "$1" in - remove) - # check if the package can be safely removed - can_remove - ;; -esac - -#DEBHELPER# -
signature.asc
Description: PGP signature