Re: gnupload

[Paul Eggert]

Simon Josefsson <address@hidden> writes:

> If coreutils is updated to sync gnupload from gnulib, which I think
> would be a good idea, please drop gnupload from gnulib's
> config/srclist.txt.

Thanks for the heads-up.  I did that, and installed the following
patches to gnulib and coreutils, respectively.

2006-08-22  Paul Eggert  <address@hidden>

        * srclist.txt: Remove gnupload, since coreutils now syncs from
        gnulib rather than the other way around.
        * srclistvars.sh (COREUTILS): Remove.

--- config/srclist.txt  22 Aug 2006 13:23:56 -0000      1.134
+++ config/srclist.txt  22 Aug 2006 19:37:41 -0000
@@ -43,7 +43,7 @@ $GNUORG/disclaim.program                      doc/Copyright
 #
 #
 # Reenable commented-out entries when next gettext is released, hopefully.
-# 
+#
 $GETTEXT/gettext-runtime/libasprintf/asnprintf.c       lib gpl
 $GETTEXT/gettext-runtime/libasprintf/asprintf.c                lib gpl
 $GETTEXT/gettext-runtime/libasprintf/printf-args.c     lib gpl
@@ -276,8 +276,6 @@ $LIBCSRC/time/mktime.c                      lib gpl
 #$LIBCSRC/sysdeps/unix/sysv/gethostname.c      lib gpl
 #$LIBCSRC/sysdeps/unix/utime.c                 lib gpl
 
-$COREUTILS/gnupload                            build-aux
-
 $LIBTOOL/libltdl/argz.c                                lib gpl
 $LIBTOOL/libltdl/argz_.h                       lib gpl
 $LIBTOOL/libltdl/m4/argz.m4                    m4
--- config/srclistvars.sh       14 Aug 2006 18:28:31 -0000      1.27
+++ config/srclistvars.sh       22 Aug 2006 19:37:41 -0000
@@ -24,7 +24,6 @@ case $LOGNAME in
 jas | eggert)
   : ${AUTOCONF=../autoconf}
   : ${AUTOMAKE=../automake}
-  : ${COREUTILS=../coreutils}
   : ${GETTEXT=../gettext}
   : ${GNUCONFIG=../config}
   : ${GNUORG=../gnuorg}
@@ -42,7 +41,6 @@ karl)
   : ${TEXMFROOT=/usr/local/texmf/texmf-dist}
   : ${AUTOCONF=../autoconf}
   : ${AUTOMAKE=../automake}
-  : ${COREUTILS=../coreutils}
   : ${EMACSSRC=../emacs}
   : ${GETTEXT=../gettext}
   : ${GNUCONFIG=../config}


2006-08-22  Paul Eggert  <address@hidden>

        * bootstrap.conf (gnulib_modules): Add gnupload.
        * Makefile.maint (emit_upload_commands): gnupload is now
        in build-aux.
        * gnupload: Remove from CVS, since it's now a gnulib module.

--- bootstrap.conf      22 Aug 2006 19:19:57 -0000      1.2
+++ bootstrap.conf      22 Aug 2006 19:36:23 -0000      1.3
@@ -44,7 +44,7 @@ gnulib_modules="
        fileblocks filemode filenamecat fnmatch-gnu fopen-safer
        fprintftime fsusage ftruncate fts getdate getgroups gethrxtime
        getline getloadavg getndelim2 getopt getpagesize getpass-gnu
-       gettext gettime gettimeofday getugroups getusershell
+       gettext gettime gettimeofday getugroups getusershell gnupload
        group-member hard-locale hash hash-pjw host-os human idcache
        inttostr lchmod lchown lib-ignore linebuffer link-follow
        long-options lstat malloc mbswidth md5 memcasecmp mempcpy
--- Makefile.maint      22 Aug 2006 10:13:37 -0000      1.246
+++ Makefile.maint      22 Aug 2006 19:36:23 -0000      1.247
@@ -587,7 +587,7 @@ cvs-update:
 emit_upload_commands:
        @echo =====================================
        @echo =====================================
-       @echo "$(srcdir)/gnupload $(GNUPLOADFLAGS) \\"
+       @echo "$(srcdir)/build-aux/gnupload $(GNUPLOADFLAGS) \\"
        @echo "    --to $(gnu_rel_host):coreutils \\"
        @echo "  $(rel-files)"
        @echo '# send the /tmp/announcement e-mail'