mixer: Use lsu_merge_config_file_options().

[paraslash.git] / version.c

diff --git a/version.c b/version.c
index de03e9350f3007dc36e18ca4c78110df1cc27aea..d057f9c3b8310505215ba9c183a7deac710290a9 100644 (file)
--- a/version.c
+++ b/version.c
@@ -1,36 +1,18 @@
-/*
- * Copyright (C) 2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2013 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file version.c Some helpers for printing version and copyright strings. */
 
 #include "para.h"
 #include "version.h"
-
-/** \file version.h Macros for printing the version string. */
-
 #include "git-version.h"
 
-/**
- * Get the raw git version string
- *
- * \return The string generated by the GIT-VERSION-GEN script. It is passed
- * as a preprocessor define during compilation.
- */
-__a_const const char *version_git(void)
-{
-       return GIT_VERSION;
-}
-
 /**
  * Get the version string for an executable.
  *
  * \param pfx The program name (without the leading "para_").
  *
- * \return A statically allocated string which contains the program name, the
- * git version and the codename. It must not be freed by the caller.
+ * \return A statically allocated string which contains the program name and
+ * the git version. It must not be freed by the caller.
  */
 const char *version_single_line(const char *pfx)
 {
@@ -57,10 +39,10 @@ const char *version_text(const char *pfx)
        static char buf[512];
 
        snprintf(buf, sizeof(buf) - 1, "%s\n"
-               "Copyright (C) 2013 Andre Noll\n"
+               "Copyright (C) " COPYRIGHT_YEAR " Andre Noll\n"
                "This is free software with ABSOLUTELY NO WARRANTY."
                " See COPYING for details.\n"
-               "Report bugs to <maan@systemlinux.org>.\n"
+               "Report bugs to <maan@tuebingen.mpg.de>.\n"
                "build date: " BUILD_DATE ",\n"
                "build system: " UNAME_RS ",\n"
                "compiler: " CC_VERSION ".\n",