From 3e61ee06bc981a098990b386901b403c23e8f463 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 12 Jan 2007 10:23:46 +0000 Subject: [PATCH] Update spec file copyrights reorganize old patches git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3983 91ce42f0-d328-0410-95d8-f526ca767f89 --- .../{ => 1.38.x}/1.38.1-to-1.38.2.patch | 248 +++++++++--------- .../{ => 1.38.x}/1.38.10-dvd-eof.patch | 0 .../{ => 1.38.x}/1.38.10-scheduler.patch | 0 .../patches/{ => 1.38.x}/1.38.6-script.patch | 0 .../patches/{ => 1.38.x}/1.38.7-mysql.patch | 0 5 files changed, 124 insertions(+), 124 deletions(-) rename bacula/patches/{ => 1.38.x}/1.38.1-to-1.38.2.patch (97%) rename bacula/patches/{ => 1.38.x}/1.38.10-dvd-eof.patch (100%) rename bacula/patches/{ => 1.38.x}/1.38.10-scheduler.patch (100%) rename bacula/patches/{ => 1.38.x}/1.38.6-script.patch (100%) rename bacula/patches/{ => 1.38.x}/1.38.7-mysql.patch (100%) diff --git a/bacula/patches/1.38.1-to-1.38.2.patch b/bacula/patches/1.38.x/1.38.1-to-1.38.2.patch similarity index 97% rename from bacula/patches/1.38.1-to-1.38.2.patch rename to bacula/patches/1.38.x/1.38.1-to-1.38.2.patch index a75062c69d..be37702df5 100644 --- a/bacula/patches/1.38.1-to-1.38.2.patch +++ b/bacula/patches/1.38.x/1.38.1-to-1.38.2.patch @@ -4297,8 +4297,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * Basic tasks done here: +++++++ * Handle Catalog services. +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2001-2005 Kern Sibbald @@ -4321,8 +4321,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Kern Sibbald, July MMII +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2002-2005 Kern Sibbald @@ -4361,8 +4361,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Kern Sibbald, October MMI +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2001-2005 Kern Sibbald @@ -4513,8 +4513,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Written by Preben 'Peppe' Guldberg, December MMIV +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2004-2005 Kern Sibbald @@ -4585,8 +4585,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Kern Sibbald, August MMII +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ /* +++++++ Copyright (C) 2002-2005 Kern Sibbald @@ -4617,8 +4617,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++++ * +++++++ * Nicolas Boichat, August MMIV +++++++ * -+++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++++- * Version $Id$ +++++++++ * Version $Id$ +++++++ */ +++++++ +++++++ /* @@ -4687,8 +4687,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * Basic tasks done here: ++++++ * Handle Catalog services. ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2001-2005 Kern Sibbald @@ -4711,8 +4711,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Kern Sibbald, July MMII ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2002-2005 Kern Sibbald @@ -4751,8 +4751,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Kern Sibbald, October MMI ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2001-2005 Kern Sibbald @@ -4903,8 +4903,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Written by Preben 'Peppe' Guldberg, December MMIV ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2004-2005 Kern Sibbald @@ -4975,8 +4975,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Kern Sibbald, August MMII ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ /* ++++++ Copyright (C) 2002-2005 Kern Sibbald @@ -5080,8 +5080,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++++ * ++++++ * Nicolas Boichat, August MMIV ++++++ * -++++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++++- * Version $Id$ ++++++++ * Version $Id$ ++++++ */ ++++++ ++++++ /* @@ -5150,8 +5150,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * Basic tasks done here: +++++ * Handle Catalog services. +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2001-2005 Kern Sibbald @@ -5174,8 +5174,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Kern Sibbald, July MMII +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2002-2005 Kern Sibbald @@ -5215,8 +5215,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Kern Sibbald, October MMI +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2001-2005 Kern Sibbald @@ -5367,8 +5367,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Written by Preben 'Peppe' Guldberg, December MMIV +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2004-2005 Kern Sibbald @@ -5439,8 +5439,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Kern Sibbald, August MMII +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ /* +++++ Copyright (C) 2002-2005 Kern Sibbald @@ -5544,8 +5544,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++++ * +++++ * Nicolas Boichat, August MMIV +++++ * -+++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++++- * Version $Id$ +++++++ * Version $Id$ +++++ */ +++++ +++++ /* @@ -5614,8 +5614,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * Basic tasks done here: ++++ * Handle Catalog services. ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2001-2005 Kern Sibbald @@ -5638,8 +5638,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Kern Sibbald, July MMII ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2002-2005 Kern Sibbald @@ -5679,8 +5679,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Kern Sibbald, October MMI ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2001-2005 Kern Sibbald @@ -5831,8 +5831,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Written by Preben 'Peppe' Guldberg, December MMIV ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2004-2005 Kern Sibbald @@ -5903,8 +5903,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Kern Sibbald, August MMII ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ /* ++++ Copyright (C) 2002-2005 Kern Sibbald @@ -6008,8 +6008,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ * ++++ * Nicolas Boichat, August MMIV ++++ * -++++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++++- * Version $Id$ ++++++ * Version $Id$ ++++ */ ++++ ++++ /* @@ -6078,8 +6078,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * Basic tasks done here: +++ * Handle Catalog services. +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2001-2005 Kern Sibbald @@ -6102,8 +6102,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Kern Sibbald, July MMII +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2002-2005 Kern Sibbald @@ -6143,8 +6143,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Kern Sibbald, October MMI +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2001-2005 Kern Sibbald @@ -6295,8 +6295,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Written by Preben 'Peppe' Guldberg, December MMIV +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2004-2005 Kern Sibbald @@ -6367,8 +6367,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Kern Sibbald, August MMII +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ /* +++ Copyright (C) 2002-2005 Kern Sibbald @@ -6472,8 +6472,8 @@ diff -N patches/1.38.1-to-1.38.2.patch +++ * +++ * Nicolas Boichat, August MMIV +++ * -+++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++++- * Version $Id$ +++++ * Version $Id$ +++ */ +++ +++ /* @@ -6542,8 +6542,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * Basic tasks done here: ++ * Handle Catalog services. ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2001-2005 Kern Sibbald @@ -6566,8 +6566,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Kern Sibbald, July MMII ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2002-2005 Kern Sibbald @@ -6607,8 +6607,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Kern Sibbald, October MMI ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2001-2005 Kern Sibbald @@ -6759,8 +6759,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Written by Preben 'Peppe' Guldberg, December MMIV ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2004-2005 Kern Sibbald @@ -6831,8 +6831,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Kern Sibbald, August MMII ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ /* ++ Copyright (C) 2002-2005 Kern Sibbald @@ -6936,8 +6936,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++ * ++ * Nicolas Boichat, August MMIV ++ * -++- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -+++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ +++- * Version $Id$ ++++ * Version $Id$ ++ */ ++ ++ /* @@ -7011,8 +7011,8 @@ diff -N patches/1.38.1-to-1.38.2.patch ++++ src/version.h 22 Nov 2005 10:50:55 -0000 1.554.2.15 +@@ -1,11 +1,11 @@ + /* -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + + #undef VERSION @@ -7037,8 +7037,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * Basic tasks done here: + * Handle Catalog services. + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2001-2005 Kern Sibbald @@ -7062,8 +7062,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, July MMII + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2002-2005 Kern Sibbald @@ -7088,8 +7088,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, December MMI + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2001-2005 Kern Sibbald @@ -7114,8 +7114,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, October MMI + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2001-2005 Kern Sibbald @@ -7251,8 +7251,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, September MM + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2000-2005 Kern Sibbald @@ -7277,8 +7277,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Written by Preben 'Peppe' Guldberg, December MMIV + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2004-2005 Kern Sibbald @@ -7312,8 +7312,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, April MMIII + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + * + */ + /* @@ -7345,8 +7345,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * Originally written by Kern Sibbald for inclusion in apcupsd, + * but heavily modified for Bacula + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + + #include "bacula.h" @@ -7370,8 +7370,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, August MMII + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2002-2005 Kern Sibbald @@ -7403,8 +7403,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, May MMIII + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + * + */ + /* @@ -7458,8 +7458,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Kern Sibbald, March MM + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + /* + Copyright (C) 2000-2005 Kern Sibbald @@ -7496,8 +7496,8 @@ diff -N patches/1.38.1-to-1.38.2.patch + * + * Nicolas Boichat, August MMIV + * -+- * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ -++ * Version $Id: 1.38.1-to-1.38.2.patch,v 1.1.2.3 2005/11/22 10:52:49 kerns Exp $ ++- * Version $Id$ +++ * Version $Id$ + */ + + /* @@ -7571,8 +7571,8 @@ diff -u -r1.554.2.14 -r1.554.2.15 +++ src/version.h 22 Nov 2005 10:50:55 -0000 1.554.2.15 @@ -1,11 +1,11 @@ /* -- * Version $Id: version.h,v 1.554.2.14 2005/11/14 14:21:58 kerns Exp $ -+ * Version $Id: version.h,v 1.554.2.15 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ #undef VERSION @@ -7597,8 +7597,8 @@ diff -u -r1.77.2.1 -r1.77.2.2 * Basic tasks done here: * Handle Catalog services. * -- * Version $Id: catreq.c,v 1.77.2.1 2005/10/26 14:02:04 kerns Exp $ -+ * Version $Id: catreq.c,v 1.77.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2001-2005 Kern Sibbald @@ -7622,8 +7622,8 @@ diff -u -r1.101.2.1 -r1.101.2.2 * * Kern Sibbald, July MMII * -- * Version $Id: ua_restore.c,v 1.101.2.1 2005/10/26 14:02:04 kerns Exp $ -+ * Version $Id: ua_restore.c,v 1.101.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2002-2005 Kern Sibbald @@ -7648,8 +7648,8 @@ diff -u -r1.71 -r1.71.2.1 * * Kern Sibbald, December MMI * -- * Version $Id: ua_run.c,v 1.71 2005/08/10 16:35:19 nboichat Exp $ -+ * Version $Id: ua_run.c,v 1.71.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2001-2005 Kern Sibbald @@ -7674,8 +7674,8 @@ diff -u -r1.65.2.1 -r1.65.2.2 * * Kern Sibbald, October MMI * -- * Version $Id: ua_select.c,v 1.65.2.1 2005/11/12 17:30:52 kerns Exp $ -+ * Version $Id: ua_select.c,v 1.65.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2001-2005 Kern Sibbald @@ -7811,8 +7811,8 @@ diff -u -r1.7 -r1.7.2.1 * * Kern Sibbald, September MM * -- * Version $Id: ua_update.c,v 1.7 2005/08/28 12:22:02 kerns Exp $ -+ * Version $Id: ua_update.c,v 1.7.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2000-2005 Kern Sibbald @@ -7837,8 +7837,8 @@ diff -u -r1.10.2.1 -r1.10.2.2 * * Written by Preben 'Peppe' Guldberg, December MMIV * -- * Version $Id: acl.c,v 1.10.2.1 2005/11/14 20:20:38 kerns Exp $ -+ * Version $Id: acl.c,v 1.10.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2004-2005 Kern Sibbald @@ -7872,8 +7872,8 @@ diff -u -r1.40 -r1.40.2.1 * * Kern Sibbald, April MMIII * -- * Version $Id: bfile.c,v 1.40 2005/08/10 16:35:19 nboichat Exp $ -+ * Version $Id: bfile.c,v 1.40.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ * */ /* @@ -7905,8 +7905,8 @@ diff -u -r1.39 -r1.39.2.1 * Originally written by Kern Sibbald for inclusion in apcupsd, * but heavily modified for Bacula * -- * Version $Id: bnet_server.c,v 1.39 2005/08/18 15:37:40 kerns Exp $ -+ * Version $Id: bnet_server.c,v 1.39.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ #include "bacula.h" @@ -7930,8 +7930,8 @@ diff -u -r1.47.2.3 -r1.47.2.4 * * Kern Sibbald, August MMII * -- * Version $Id: autochanger.c,v 1.47.2.3 2005/11/12 17:30:53 kerns Exp $ -+ * Version $Id: autochanger.c,v 1.47.2.4 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2002-2005 Kern Sibbald @@ -7963,8 +7963,8 @@ diff -u -r1.44.2.1 -r1.44.2.2 * * Kern Sibbald, May MMIII * -- * Version $Id: status.c,v 1.44.2.1 2005/10/06 07:04:13 kerns Exp $ -+ * Version $Id: status.c,v 1.44.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ * */ /* @@ -8018,8 +8018,8 @@ diff -u -r1.76 -r1.76.2.1 * * Kern Sibbald, March MM * -- * Version $Id: stored_conf.c,v 1.76 2005/09/09 09:40:04 kerns Exp $ -+ * Version $Id: stored_conf.c,v 1.76.2.1 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* Copyright (C) 2000-2005 Kern Sibbald @@ -8056,8 +8056,8 @@ diff -u -r1.25.2.1 -r1.25.2.2 * * Nicolas Boichat, August MMIV * -- * Version $Id: tray-monitor.c,v 1.25.2.1 2005/10/01 10:20:18 kerns Exp $ -+ * Version $Id: tray-monitor.c,v 1.25.2.2 2005/11/22 10:50:55 kerns Exp $ +- * Version $Id$ ++ * Version $Id$ */ /* diff --git a/bacula/patches/1.38.10-dvd-eof.patch b/bacula/patches/1.38.x/1.38.10-dvd-eof.patch similarity index 100% rename from bacula/patches/1.38.10-dvd-eof.patch rename to bacula/patches/1.38.x/1.38.10-dvd-eof.patch diff --git a/bacula/patches/1.38.10-scheduler.patch b/bacula/patches/1.38.x/1.38.10-scheduler.patch similarity index 100% rename from bacula/patches/1.38.10-scheduler.patch rename to bacula/patches/1.38.x/1.38.10-scheduler.patch diff --git a/bacula/patches/1.38.6-script.patch b/bacula/patches/1.38.x/1.38.6-script.patch similarity index 100% rename from bacula/patches/1.38.6-script.patch rename to bacula/patches/1.38.x/1.38.6-script.patch diff --git a/bacula/patches/1.38.7-mysql.patch b/bacula/patches/1.38.x/1.38.7-mysql.patch similarity index 100% rename from bacula/patches/1.38.7-mysql.patch rename to bacula/patches/1.38.x/1.38.7-mysql.patch -- 2.39.5