Happy new year

diff --git a/configure.ac b/configure.ac
index 59c8e219acf3ef7154ea5ebbac5b2ac593700de7..b589b5a2de94d78b65cbe4fb3ae1f8b8d0fe134c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ VERSION_EXTRA="svn"
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Grishenko"
+COPYRIGHT_YEARS="1996-2008"
 
 AC_PREREQ(2.59) dnl this really should be 2.59c
 AC_CONFIG_SRCDIR(src/libvlc.c)
@@ -6073,7 +6074,8 @@ dnl
 dnl  Stuff used by the program
 dnl
 AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2007 the VideoLAN team", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) ${COPYRIGHT_YEARS} the VideoLAN team", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years])
 AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number])
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number])

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 4e8784d09d78d10816ddb52d80aef73dc653b550..8ca2dbe5986981aaab3b33638436392f897cc2c9 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -103,8 +103,8 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     /* Main Introduction */
     QWidget *infoWidget = new QWidget( this );
     QHBoxLayout *infoLayout = new QHBoxLayout( infoWidget );
-    QLabel *infoLabel = new QLabel( "VLC media player " PACKAGE_VERSION "\n\n"
-            "(c) 1996-2007 - the VideoLAN Team\n\n" +
+    QLabel *infoLabel = new QLabel( "VLC media player " VERSION_MESSAGE "\n\n"
+            "(c) " COPYRIGHT_YEARS " - the VideoLAN Team\n\n" +
             qtr( "VLC media player is a free media player, made by the "
                  "VideoLAN Team.\nIt is a standalone multimedia player, "
                  "encoder and streamer, that can read from many supports "

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index fa73e2776d65b961dfa4e1bf10575a5f0bbc823d..716607b8139382c3f0995ba349c3b9cdc17435ee 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -952,9 +952,9 @@ void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
 void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
     wxString msg;
-    msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) +
+    msg.Printf( wxString(wxT("VLC media player " VERSION_MESSAGE)) +
         wxU(_(" (wxWidgets interface)\n\n")) +
-        wxU(_("(c) 1996-2006 - the VideoLAN Team\n\n")) +
+        wxU(_("(c) " COPYRIGHT_YEARS " - the VideoLAN Team\n\n")) +
        wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
        wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
        wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +