Control: tags 874261 + patch Control: tags 874261 + pending Dear maintainer,
I've prepared an NMU for ncftp (versioned as 2:3.2.5-2.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed
diff -Nru ncftp-3.2.5/debian/changelog ncftp-3.2.5/debian/changelog --- ncftp-3.2.5/debian/changelog 2016-07-02 14:31:26.000000000 +0300 +++ ncftp-3.2.5/debian/changelog 2018-06-24 17:41:59.000000000 +0300 @@ -1,3 +1,11 @@ +ncftp (2:3.2.5-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix sh/autoconfall.sh, based on a fix from Helmut Grohne. + (Closes: #874261) + + -- Adrian Bunk <b...@debian.org> Sun, 24 Jun 2018 17:41:59 +0300 + ncftp (2:3.2.5-2) unstable; urgency=medium * acknowledge the NMU: Thanks Jakub and Lucas! closes: #666352 diff -Nru ncftp-3.2.5/debian/patches/autoreconf.patch ncftp-3.2.5/debian/patches/autoreconf.patch --- ncftp-3.2.5/debian/patches/autoreconf.patch 1970-01-01 02:00:00.000000000 +0200 +++ ncftp-3.2.5/debian/patches/autoreconf.patch 2018-06-24 17:41:59.000000000 +0300 @@ -0,0 +1,47 @@ +Description: Fix sh/autoconfall.sh +Author: Helmut Grohne <hel...@subdivi.de> +Author: Adrian Bunk <b...@debian.org> +Bug-Debian: https://bugs.debian.org/874261 + +--- ncftp-3.2.5.orig/sh/autoconfall.sh ++++ ncftp-3.2.5/sh/autoconfall.sh +@@ -1,13 +1,5 @@ + #!/bin/sh + +-PROJECT_HOME="$HOME/src/ncftp/current" +-AUTOCONF_BIN="/usr/local/autoconf-2.13/bin" +-if [ ! -d "$PROJECT_HOME" ] ; then +- /bin/ls -ld "$PROJECT_HOME" +- exit 1 +-fi +-cd "$PROJECT_HOME" +- + a=`pwd` + first=yes + didone=no +@@ -16,7 +8,6 @@ for f in \ + sio/configure.in \ + Strn/configure.in \ + libncftp/configure.in \ +- "$HOME"/src/libncftp/current/libncftp/configure.in \ + ; do + abs=no + case "$f" in +@@ -32,7 +23,7 @@ for f in \ + is_diff=no + + /bin/mv config.h.in config.h.in.orig 2>/dev/null +- "$AUTOCONF_BIN"/autoheader 2>&1 | fgrep -v AC_TRY_RUN ++ autoheader2.13 2>&1 | fgrep -v AC_TRY_RUN + if [ ! -f config.h.in ] ; then + echo "* Warning: config.h.in not generated" + if [ -f config.h.in.orig ] ; then +@@ -51,7 +42,7 @@ for f in \ + fi + + /bin/mv configure configure.orig 2>/dev/null +- "$AUTOCONF_BIN"/autoconf 2>&1 | fgrep -v AC_TRY_RUN ++ autoconf2.13 -l autoconf_local 2>&1 | fgrep -v AC_TRY_RUN + if [ ! -f configure ] ; then + echo "* Warning: configure not generated" + if [ -f configure.orig ] ; then diff -Nru ncftp-3.2.5/debian/patches/series ncftp-3.2.5/debian/patches/series --- ncftp-3.2.5/debian/patches/series 2016-07-01 20:42:48.000000000 +0300 +++ ncftp-3.2.5/debian/patches/series 2018-06-24 17:40:13.000000000 +0300 @@ -1,2 +1,3 @@ ncftp-352425.patch ncftp-reproducible.patch +autoreconf.patch