Imported Upstream version 3.1.0

[debian/amanda] / amar-src / amarchiver.c

diff --git a/amar-src/amarchiver.c b/amar-src/amarchiver.c
index 2d0881635575e76b548ff331220eddc569b6fac8..2147929df953a0ec1574a0b5f201f3e1604c3f92 100644 (file)
--- a/amar-src/amarchiver.c
+++ b/amar-src/amarchiver.c
@@ -1,26 +1,25 @@
 /*
- * Copyright (c) Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2008,2009 Zmanda, Inc.  All Rights Reserved.
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
  *
- * This library is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * Contact information: Zmanda Inc., 465 S Mathlida Ave, Suite 300
- * Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
+ * Contact information: Zmanda Inc., 465 S. Mathilda Ave., Suite 300
+ * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
  */
 
 #include "amanda.h"
 #include "getopt.h"
-#include "version.h"
 #include "amar.h"
 
 static struct option long_options[] = {
@@ -324,7 +323,7 @@ int main(
                break;
        case 5: opt_file = stralloc(optarg);
                break;
-       case 6: printf("amarchiver %s\n", version());
+       case 6: printf("amarchiver %s\n", VERSION);
                exit(0);
                break;
        }