[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-172-gfdb7618

[Luca Capello]

The following commit has been merged in the master branch:
commit fdb761890d3d10c91c4be95bc0c6633f12e50ace
Author: Luca Capello <luca at pca.it>
Date:   Wed Jun 6 18:49:42 2012 +0200

    debian/patches/fix-scriptdir-examples-devices.patch: (#500370)

diff --git a/debian/changelog b/debian/changelog
index bbcf098..b853350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -129,6 +129,9 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
     + add note about moving bat/bconsole to /usr/sbin/.
   * debian/patches/fix-binutils-gold-linking.patch:
     + import from upstream BTS (Closes: #553956).
+  * debian/patches/fix-scriptdir-examples-devices.patch:
+    + @scriptdir@ not replaced in examples/devices/*, thanks to Arne
+      Wichmann (Closes: #500370).
   * debian/README.Debian:
     + explain why upstream sources are not DFSG-free.
   * debian/rules:
diff --git a/debian/patches/fix-scriptdir-examples-devices.patch b/debian/patches/fix-scriptdir-examples-devices.patch
new file mode 100644
index 0000000..3902ea2
--- /dev/null
+++ b/debian/patches/fix-scriptdir-examples-devices.patch
@@ -0,0 +1,73 @@
+Description: fix @scriptdir@ in examples/devices/*.conf
+Bug-Debian: 500370
+Bug: http://bugs.bacula.org/view.php?id=1884
+Author: Arne Wichmann <arnew-reportbug at rasentrimmer.org>
+Reviewed-by: Luca Capello <luca at pca.it>
+Last-Update: 2012-06-02
+
+--- a/examples/devices/DVD.conf
++++ b/examples/devices/DVD.conf
+@@ -17,6 +17,6 @@
+   MountCommand = "/bin/mount -t iso9660 -o ro %a %m";
+   UnmountCommand = "/bin/umount %m";
+   SpoolDirectory = /tmp/backup;
+-  WritePartCommand = "@scriptdir@/dvd-handler %a write %e %v"
+-  FreeSpaceCommand = "@scriptdir@/dvd-handler %a free"
++  WritePartCommand = "/etc/bacula/scripts/dvd-handler %a write %e %v"
++  FreeSpaceCommand = "/etc/bacula/scripts/dvd-handler %a free"
+ }
+--- a/examples/devices/DDS4.conf
++++ b/examples/devices/DDS4.conf
+@@ -9,7 +9,7 @@
+   AlwaysOpen = yes;
+   RemovableMedia = yes;
+   RandomAccess = no;
+-# Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
++# Changer Command = "/etc/bacula/scripts/mtx-changer %c %o %S %a %d"
+ # Changer Device = /dev/sg0
+ # AutoChanger = yes
+   # Enable the Alert command only if you have the mtx package loaded
+--- a/examples/devices/LTO-2.conf
++++ b/examples/devices/LTO-2.conf
+@@ -10,7 +10,7 @@
+   RemovableMedia = yes;
+   RandomAccess = no;
+   Maximum File Size = 3GB
+-# Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
++# Changer Command = "/etc/bacula/scripts/mtx-changer %c %o %S %a %d"
+ # Changer Device = /dev/sg0
+ # AutoChanger = yes
+   # Enable the Alert command only if you have the mtx package loaded
+--- a/examples/devices/LTO-3.conf
++++ b/examples/devices/LTO-3.conf
+@@ -10,7 +10,7 @@
+   RemovableMedia = yes;
+   RandomAccess = no;
+   Maximum File Size = 4GB
+-# Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
++# Changer Command = "/etc/bacula/scripts/mtx-changer %c %o %S %a %d"
+ # Changer Device = /dev/sg0
+ # AutoChanger = yes
+   # Enable the Alert command only if you have the mtx package loaded
+--- a/examples/devices/LTO-4.conf
++++ b/examples/devices/LTO-4.conf
+@@ -10,7 +10,7 @@
+   RemovableMedia = yes;
+   RandomAccess = no;
+   Maximum File Size = 5GB
+-# Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
++# Changer Command = "/etc/bacula/scripts/mtx-changer %c %o %S %a %d"
+ # Changer Device = /dev/sg0
+ # AutoChanger = yes
+   # Enable the Alert command only if you have the mtx package loaded
+--- a/examples/devices/two-drive-autoloader.conf
++++ b/examples/devices/two-drive-autoloader.conf
+@@ -5,7 +5,7 @@
+   Name = Autochanger
+   Device = Drive-1
+   Device = Drive-2
+-  Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
++  Changer Command = "/etc/bacula/scripts/mtx-changer %c %o %S %a %d"
+   Changer Device = /dev/sg0
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fc1bf60..79b2073 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ fix-mysql55-sql-syntax.patch
 fix-manpages
 remove-upstream-autoconf-log.patch
 fix-libbaccats-rpath.patch
+fix-scriptdir-examples-devices.patch

-- 
Bacula, a network backup, recovery and verification program