[vlc-commits] Happy new year 2013

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jan  1 20:18:09 2013 +0100| [d10711fb104cdf960517e066e4b4e1497be00dc7] | committer: Rémi Denis-Courmont

Happy new year 2013

(cherry picked from commit fccc6ab913cad66c50b98d1ac14d2fe1f41f7453)

Conflicts:
	configure.ac

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d10711fb104cdf960517e066e4b4e1497be00dc7
---

 Makefile.am     |    2 +-
 configure.ac    |    4 ++--
 doc/Makefile.am |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 29571c0..04f8364 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,7 +109,7 @@ AUTOMAKE_OPTIONS = \
 ChangeLog: Makefile.am
 	rm -f -- "$@"
 	cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
-	$(LN_S) -f doc/ChangeLog-2012 "$@"
+	$(LN_S) -f doc/ChangeLog-2013 "$@"
 
 ###############################################################################
 # Mac OS X project
diff --git a/configure.ac b/configure.ac
index 65377ac..a3dfd5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT([Copyright 2002-2012 VLC authors and VideoLAN])
+AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN])
 
 AC_INIT(vlc, 2.0.6)
 VERSION_MAJOR=2
@@ -14,7 +14,7 @@ AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Twoflower"
-COPYRIGHT_YEARS="1996-2012"
+COPYRIGHT_YEARS="1996-2013"
 
 AC_CONFIG_SRCDIR(src/libvlc.c)
 AC_CONFIG_AUX_DIR(autotools)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 63470a3..44115b2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,6 +35,7 @@ CHANGELOGS = \
 	ChangeLog-2010 \
 	ChangeLog-2011 \
 	ChangeLog-2012 \
+	ChangeLog-2013 \
 	$(NULL)
 
 man1_MANS = \
@@ -82,7 +83,7 @@ $(CHANGELOGS): Makefile.am
 	fi
 
 # This one needs to be rebuilt all the time :)
-.PHONY: ChangeLog-2012 changelogs doc
+.PHONY: ChangeLog-2013 changelogs doc
 
 changelogs: $(CHANGELOGS)