diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-13 02:07:03 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-13 02:08:36 -0700 |
commit | a0202fdc85ddc36b73a1c7c4f2d3ec45cd22c5e1 (patch) | |
tree | 3de17df847aae5d9a8f899619466e918992b0669 /build-aux | |
parent | 4bef92e9e02d074de1d92e30dc5ef4dd62558c80 (diff) | |
download | emacs-a0202fdc85ddc36b73a1c7c4f2d3ec45cd22c5e1.tar.gz |
Merge from Gnulib
This incorporates:
2017-09-13 all: prefer https: URLs
This just changes http: to https: in comments,
in files copied from Gnulib.
Diffstat (limited to 'build-aux')
-rwxr-xr-x | build-aux/gitlog-to-changelog | 4 | ||||
-rwxr-xr-x | build-aux/move-if-change | 6 | ||||
-rwxr-xr-x | build-aux/update-copyright | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index cf164254634..ec5ab9e141c 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"' if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2016-03-22 21:49'; # UTC +my $VERSION = '2017-09-13 06:45'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -22,7 +22,7 @@ my $VERSION = '2016-03-22 21:49'; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Written by Jim Meyering diff --git a/build-aux/move-if-change b/build-aux/move-if-change index 4dd86995921..4a65145594c 100755 --- a/build-aux/move-if-change +++ b/build-aux/move-if-change @@ -2,7 +2,7 @@ # Like mv $1 $2, but if the files are the same, just delete $1. # Status is zero if successful, nonzero otherwise. -VERSION='2016-01-11 22:04'; # UTC +VERSION='2017-09-13 06:45'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -21,7 +21,7 @@ VERSION='2016-01-11 22:04'; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. usage="usage: $0 SOURCE DEST" @@ -39,7 +39,7 @@ Report bugs to <bug-gnulib@gnu.org>." version=`expr "$VERSION" : '\([^ ]*\)'` version="move-if-change (gnulib) $version Copyright (C) 2011 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> +License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law." diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 2d20d211c9e..63455c37948 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"' if 0; # Update an FSF copyright year list to include the current year. -my $VERSION = '2016-01-12.23:13'; # UTC +my $VERSION = '2017-09-13.06:45'; # UTC # Copyright (C) 2009-2017 Free Software Foundation, Inc. # @@ -18,7 +18,7 @@ my $VERSION = '2016-01-12.23:13'; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Written by Jim Meyering and Joel E. Denny |