diff -Nru debianutils-4.10/acinclude.m4 debianutils-4.11/acinclude.m4 --- debianutils-4.10/acinclude.m4 2020-05-23 12:03:00.000000000 +0000 +++ debianutils-4.11/acinclude.m4 2020-05-25 12:53:16.000000000 +0000 @@ -1 +1 @@ -define(DEBIANUTILS_VERSION, 4.9.3) +define(DEBIANUTILS_VERSION, 4.11) diff -Nru debianutils-4.10/configure debianutils-4.11/configure --- debianutils-4.10/configure 2020-05-23 12:06:47.000000000 +0000 +++ debianutils-4.11/configure 2020-05-25 12:54:30.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for debianutils 4.9.3. +# Generated by GNU Autoconf 2.69 for debianutils 4.11. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='debianutils' PACKAGE_TARNAME='debianutils' -PACKAGE_VERSION='4.9.3' -PACKAGE_STRING='debianutils 4.9.3' +PACKAGE_VERSION='4.11' +PACKAGE_STRING='debianutils 4.11' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures debianutils 4.9.3 to adapt to many kinds of systems. +\`configure' configures debianutils 4.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1341,7 +1341,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of debianutils 4.9.3:";; + short | recursive ) echo "Configuration of debianutils 4.11:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -debianutils configure 4.9.3 +debianutils configure 4.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1685,7 +1685,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by debianutils $as_me 4.9.3, which was +It was created by debianutils $as_me 4.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2548,7 +2548,7 @@ # Define the identity of the package. PACKAGE='debianutils' - VERSION='4.9.3' + VERSION='4.11' cat >>confdefs.h <<_ACEOF @@ -4863,7 +4863,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by debianutils $as_me 4.9.3, which was +This file was extended by debianutils $as_me 4.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4920,7 +4920,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -debianutils config.status 4.9.3 +debianutils config.status 4.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru debianutils-4.10/debian/changelog debianutils-4.11/debian/changelog --- debianutils-4.10/debian/changelog 2020-05-24 23:40:59.000000000 +0000 +++ debianutils-4.11/debian/changelog 2020-05-25 12:54:30.000000000 +0000 @@ -1,3 +1,9 @@ +debianutils (4.11) unstable; urgency=medium + + * Drop symlink, so that which will only be available in /usr/bin. + + -- Clint Adams Mon, 25 May 2020 08:54:30 -0400 + debianutils (4.10) unstable; urgency=medium * installkernel: stay in /sbin. closes: #961476. diff -Nru debianutils-4.10/debian/postinst debianutils-4.11/debian/postinst --- debianutils-4.10/debian/postinst 2020-05-23 00:02:54.000000000 +0000 +++ debianutils-4.11/debian/postinst 2020-05-25 12:51:26.000000000 +0000 @@ -7,10 +7,6 @@ case "$1" in configure) - if [ ! -e /usr/bin/which ] - then - ln -s /bin/which /usr/bin/which - fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff -Nru debianutils-4.10/debian/postrm debianutils-4.11/debian/postrm --- debianutils-4.10/debian/postrm 2020-05-23 00:02:54.000000000 +0000 +++ debianutils-4.11/debian/postrm 2020-05-25 12:51:32.000000000 +0000 @@ -4,9 +4,6 @@ case "$1" in remove|disappear) - if test -L /usr/bin/which; then - rm /usr/bin/which - fi ;; upgrade|failed-upgrade|purge|abort-install|abort-upgrade) ;; diff -Nru debianutils-4.10/debian/rules debianutils-4.11/debian/rules --- debianutils-4.10/debian/rules 2020-05-24 23:38:48.000000000 +0000 +++ debianutils-4.11/debian/rules 2020-05-25 12:54:02.000000000 +0000 @@ -63,7 +63,6 @@ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp INSTALL_PROGRAM="$(INSTALL_PROGRAM)" mv debian/tmp/usr/bin/run-parts \ debian/tmp/usr/bin/tempfile \ - debian/tmp/usr/bin/which \ debian/tmp/bin/ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) @@ -114,8 +113,6 @@ binary: binary-indep binary-arch prebuild: - printf "define(DEBIANUTILS_VERSION, %s)\n" $$(dpkg-parsechangelog | sed -n '/^Version: \(.*\)$$/ {s//\1/;p}') >acinclude.m4 - autoreconf -fi $(RM) -rf autom4te.cache diff -Nru debianutils-4.10/debian/tests/smoke debianutils-4.11/debian/tests/smoke --- debianutils-4.10/debian/tests/smoke 2019-12-07 02:30:00.000000000 +0000 +++ debianutils-4.11/debian/tests/smoke 2020-05-25 12:49:44.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh -e run-parts --version -tempfile +tempfile 2>&1 which sh ischroot --version savelog