[pkg-bacula-commits] [bacula] 01/04: Correct paths in diff

Sven Hartge hartge-guest at moszumanska.debian.org
Sat Oct 28 14:11:14 UTC 2017


This is an automated email from the git hooks/post-receive script.

hartge-guest pushed a commit to branch no-foreground-pidfile
in repository bacula.

commit 486832814d0ccb29d6914827f5dda717fbe2d366
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sat Oct 28 15:52:09 2017 +0200

    Correct paths in diff
---
 debian/patches/no-pid-option.patch | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/no-pid-option.patch b/debian/patches/no-pid-option.patch
index 099bd87..95421f2 100644
--- a/debian/patches/no-pid-option.patch
+++ b/debian/patches/no-pid-option.patch
@@ -1,7 +1,7 @@
 diff --git a/bacula/manpages/bacula-dir.8 b/bacula/manpages/bacula-dir.8
 index 1fdc89b..662bc4e 100644
---- a/bacula/manpages/bacula-dir.8
-+++ b/bacula/manpages/bacula-dir.8
+--- a/manpages/bacula-dir.8
++++ b/manpages/bacula-dir.8
 @@ -2,7 +2,7 @@
  .\" First parameter, NAME, should be all caps
  .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
@@ -23,8 +23,8 @@ index 1fdc89b..662bc4e 100644
  .TP
 diff --git a/bacula/manpages/bacula-fd.8 b/bacula/manpages/bacula-fd.8
 index 4f2c584..c5f2194 100644
---- a/bacula/manpages/bacula-fd.8
-+++ b/bacula/manpages/bacula-fd.8
+--- a/manpages/bacula-fd.8
++++ b/manpages/bacula-fd.8
 @@ -2,7 +2,7 @@
  .\" First parameter, NAME, should be all caps
  .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
@@ -46,8 +46,8 @@ index 4f2c584..c5f2194 100644
  .TP
 diff --git a/bacula/manpages/bacula-sd.8 b/bacula/manpages/bacula-sd.8
 index 56ee778..4a54c26 100644
---- a/bacula/manpages/bacula-sd.8
-+++ b/bacula/manpages/bacula-sd.8
+--- a/manpages/bacula-sd.8
++++ b/manpages/bacula-sd.8
 @@ -2,7 +2,7 @@
  .\" First parameter, NAME, should be all caps
  .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
@@ -69,8 +69,8 @@ index 56ee778..4a54c26 100644
  .TP
 diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
 index c950080..545aa6f 100644
---- a/bacula/src/dird/dird.c
-+++ b/bacula/src/dird/dird.c
+--- a/src/dird/dird.c
++++ b/src/dird/dird.c
 @@ -64,6 +64,7 @@ void init_device_resources();
  
  static char *runjob = NULL;
@@ -133,8 +133,8 @@ index c950080..545aa6f 100644
     term_job_server();
 diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
 index b9a7d74..7e684b1 100644
---- a/bacula/src/filed/filed.c
-+++ b/bacula/src/filed/filed.c
+--- a/src/filed/filed.c
++++ b/src/filed/filed.c
 @@ -46,6 +46,7 @@ extern struct s_cmds cmds[];
  char *configfile = NULL;
  static bool test_config = false;
@@ -205,8 +205,8 @@ index b9a7d74..7e684b1 100644
     if (configfile != NULL) {
 diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
 index 9ca4c56..3f0f9c4 100644
---- a/bacula/src/stored/stored.c
-+++ b/bacula/src/stored/stored.c
+--- a/src/stored/stored.c
++++ b/src/stored/stored.c
 @@ -64,7 +64,8 @@ static pthread_t server_tid;
  static bool server_tid_valid = false;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git



More information about the pkg-bacula-commits mailing list