[pkg-bacula-commits] [bacula] 14/14: Fix bacula-common-dbtype templates and dh_shlibdeps

[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 ec0cac2132caa77231188783ffc3471f96e097ad
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sun Nov 12 18:37:44 2017 +0100

    Fix bacula-common-dbtype templates and dh_shlibdeps
---
 debian/rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0dcac86..df3e010 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)/' -e 's/XX_DEB_HOST_MULTIARCH_XX/$(DEB_HOST_MULTIARCH)/' '$(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)/g' '$(1)' >'$(patsubst %.in,%,$(subst -db.,-$(2).,$(1)))';
 endef
 
 # Macro for cleanup file generated for specified database from specified template
@@ -103,8 +103,8 @@ endif
 # dependencies on that ourselves, because dpkg-shlibdeps doesn't
 # understand the variants
 override_dh_shlibdeps:
-	dh_shlibdeps -l/usr/lib/$(DEB_HOST_MULTIARCH)/bacula -pbacula-bscan -pbacula-director -- -xbacula-common-mysql -xbacula-common-pgsql -xbacula-common-sqlite3
-	dh_shlibdeps -l/usr/lib/$(DEB_HOST_MULTIARCH)/bacula -a --remaining-packages
+	dh_shlibdeps -pbacula-bscan -pbacula-director -- -xbacula-common-mysql -xbacula-common-pgsql -xbacula-common-sqlite3
+	dh_shlibdeps -a --remaining-packages
 
 override_dh_auto_build-arch:
 	dh_auto_build -a

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