[pkg-bacula-commits] [bacula] 01/01: Fix path to bat binary after compilation

[Sven Hartge]

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

hartge-guest pushed a commit to branch qt5
in repository bacula.

commit 88e35b897844ae0c6597ecb5a1e3630acf6bd9c3
Author: Sven Hartge <sven at svenhartge.de>
Date:   Wed Feb 21 22:56:18 2018 +0100

    Fix path to bat binary after compilation
    
    The Qt5.9 build/install systems seems to have problems with libtool.
    After compilation, linking and stripping of the bat binary the resulting
    file is in src/qt-console/.libs/bat while src/qt-console/bat is just a
    shell wrapper from libtool.
    
    Temporarily change the path to the real binary until a different
    solution emerges.
    
    See also: https://bugs.gentoo.org/644566#c25
---
 debian/patches/debian-fix-bat-binary-source-path.patch | 11 +++++++++++
 debian/patches/series                                  |  1 +
 2 files changed, 12 insertions(+)

diff --git a/debian/patches/debian-fix-bat-binary-source-path.patch b/debian/patches/debian-fix-bat-binary-source-path.patch
new file mode 100644
index 0000000..f878376
--- /dev/null
+++ b/debian/patches/debian-fix-bat-binary-source-path.patch
@@ -0,0 +1,11 @@
+--- a/src/qt-console/bat.pro.in
++++ b/src/qt-console/bat.pro.in
+@@ -12,7 +12,7 @@
+ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+ 
+ bins.path = /$(DESTDIR)@sbindir@
+-bins.files = bat
++bins.files = .libs/bat
+ confs.path = /$(DESTDIR)@sysconfdir@
+ confs.commands = ./install_conf_file
+ help.path = /$(DESTDIR)@docdir@
diff --git a/debian/patches/series b/debian/patches/series
index 52bda71..866c29e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ debian-customize-systemd-units.patch
 #debian-fix-baculabackupreport-defaults.patch
 upstream-fix-update_sqlite3_tables.patch
 debian-gentoo-fix-pages-h-qt-includes.patch
+debian-fix-bat-binary-source-path.patch

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