vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Jan 24 09:54:31 2015 +0100| [ea750e57b5aafee751905849539cd190ed7dcc4d] | committer: Jean-Baptiste Kempf
2015 Still alive! (cherry picked from commit d8976582c45911a2ca4125854cd85780721184e9) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ea750e57b5aafee751905849539cd190ed7dcc4d --- 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 41e1061..c0d1084 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,7 +105,7 @@ AUTOMAKE_OPTIONS = \ ChangeLog: Makefile.am rm -f -- "$@" cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs - $(LN_S) -f doc/ChangeLog-2014 "$@" + $(LN_S) -f doc/ChangeLog-2015 "$@" ############################################################################### # Mac OS X project diff --git a/configure.ac b/configure.ac index 35b50a5..4554c60 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN]) +AC_COPYRIGHT([Copyright 1999-2015 VLC authors and VideoLAN]) AC_INIT(vlc, 2.1.6) VERSION_MAJOR=2 @@ -14,7 +14,7 @@ AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Rincewind" -COPYRIGHT_YEARS="1996-2014" +COPYRIGHT_YEARS="1996-2015" AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) diff --git a/doc/Makefile.am b/doc/Makefile.am index 3397728..b8b6d6a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -37,6 +37,7 @@ CHANGELOGS = \ ChangeLog-2012 \ ChangeLog-2013 \ ChangeLog-2014 \ + ChangeLog-2015 \ $(NULL) man1_MANS = \ @@ -84,7 +85,7 @@ $(CHANGELOGS): Makefile.am fi # This one needs to be rebuilt all the time :) -.PHONY: ChangeLog-2014 changelogs doc +.PHONY: ChangeLog-2015 changelogs doc changelogs: $(CHANGELOGS) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
