Change copyright as per agreement with FSFE + update copyright year

diff --git a/bacula/src/tools/bpluginfo.c b/bacula/src/tools/bpluginfo.c
index 15318f17e5ef08158f6cfb9c61d7296542664fb9..36fe0ffdd0ab603cbdb01aa7785f985a5bf8649c 100644 (file)
--- a/bacula/src/tools/bpluginfo.c
+++ b/bacula/src/tools/bpluginfo.c
@@ -10,19 +10,22 @@
  * - Enabled functions, etc.
  */
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2012-2016 Kern Sibbald
 
-   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.
 */
 
 #ifdef working /* currently will not compile KES 21 Nov 2015 */

diff --git a/bacula/src/tools/bregex.c b/bacula/src/tools/bregex.c
index 0b08934bdc7c1e5e8bcc3ad530daf3b138bdc5c4..fe51eacf4876d837219eff723061c3914a6ec80d 100644 (file)
--- a/bacula/src/tools/bregex.c
+++ b/bacula/src/tools/bregex.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/tools/bregtest.c b/bacula/src/tools/bregtest.c
index d28f0bcecce1e33da102a092a30cbf2619d4b98d..b6d59453cf552a0e4109a953ff93665c4f6765c7 100644 (file)
--- a/bacula/src/tools/bregtest.c
+++ b/bacula/src/tools/bregtest.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/tools/bsnapshot.c b/bacula/src/tools/bsnapshot.c
index 6d6b85b028edaae5d933f4514d1dab2360c5b5b0..68495db56bec81c94e2165d6ca01ad6db321bf6d 100644 (file)
--- a/bacula/src/tools/bsnapshot.c
+++ b/bacula/src/tools/bsnapshot.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/tools/bvfs_test.c b/bacula/src/tools/bvfs_test.c
index 3ac32537b761b2d31805077de39d072f380374dc..6037faa1043a3196b7316e64d2f4a821ffa8e284 100644 (file)
--- a/bacula/src/tools/bvfs_test.c
+++ b/bacula/src/tools/bvfs_test.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2009-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -221,7 +220,7 @@ int main (int argc, char *argv[])
    pm_strcpy(bjcr->client_name, "Dummy.Client.Name");
    bstrncpy(bjcr->Job, "bvfs_test", sizeof(bjcr->Job));
    
-   if ((db = db_init_database(NULL, NULL, db_name, db_user, db_password,
+   if ((db = db_init_database(NULL, NULL, db_name, db_user, db_password, 
                               db_host, 0, NULL,
                               db_ssl_key, db_ssl_cert, db_ssl_ca,
                               db_ssl_capath, db_ssl_cipher,

diff --git a/bacula/src/tools/bwild.c b/bacula/src/tools/bwild.c
index e523d3f5a69ab54004db6345c0c92364d5bad265..66b872d9e1e4a4c53470fcca69a5612c2a481bf6 100644 (file)
--- a/bacula/src/tools/bwild.c
+++ b/bacula/src/tools/bwild.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/tools/cats_test.c b/bacula/src/tools/cats_test.c
index c51f21fbe9d9a80b8a77408ea5f20fab329fbac7..75adc4d303a0d0e486f1df9e6bc657a9540369fa 100644 (file)
--- a/bacula/src/tools/cats_test.c
+++ b/bacula/src/tools/cats_test.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -325,8 +324,8 @@ int main (int argc, char *argv[])
     */
 
    jcr = new_jcr(sizeof(JCR), NULL);
-   jcr->setJobType(JT_CONSOLE);
-   jcr->setJobLevel(L_NONE);
+   jcr->setJobType(JT_CONSOLE); 
+   jcr->setJobLevel(L_NONE); 
    jcr->JobStatus = JS_Running;
    bstrncpy(jcr->Job, "**dummy**", sizeof(jcr->Job));
    jcr->JobId = pid;      /* this is JobId on tape */

diff --git a/bacula/src/tools/drivetype.c b/bacula/src/tools/drivetype.c
index f62f3f0c899508b689281232db9f6f7a0e013574..7d421c4705473ddbde6de6ad27bf94eadc1304ca 100644 (file)
--- a/bacula/src/tools/drivetype.c
+++ b/bacula/src/tools/drivetype.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/tools/fstype.c b/bacula/src/tools/fstype.c
index 150afe65e2baa9a61bcf2eb096c324421f51efe4..d61e0f28b828c1a57d3b96949240ad0027f59b44 100644 (file)
--- a/bacula/src/tools/fstype.c
+++ b/bacula/src/tools/fstype.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/tools/testfind.c b/bacula/src/tools/testfind.c
index bcd67a514d836525a995589c7b9d8b310d4fe9af..8b4537ebd065878404f81d5f6590704504cffbf9 100644 (file)
--- a/bacula/src/tools/testfind.c
+++ b/bacula/src/tools/testfind.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/tools/testls.c b/bacula/src/tools/testls.c
index 65fa99a0cba731863aab45dabd549b8e1554c1ac..bfcab4c168a76bd3714be2b5f5d894cb2557a242 100644 (file)
--- a/bacula/src/tools/testls.c
+++ b/bacula/src/tools/testls.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.