lintian doesn't like orphan packages with uploaders...

[debian/amanda] / common-src / genversion.c

diff --git a/common-src/genversion.c b/common-src/genversion.c
index 1b4f7f5b58aff57f5a983f817847826b0807c483..e9680b33a4de355c495d282fbd50433f3e512643 100644 (file)
--- a/common-src/genversion.c
+++ b/common-src/genversion.c
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1999 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,12 +25,11 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: genversion.c 698 2008-01-11 00:42:49Z martinea $
+ * $Id: genversion.c 4946 2012-10-18 11:15:16Z martinea $
  *
  * dump the current Amanda version info
  */
 #include "amanda.h"
-#include "version.h"
 
 /* distribution-time information */
 #include "svn-info.h"
@@ -178,7 +178,7 @@ main(
     g_printf("const char * const version_info[] = {\n");
 
     startline("build:");
-    v = version();
+    v = VERSION;
     v_len = SIZEOF("Amanda-") + strlen(v) + 1;
     verstr = malloc(v_len);
     if (!verstr) {
@@ -362,20 +362,17 @@ main(
     prstr("HAVE_SYSVSHM");
 #endif
 
-#ifdef USE_POSIX_FCNTL
-    prstr("LOCKING=POSIX_FCNTL");
+#ifdef WANT_AMFLOCK_POSIX
+    prstr("AMFLOCK_POSIX");
 #endif
-#ifdef USE_FLOCK
-    prstr("LOCKING=FLOCK");
+#ifdef WANT_AMFLOCK_FLOCK
+    prstr("AMFLOCK_FLOCK");
 #endif
-#ifdef USE_LOCKF
-    prstr("LOCKING=LOCKF");
+#ifdef WANT_AMFLOCK_LOCKF
+    prstr("AMFLOCK_LOCKF");
 #endif
-#ifdef USE_LNLOCK
-    prstr("LOCKING=LNLOCK");
-#endif
-#if !defined(USE_POSIX_FCNTL) && !defined(USE_FLOCK) && !defined(USE_LOCK) && !defined(USE_LNLOCK)
-    prstr("LOCKING=**NONE**");
+#ifdef WANT_AMFLOCK_LNLOCK
+    prstr("AMFLOCK_LNLOCK");
 #endif
 
 #ifdef STATFS_BSD
@@ -406,10 +403,6 @@ main(
     prstr("BSD_SECURITY");
 #endif
 
-#ifdef KRB4_SECURITY
-    prstr("KRB4_SECURITY");
-#endif
-
 #ifdef KRB5_SECURITY
     prstr("KRB5_SECURITY");
 #endif
@@ -432,10 +425,6 @@ main(
     prstr("CHECK_USERID");
 #endif
 
-#ifdef USE_VERSION_SUFFIXES
-    prstr("USE_VERSION_SUFFIXES");
-#endif
-
 #ifdef HAVE_GZIP
     prstr("HAVE_GZIP");
 #endif