aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-01-01 13:43:26 -0800
committerPaul Eggert2015-01-01 14:25:30 -0800
commit647c7c9a726c4f6d29cc8f932e434555f1d0aed8 (patch)
tree2d482a49b0b51d9e45c556f81a0626589b6e4f69
parent035f5aaa91ebd40598e0d89881bbc3cf532440a0 (diff)
downloademacs-647c7c9a726c4f6d29cc8f932e434555f1d0aed8.tar.gz
emacs-647c7c9a726c4f6d29cc8f932e434555f1d0aed8.zip
* update-copyright (emacsver): Change to emacsver.tex.in.
-rw-r--r--admin/ChangeLog6
-rwxr-xr-xadmin/update-copyright4
2 files changed, 7 insertions, 3 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index b32d7004517..f311eea696c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12015-01-01 Paul Eggert <eggert@cs.ucla.edu>
2
3 * update-copyright (emacsver): Change to emacsver.tex.in.
4
12014-12-24 Glenn Morris <rgm@gnu.org> 52014-12-24 Glenn Morris <rgm@gnu.org>
2 6
3 * authors.el (authors-obsolete-files-regexps) 7 * authors.el (authors-obsolete-files-regexps)
@@ -2502,7 +2506,7 @@
2502;; coding: utf-8 2506;; coding: utf-8
2503;; End: 2507;; End:
2504 2508
2505 Copyright (C) 2001-2014 Free Software Foundation, Inc. 2509 Copyright (C) 2001-2015 Free Software Foundation, Inc.
2506 2510
2507 This file is part of GNU Emacs. 2511 This file is part of GNU Emacs.
2508 2512
diff --git a/admin/update-copyright b/admin/update-copyright
index 5612d7f7386..459ee83ac1d 100755
--- a/admin/update-copyright
+++ b/admin/update-copyright
@@ -7,7 +7,7 @@
7# By default, this script uses the local-time calendar year. 7# By default, this script uses the local-time calendar year.
8# Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default. 8# Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default.
9 9
10# Copyright 2013-2014 Free Software Foundation, Inc. 10# Copyright 2013-2015 Free Software Foundation, Inc.
11 11
12# This file is part of GNU Emacs. 12# This file is part of GNU Emacs.
13 13
@@ -37,7 +37,7 @@ export UPDATE_COPYRIGHT_USE_INTERVALS
37: ${UPDATE_COPYRIGHT_YEAR=$(date +%Y)} 37: ${UPDATE_COPYRIGHT_YEAR=$(date +%Y)}
38export UPDATE_COPYRIGHT_YEAR 38export UPDATE_COPYRIGHT_YEAR
39 39
40emacsver=etc/refcards/emacsver.tex 40emacsver=etc/refcards/emacsver.tex.in
41sed 's/\\def\\year[{][0-9]*[}]/\\def\\year{'"$UPDATE_COPYRIGHT_YEAR"'}'/g \ 41sed 's/\\def\\year[{][0-9]*[}]/\\def\\year{'"$UPDATE_COPYRIGHT_YEAR"'}'/g \
42 $emacsver >$emacsver.aux && 42 $emacsver >$emacsver.aux &&
43{ cmp -s $emacsver $emacsver.aux || 43{ cmp -s $emacsver $emacsver.aux ||