[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100639: Update short copyright year to 2012 (do not merge to trunk)

[Glenn Morris]

------------------------------------------------------------
revno: 100639
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Tue 2012-01-10 00:32:46 -0800
message:
  Update short copyright year to 2012 (do not merge to trunk)
  
  * etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex:
  * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex:
  * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex:
  * etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex:
  * etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex:
  * etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex:
  * etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex:
  * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex:
  * etc/refcards/sk-survival.tex, etc/refcards/survival.tex:
  * etc/refcards/vipcard.tex, etc/refcards/viperCard.tex:
  * lib-src/ebrowse.c (version) <emacs_copyright>:
  * lib-src/etags.c (print_version) <emacs_copyright>:
  * lib-src/rcs2log (Copyright):
  * lisp/version.el (emacs-copyright):
  * nextstep/Cocoa/Emacs.base/Contents/Info.plist:
  * 
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
  * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
  Update short copyright year to 2012.
modified:
  etc/ChangeLog
  etc/refcards/calccard.tex
  etc/refcards/cs-dired-ref.tex
  etc/refcards/cs-refcard.tex
  etc/refcards/cs-survival.tex
  etc/refcards/de-refcard.tex
  etc/refcards/dired-ref.tex
  etc/refcards/fr-dired-ref.tex
  etc/refcards/fr-refcard.tex
  etc/refcards/fr-survival.tex
  etc/refcards/orgcard.tex
  etc/refcards/pl-refcard.tex
  etc/refcards/pt-br-refcard.tex
  etc/refcards/refcard.tex
  etc/refcards/ru-refcard.tex
  etc/refcards/sk-dired-ref.tex
  etc/refcards/sk-refcard.tex
  etc/refcards/sk-survival.tex
  etc/refcards/survival.tex
  etc/refcards/vipcard.tex
  etc/refcards/viperCard.tex
  lib-src/ChangeLog
  lib-src/ebrowse.c
  lib-src/etags.c
  lib-src/rcs2log
  lisp/ChangeLog
  lisp/version.el
  nextstep/ChangeLog
  nextstep/Cocoa/Emacs.base/Contents/Info.plist
  nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
  nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2011-03-07 05:20:23 +0000
+++ b/etc/ChangeLog     2012-01-10 08:32:46 +0000
@@ -1,3 +1,17 @@
+2012-01-10  Glenn Morris  <address@hidden>
+
+       * refcards/calccard.tex, refcards/cs-dired-ref.tex:
+       * refcards/cs-refcard.tex, refcards/cs-survival.tex:
+       * refcards/de-refcard.tex, refcards/dired-ref.tex:
+       * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex:
+       * refcards/fr-survival.tex, refcards/orgcard.tex:
+       * refcards/pl-refcard.tex, refcards/pt-br-refcard.tex:
+       * refcards/refcard.tex, refcards/ru-refcard.tex:
+       * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex:
+       * refcards/sk-survival.tex, refcards/survival.tex:
+       * refcards/vipcard.tex, refcards/viperCard.tex:
+       Update short copyright year to 2012.
+
 2011-03-07  Chong Yidong  <address@hidden>
 
        * Version 23.3 released.

=== modified file 'etc/refcards/calccard.tex'
--- a/etc/refcards/calccard.tex 2011-01-03 00:39:50 +0000
+++ b/etc/refcards/calccard.tex 2012-01-10 08:32:46 +0000
@@ -65,7 +65,7 @@
 %  Internet: address@hidden
 
 \def\emacsversionnumber{23}
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.

=== modified file 'etc/refcards/cs-dired-ref.tex'
--- a/etc/refcards/cs-dired-ref.tex     2011-01-03 00:39:50 +0000
+++ b/etc/refcards/cs-dired-ref.tex     2012-01-10 08:32:46 +0000
@@ -43,7 +43,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed.
 

=== modified file 'etc/refcards/cs-refcard.tex'
--- a/etc/refcards/cs-refcard.tex       2011-01-03 00:39:50 +0000
+++ b/etc/refcards/cs-refcard.tex       2012-01-10 08:32:46 +0000
@@ -60,7 +60,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed.
 

=== modified file 'etc/refcards/cs-survival.tex'
--- a/etc/refcards/cs-survival.tex      2011-01-03 00:39:50 +0000
+++ b/etc/refcards/cs-survival.tex      2012-01-10 08:32:46 +0000
@@ -56,7 +56,7 @@
 \chyph
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter

=== modified file 'etc/refcards/de-refcard.tex'
--- a/etc/refcards/de-refcard.tex       2011-01-03 00:39:50 +0000
+++ b/etc/refcards/de-refcard.tex       2012-01-10 08:32:46 +0000
@@ -62,7 +62,7 @@
 \mdqoff               % deactivates the "-char
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed below this line.
 

=== modified file 'etc/refcards/dired-ref.tex'
--- a/etc/refcards/dired-ref.tex        2011-01-03 00:39:50 +0000
+++ b/etc/refcards/dired-ref.tex        2012-01-10 08:32:46 +0000
@@ -45,7 +45,7 @@
 \pdflayout=(1)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed.
 

=== modified file 'etc/refcards/fr-dired-ref.tex'
--- a/etc/refcards/fr-dired-ref.tex     2011-01-03 00:39:50 +0000
+++ b/etc/refcards/fr-dired-ref.tex     2012-01-10 08:32:46 +0000
@@ -37,7 +37,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed.
 

=== modified file 'etc/refcards/fr-refcard.tex'
--- a/etc/refcards/fr-refcard.tex       2011-01-03 00:39:50 +0000
+++ b/etc/refcards/fr-refcard.tex       2012-01-10 08:32:46 +0000
@@ -57,7 +57,7 @@
 \pdflayout=(0l)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed below this line.
 

=== modified file 'etc/refcards/fr-survival.tex'
--- a/etc/refcards/fr-survival.tex      2011-01-03 00:39:50 +0000
+++ b/etc/refcards/fr-survival.tex      2012-01-10 08:32:46 +0000
@@ -51,7 +51,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter

=== modified file 'etc/refcards/orgcard.tex'
--- a/etc/refcards/orgcard.tex  2011-01-03 00:39:50 +0000
+++ b/etc/refcards/orgcard.tex  2012-01-10 08:32:46 +0000
@@ -1,7 +1,7 @@
 % Reference Card for Org Mode
 \def\orgversionnumber{6.33x}
 \def\versionyear{2009}          % latest update
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 %**start of header
 \newcount\columnsperpage

=== modified file 'etc/refcards/pl-refcard.tex'
--- a/etc/refcards/pl-refcard.tex       2011-01-03 00:39:50 +0000
+++ b/etc/refcards/pl-refcard.tex       2012-01-10 08:32:46 +0000
@@ -71,7 +71,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed.
 

=== modified file 'etc/refcards/pt-br-refcard.tex'
--- a/etc/refcards/pt-br-refcard.tex    2011-01-03 00:39:50 +0000
+++ b/etc/refcards/pt-br-refcard.tex    2012-01-10 08:32:46 +0000
@@ -63,7 +63,7 @@
 \pdflayout=(0l)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed below this line.
 

=== modified file 'etc/refcards/refcard.tex'
--- a/etc/refcards/refcard.tex  2011-01-03 00:39:50 +0000
+++ b/etc/refcards/refcard.tex  2012-01-10 08:32:46 +0000
@@ -64,7 +64,7 @@
 % Nothing else needs to be changed below this line.
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % copyright year
+\def\year{2012}                 % copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.

=== modified file 'etc/refcards/ru-refcard.tex'
--- a/etc/refcards/ru-refcard.tex       2011-01-03 00:39:50 +0000
+++ b/etc/refcards/ru-refcard.tex       2012-01-10 08:32:46 +0000
@@ -23,7 +23,7 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionemacs}[0]{23} % version of Emacs this is for
-\newcommand{\cyear}[0]{2011}       % copyright year
+\newcommand{\cyear}[0]{2012}       % copyright year
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
   \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.

