[pkg-bacula-commits] [bacula] 06/14: Add Multi-Arch Path to template substitution

[Sven Hartge]

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

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

commit 0d9b8fb001abca6e4a65969e2ee197ab050472fd
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sun Nov 12 17:50:04 2017 +0100

    Add Multi-Arch Path to template substitution
---
 debian/bacula-common-db.install.in | 2 +-
 debian/bacula-common-db.links.in   | 4 ++--
 debian/rules                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/bacula-common-db.install.in b/debian/bacula-common-db.install.in
index df134a3..f218006 100644
--- a/debian/bacula-common-db.install.in
+++ b/debian/bacula-common-db.install.in
@@ -1 +1 @@
-usr/lib/*/bacula/libbaccats-XX_DBLONGNAME_XX*.so
+usr/lib/XX_DEB_HOST_MULTIARCH_XX/bacula/libbaccats-XX_DBLONGNAME_XX*.so
diff --git a/debian/bacula-common-db.links.in b/debian/bacula-common-db.links.in
index eb13a4f..5fe6abe 100644
--- a/debian/bacula-common-db.links.in
+++ b/debian/bacula-common-db.links.in
@@ -1,2 +1,2 @@
-usr/lib/*/bacula/libbaccats-XX_DBLONGNAME_XX.so usr/lib/bacula/libbaccats-XX_VERSION_XX.so
-usr/lib/*/bacula/libbaccats-XX_VERSION_XX.so usr/lib/bacula/libbaccats.so
+usr/lib/XX_DEB_HOST_MULTIARCH_XX/bacula/libbaccats-XX_DBLONGNAME_XX.so usr/lib/XX_DEB_HOST_MULTIARCH_XX/bacula/libbaccats-XX_VERSION_XX.so
+usr/lib/XX_DEB_HOST_MULTIARCH_XX/bacula/libbaccats-XX_VERSION_XX.so usr/lib/XX_DEB_HOST_MULTIARCH_XX/bacula/libbaccats.so
diff --git a/debian/rules b/debian/rules
index 76b170f..6724089 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ LONGNAME_sqlite3	= sqlite3
 # args: 1 -- template file
 #       2 -- db type
 define template-subst
-sed -e 's/XX_DB_XX/$(2)/' -e 's/XX_DBLONGNAME_XX/$(LONGNAME_$(2))/' -e 's/XX_VERSION_XX/$(VERSION)/' '$(1)' >'$(patsubst %.in,%,$(subst -db.,-$(2).,$(1)))';
+sed -e 's/XX_DB_XX/$(2)/' -e 's/XX_DBLONGNAME_XX/$(LONGNAME_$(2))/' -e 's/XX_VERSION_XX/$(VERSION)/' -e 's/XX_DEB_HOST_MULTIARCH_XX/$(DEB_HOST_MULTIARCH)/' '$(1)' >'$(patsubst %.in,%,$(subst -db.,-$(2).,$(1)))';
 endef
 
 # Macro for cleanup file generated for specified database from specified template

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