Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / lib / queue.h

diff --git a/bacula/src/lib/queue.h b/bacula/src/lib/queue.h
index f8d9ecc53c56d0cb7bb56027fb11153c62cd3a97..a3fa685999c41e53219c8645dc72f47f0a895129 100644 (file)
--- a/bacula/src/lib/queue.h
+++ b/bacula/src/lib/queue.h
@@ -1,24 +1,25 @@
 /*
- *  Written by John Walker MM
- *
- *   Version $Id$
- */
-/*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of Kern Sibbald.
-*/
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
 
+   Bacula(R) is a registered trademark of Kern Sibbald.
+*/
+/*
+ *  Written by John Walker MM
+ */
 
 /*  General purpose queue  */