=== modified file 'etc/refcards/sk-dired-ref.tex'
--- a/etc/refcards/sk-dired-ref.tex     2011-01-03 00:39:50 +0000
+++ b/etc/refcards/sk-dired-ref.tex     2012-01-10 08:32:46 +0000
@@ -44,7 +44,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed.
 

=== modified file 'etc/refcards/sk-refcard.tex'
--- a/etc/refcards/sk-refcard.tex       2011-01-03 00:39:50 +0000
+++ b/etc/refcards/sk-refcard.tex       2012-01-10 08:32:46 +0000
@@ -61,7 +61,7 @@
 \pdflayout=(0)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 % Nothing else needs to be changed.
 

=== modified file 'etc/refcards/sk-survival.tex'
--- a/etc/refcards/sk-survival.tex      2011-01-03 00:39:50 +0000
+++ b/etc/refcards/sk-survival.tex      2012-01-10 08:32:46 +0000
@@ -57,7 +57,7 @@
 \shyph
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter

=== modified file 'etc/refcards/survival.tex'
--- a/etc/refcards/survival.tex 2011-01-03 00:39:50 +0000
+++ b/etc/refcards/survival.tex 2012-01-10 08:32:46 +0000
@@ -46,7 +46,7 @@
 \pdflayout=(1)
 
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter

=== modified file 'etc/refcards/vipcard.tex'
--- a/etc/refcards/vipcard.tex  2011-01-03 00:39:50 +0000
+++ b/etc/refcards/vipcard.tex  2012-01-10 08:32:46 +0000
@@ -51,7 +51,7 @@
 \pdflayout=(1)
 
 \def\versionemacs{18}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 \def\versionvip{3.5}
 
 % Nothing else needs to be changed.

=== modified file 'etc/refcards/viperCard.tex'
--- a/etc/refcards/viperCard.tex        2011-01-03 00:39:50 +0000
+++ b/etc/refcards/viperCard.tex        2012-01-10 08:32:46 +0000
@@ -54,7 +54,7 @@
 \pdflayout=(1)
 
 \def\versionemacs{21}           % version of Emacs this is for
