Control: tags 927022 + pending Dear maintainer,
I've prepared an NMU for sensible-utils (versioned as 0.0.12+nmu1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. -- Saludos, Felipe Sateler
diff -Nru sensible-utils-0.0.12/debian/changelog sensible-utils-0.0.12+nmu1/debian/changelog --- sensible-utils-0.0.12/debian/changelog 2018-03-12 07:17:53.000000000 -0300 +++ sensible-utils-0.0.12+nmu1/debian/changelog 2019-11-17 09:21:22.000000000 -0300 @@ -1,3 +1,17 @@ +sensible-utils (0.0.12+nmu1) unstable; urgency=medium + + [ Felipe Sateler ] + * Non-maintainer upload. + * Do not attempt to discover the executable path of empty variables. + Otherwise, which outputs a message like `usage: which [-as] program ... `. + Instead of invoking which without arguments, lets skip the check + (Closes: #927022) + + [ Boyuan Yang ] + * debian/control: Update Vcs-* fields and use git packaging repo under Salsa Debian group. + + -- Felipe Sateler <fsate...@debian.org> Sun, 17 Nov 2019 09:21:22 -0300 + sensible-utils (0.0.12) unstable; urgency=medium * Fix sensible-browser launches $BROWSER with empty argument diff -Nru sensible-utils-0.0.12/debian/control sensible-utils-0.0.12+nmu1/debian/control --- sensible-utils-0.0.12/debian/control 2018-03-12 07:17:53.000000000 -0300 +++ sensible-utils-0.0.12+nmu1/debian/control 2019-11-17 09:21:22.000000000 -0300 @@ -8,8 +8,8 @@ ed <!nocheck> Uploaders: Bastien Roucariès <ro...@debian.org> Standards-Version: 4.1.3 -Vcs-Git: https://anonscm.debian.org/git/collab-maint/sensible-utils.git -Vcs-Browser: https://anonscm.debian.org/git/collab-maint/sensible-utils.git +Vcs-Git: https://salsa.debian.org/debian/sensible-utils.git +Vcs-Browser: https://salsa.debian.org/debian/sensible-utils Package: sensible-utils Architecture: all diff -Nru sensible-utils-0.0.12/man/po4a/sensible-utils.pot sensible-utils-0.0.12+nmu1/man/po4a/sensible-utils.pot --- sensible-utils-0.0.12/man/po4a/sensible-utils.pot 2018-03-12 07:17:53.000000000 -0300 +++ sensible-utils-0.0.12+nmu1/man/po4a/sensible-utils.pot 1969-12-31 21:00:00.000000000 -0300 @@ -1,111 +0,0 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the sensible-utils package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: sensible-utils VERSION\n" -"POT-Creation-Date: 2018-03-12 12:18+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. type: TH -#: sensible-editor.man -#, no-wrap -msgid "SENSIBLE-EDITOR" -msgstr "" - -#. type: TH -#: sensible-editor.man -#, no-wrap -msgid "14 Nov 2010" -msgstr "" - -#. type: TH -#: sensible-editor.man -#, no-wrap -msgid "Debian" -msgstr "" - -#. type: SH -#: sensible-editor.man -#, no-wrap -msgid "NAME" -msgstr "" - -#. type: Plain text -#: sensible-editor.man -msgid "" -"sensible-editor, sensible-pager, sensible-browser - sensible editing, " -"paging, and web browsing" -msgstr "" - -#. type: SH -#: sensible-editor.man -#, no-wrap -msgid "SYNOPSIS" -msgstr "" - -#. type: Plain text -#: sensible-editor.man -msgid "B<sensible-editor> [OPTIONS...]" -msgstr "" - -#. type: Plain text -#: sensible-editor.man -msgid "B<sensible-pager> [OPTIONS...]" -msgstr "" - -#. type: Plain text -#: sensible-editor.man -msgid "B<sensible-browser> url" -msgstr "" - -#. type: SH -#: sensible-editor.man -#, no-wrap -msgid "DESCRIPTION" -msgstr "" - -#. type: Plain text -#: sensible-editor.man -msgid "" -"B<sensible-editor>, B<sensible-pager> and B<sensible-browser> make sensible " -"decisions on which editor, pager, and web browser to call, respectively. " -"Programs in Debian can use these scripts as their default editor, pager, or " -"web browser or emulate their behavior." -msgstr "" - -#. type: SH -#: sensible-editor.man -#, no-wrap -msgid "SEE ALSO" -msgstr "" - -#. type: Plain text -#: sensible-editor.man -msgid "" -"Documentation of the EDITOR, VISUAL and PAGER variables in B<environ>(7) " -"and B<select-editor>(1) for changing a user's default editor" -msgstr "" - -#. type: SH -#: sensible-editor.man -#, no-wrap -msgid "STANDARD" -msgstr "" - -#. type: Plain text -#: sensible-editor.man -msgid "" -"Documentation of behavior of sensible-utils under a debian system is " -"available under section 11.4 of debian-policy usually installed under " -"/usr/share/doc/debian-policy (you might need to install debian-policy)" -msgstr "" diff -Nru sensible-utils-0.0.12/select-editor sensible-utils-0.0.12+nmu1/select-editor --- sensible-utils-0.0.12/select-editor 2018-03-12 07:17:53.000000000 -0300 +++ sensible-utils-0.0.12+nmu1/select-editor 1969-12-31 21:00:00.000000000 -0300 @@ -1,79 +0,0 @@ -#!/bin/sh - -# To generate localization information, run: -# xgettext -o - -L Shell select-editor - -# if no gettext it will fallback to gettext on /usr/share/sensible-utils/bin -# see #728612 -PATH=$PATH:/usr/sbin:/usr/local/share/sensible-utils/bin - -# EASIEST editor -EASIEST="/bin/nano" - -# Ensure that $HOME/.selected_editor is writeable -touch $HOME/.selected_editor || exit 1 - -sorted_list_of_editors() { - update-alternatives --query editor | while read emptyline; do - # skip the first entry (header) as well as the rest of processed entries - if [ -z "$emptyline" ]; then continue; fi - - # extract the two interesting fields - local ALTERNATIVE='' - local PRIORITY='' - while read field value; do - case "${field}" in - 'Alternative:') ALTERNATIVE="${value}";; - 'Priority:') PRIORITY="${value}";; - esac - if [ -n "$ALTERNATIVE" ] && [ -n "$PRIORITY" ]; then break; fi - done - if [ -z "$ALTERNATIVE" ] || [ -z "$PRIORITY" ]; then continue; fi - - echo "${PRIORITY}:${ALTERNATIVE}" - done | sort -n -r | cut -d':' -f 2- -} - - -editors=`update-alternatives --list editor | wc -l` -if [ $editors -gt 1 ]; then - # fix simple to 1 see #777168 - simple=1 - echo - echo "`gettext 'Select an editor. To change later, run'`" "'select-editor'." - i=0 - editors=`sorted_list_of_editors` - for e in $editors; do - i=`expr $i + 1` - desc= - if [ $e = "$EASIEST" ]; then - desc=" <---- ` gettext 'easiest'`" - simple=$i - fi - echo " $i. $e$desc" - done - echo "" - selected=x - while /bin/true; do - if [ -z "$selected" -a ! -z "$simple" ]; then - selected="$simple" - elif ! test $selected -gt 0 2>/dev/null; then - echo -n "$(gettext 'Choose') 1-$i [$simple]: " - read -r selected - elif ! test $selected -le $i 2>/dev/null; then - echo -n "$(gettext 'Choose') 1-$i [$simple]: " - read -r selected - else - break - fi - done - i=0 - for e in $editors; do - i=`expr $i + 1` - if [ $i -eq $selected ]; then - echo "# Generated by /usr/bin/select-editor" > $HOME/.selected_editor - echo "SELECTED_EDITOR=\"$e\"" >> $HOME/.selected_editor && exit 0 - fi - done -fi -exit 1 diff -Nru sensible-utils-0.0.12/sensible-browser sensible-utils-0.0.12+nmu1/sensible-browser --- sensible-utils-0.0.12/sensible-browser 2018-03-12 07:17:53.000000000 -0300 +++ sensible-utils-0.0.12+nmu1/sensible-browser 2019-11-17 09:21:22.000000000 -0300 @@ -2,7 +2,7 @@ # Prevent recursive loops, where these values are set to this script p="$(which sensible-browser)" -[ "$(which $BROWSER || true)" = "$p" ] && BROWSER= +[ -n "$BROWSER" ] && [ "$(which $BROWSER || true)" = "$p" ] && BROWSER= if test -n "$BROWSER"; then ${BROWSER} "$@" diff -Nru sensible-utils-0.0.12/sensible-editor sensible-utils-0.0.12+nmu1/sensible-editor --- sensible-utils-0.0.12/sensible-editor 2013-06-05 21:10:34.000000000 -0400 +++ sensible-utils-0.0.12+nmu1/sensible-editor 2019-11-17 09:21:22.000000000 -0300 @@ -4,9 +4,9 @@ # Prevent recursive loops, where these values are set to this script p="$(which sensible-editor)" -[ "$(which $EDITOR || true)" = "$p" ] && EDITOR= -[ "$(which $VISUAL || true)" = "$p" ] && VISUAL= -[ "$(which $SELECTED_EDITOR || true)" = "$p" ] && SELECTED_EDITOR= +[ -n "$EDITOR" ] && [ "$(which $EDITOR || true)" = "$p" ] && EDITOR= +[ -n "$EDITOR" ] && [ "$(which $VISUAL || true)" = "$p" ] && VISUAL= +[ -n "$EDITOR" ] && [ "$(which $SELECTED_EDITOR || true)" = "$p" ] && SELECTED_EDITOR= if [ -n "$VISUAL" ]; then ${VISUAL} "$@" diff -Nru sensible-utils-0.0.12/sensible-pager sensible-utils-0.0.12+nmu1/sensible-pager --- sensible-utils-0.0.12/sensible-pager 2017-08-09 09:26:27.000000000 -0400 +++ sensible-utils-0.0.12+nmu1/sensible-pager 2019-11-17 09:21:22.000000000 -0300 @@ -2,7 +2,7 @@ # Prevent recursive loops, where these values are set to this script p="$(which sensible-pager)" -[ "$(which $PAGER || true)" = "$p" ] && PAGER= +[ -n "$PAGER" ] && [ "$(which $PAGER || true)" = "$p" ] && PAGER= ${PAGER:-pager} "$@" ret="$?"
