summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
+2015-01-01 Paul Eggert <eggert@cs.ucla.edu>
+
+ * update-copyright (emacsver): Change to emacsver.tex.in.
+
2014-12-24 Glenn Morris <rgm@gnu.org>
* authors.el (authors-obsolete-files-regexps)
@@ -2502,7 +2506,7 @@
;; coding: utf-8
;; End:
- Copyright (C) 2001-2014 Free Software Foundation, Inc.
+ Copyright (C) 2001-2015 Free Software Foundation, Inc.
This file is part of GNU Emacs.
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 @@
# By default, this script uses the local-time calendar year.
# Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default.
-# Copyright 2013-2014 Free Software Foundation, Inc.
+# Copyright 2013-2015 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@@ -37,7 +37,7 @@ export UPDATE_COPYRIGHT_USE_INTERVALS
: ${UPDATE_COPYRIGHT_YEAR=$(date +%Y)}
export UPDATE_COPYRIGHT_YEAR
-emacsver=etc/refcards/emacsver.tex
+emacsver=etc/refcards/emacsver.tex.in
sed 's/\\def\\year[{][0-9]*[}]/\\def\\year{'"$UPDATE_COPYRIGHT_YEAR"'}'/g \
$emacsver >$emacsver.aux &&
{ cmp -s $emacsver $emacsver.aux ||