-\def\year{2011}                 % latest copyright year
+\def\year{2012}                 % latest copyright year
 \def\versionxemacs{20}          % version of XEmacs this is for
 \def\versionviper{3.0}          % version of Viper this is for
 

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-03-07 05:20:23 +0000
+++ b/lib-src/ChangeLog 2012-01-10 08:32:46 +0000
@@ -1,3 +1,9 @@
+2012-01-10  Glenn Morris  <address@hidden>
+
+       * ebrowse.c (version) <emacs_copyright>:
+       * etags.c (print_version) <emacs_copyright>:
+       * rcs2log (Copyright): Update short copyright year to 2012.
+
 2011-03-07  Chong Yidong  <address@hidden>
 
        * Version 23.3 released.

=== modified file 'lib-src/ebrowse.c'
--- a/lib-src/ebrowse.c 2011-01-02 02:46:30 +0000
+++ b/lib-src/ebrowse.c 2012-01-10 08:32:46 +0000
@@ -3685,7 +3685,7 @@
 version ()
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
 
   printf ("ebrowse %s\n", VERSION);
   puts (emacs_copyright);

=== modified file 'lib-src/etags.c'
--- a/lib-src/etags.c   2011-01-02 02:46:30 +0000
+++ b/lib-src/etags.c   2012-01-10 08:32:46 +0000
@@ -898,7 +898,7 @@
 print_version ()
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
 
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
   puts (emacs_copyright);

=== modified file 'lib-src/rcs2log'
--- a/lib-src/rcs2log   2011-01-02 02:46:30 +0000
+++ b/lib-src/rcs2log   2012-01-10 08:32:46 +0000
@@ -22,7 +22,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-Copyright='Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2012 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-21 03:12:09 +0000
+++ b/lisp/ChangeLog    2012-01-10 08:32:46 +0000
@@ -1,3 +1,7 @@
+2012-01-10  Glenn Morris  <address@hidden>
+
+       * version.el (emacs-copyright): Update year to 2012.
+
 2011-08-21  Deniz Dogan  <address@hidden>
 
        * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of

=== modified file 'lisp/version.el'
--- a/lisp/version.el   2011-03-11 17:17:33 +0000
+++ b/lisp/version.el   2012-01-10 08:32:46 +0000
@@ -1,7 +1,7 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -29,7 +29,7 @@
 
 ;;; Code:
 
-(defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." 
"\
+(defconst emacs-copyright "Copyright (C) 2012 Free Software Foundation, Inc." 
"\
 Short copyright string for this version of Emacs.")
 
 (defconst emacs-version "23.3.50" "\

=== modified file 'nextstep/ChangeLog'
--- a/nextstep/ChangeLog        2011-03-07 05:20:23 +0000
+++ b/nextstep/ChangeLog        2012-01-10 08:32:46 +0000
@@ -1,3 +1,10 @@
+2012-01-10  Glenn Morris  <address@hidden>
+
+       * Cocoa/Emacs.base/Contents/Info.plist:
+       * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
+       * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+       Update short copyright year to 2012.
+
 2011-03-07  Chong Yidong  <address@hidden>
 
        * Version 23.3 released.
@@ -7,6 +14,7 @@
        * Cocoa/Emacs.base/Contents/Info.plist:
        * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
        * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+       Update short copyright year to 2011.
 
 2010-05-07  Chong Yidong  <address@hidden>
 

=== modified file 'nextstep/Cocoa/Emacs.base/Contents/Info.plist'
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist     2011-03-11 17:17:33 
+0000
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist     2012-01-10 08:32:46 
+0000
@@ -553,7 +553,7 @@
        <key>CFBundleExecutable</key>
        <string>Emacs</string>
        <key>CFBundleGetInfoString</key>
-       <string>Emacs 23.3.50 Copyright (C) 2011 Free Software Foundation, 
Inc.</string>
+       <string>Emacs 23.3.50 Copyright (C) 2012 Free Software Foundation, 
Inc.</string>
        <key>CFBundleIconFile</key>
        <string>Emacs.icns</string>
        <key>CFBundleIdentifier</key>

=== modified file 
'nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings'
--- 
a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings  
    2011-03-11 17:17:33 +0000
+++ 
b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings  
    2012-01-10 08:32:46 +0000
@@ -3,4 +3,4 @@
 CFBundleName = "Emacs";
 CFBundleShortVersionString = "Version 23.3.50";
 CFBundleGetInfoString = "Emacs version 23.3.50, NS Windowing";
-NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
+NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc.";

=== modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist'
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist  2011-03-11 
17:17:33 +0000
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist  2012-01-10 
08:32:46 +0000
@@ -11,7 +11,7 @@
        "Carl Edman (NeXTStep)",
        "..see http://emacs-app.sf.net/authorship.html";
     );
-    Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
+    Copyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License 
Version 3 or later";
     FullVersionID = "Emacs 23.3.50, NS Windowing";
     NSExecutable = Emacs;