DEB tde-ebook-reader: use a variable for the library directory of architecture.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

10 files changed, 22 insertions, 8 deletions

diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/control b/debian/_base/applications/office/tde-ebook-reader/debian/control
index 3ffd947d0..cd9f85394 100644
--- a/debian/_base/applications/office/tde-ebook-reader/debian/control
+++ b/debian/_base/applications/office/tde-ebook-reader/debian/control
@@ -10,6 +10,7 @@ Standards-Version: 4.7.0
 
 Package: tde-ebook-reader
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: sensible-utils,
 Description: e-book reader for TDE
@@ -33,6 +34,7 @@ Description: e-book reader for TDE
 Package: libzlcore-tqt
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-data-tqt
 Description: ZLibrary TQt3-based development library (shared library)
  This is the core of ZLibrary, the library that tde-ebook-reader is based on.
@@ -40,6 +42,7 @@ Description: ZLibrary TQt3-based development library (shared library)
 Package: libzlcore-data-tqt
 Section: libs
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: ZLibrary TQt3-based development library (support files)
  This package contains the support files for the core of ZLibrary, the library
@@ -48,6 +51,7 @@ Description: ZLibrary TQt3-based development library (support files)
 Package: libzltext-tqt
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt, libzltext-data-tqt
 Description: ZLibrary TQt3-based text model/viewer part (shared library)
  This package provides text model/viewer part of ZLibrary.
@@ -55,6 +59,7 @@ Description: ZLibrary TQt3-based text model/viewer part (shared library)
 Package: libzltext-data-tqt
 Section: libs
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: ZLibrary TQt3-based text model/viewer part (support files)
  This package contains the support files for the text model/viewer part
@@ -63,6 +68,7 @@ Description: ZLibrary TQt3-based text model/viewer part (support files)
 Package: libzlcore-tqt-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt
 Description: ZLibrary TQt3-based development library (development files)
  This package contains development files for the ZLibrary core.
@@ -70,6 +76,7 @@ Description: ZLibrary TQt3-based development library (development files)
 Package: libzltext-tqt-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzltext-tqt
 Description: ZLibrary TQt3-based text model/viewer part (development files)
  This package contains development files for the ZLibrary text model/viewer
diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install b/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
index 4b2f1a823..4f30f38c6 100644
--- a/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
+++ b/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
@@ -1,2 +1,2 @@
 /usr/include/zlibrary-tqt/core
-/usr/lib/x86_64-linux-gnu/libzlcore-tqt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so
diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install b/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
index f13e427b0..3a6addd23 100644
--- a/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
+++ b/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
@@ -1 +1 @@
-/usr/lib/x86_64-linux-gnu/libzlcore-tqt.so.*
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so.*
diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install b/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
index eda8a3beb..95be86c20 100644
--- a/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
+++ b/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
@@ -1,2 +1,2 @@
 /usr/include/zlibrary-tqt/text
-/usr/lib/x86_64-linux-gnu/libzltext-tqt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so
diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install b/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
index 5d79675c1..3faed63a9 100644
--- a/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
+++ b/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
@@ -1 +1 @@
-/usr/lib/x86_64-linux-gnu/libzltext-tqt.so.*
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so.*
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/control b/ubuntu/_base/applications/office/tde-ebook-reader/debian/control
index 3ffd947d0..cd9f85394 100644
--- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/control
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/control
@@ -10,6 +10,7 @@ Standards-Version: 4.7.0
 
 Package: tde-ebook-reader
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: sensible-utils,
 Description: e-book reader for TDE
@@ -33,6 +34,7 @@ Description: e-book reader for TDE
 Package: libzlcore-tqt
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-data-tqt
 Description: ZLibrary TQt3-based development library (shared library)
  This is the core of ZLibrary, the library that tde-ebook-reader is based on.
@@ -40,6 +42,7 @@ Description: ZLibrary TQt3-based development library (shared library)
 Package: libzlcore-data-tqt
 Section: libs
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: ZLibrary TQt3-based development library (support files)
  This package contains the support files for the core of ZLibrary, the library
@@ -48,6 +51,7 @@ Description: ZLibrary TQt3-based development library (support files)
 Package: libzltext-tqt
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt, libzltext-data-tqt
 Description: ZLibrary TQt3-based text model/viewer part (shared library)
  This package provides text model/viewer part of ZLibrary.
@@ -55,6 +59,7 @@ Description: ZLibrary TQt3-based text model/viewer part (shared library)
 Package: libzltext-data-tqt
 Section: libs
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: ZLibrary TQt3-based text model/viewer part (support files)
  This package contains the support files for the text model/viewer part
@@ -63,6 +68,7 @@ Description: ZLibrary TQt3-based text model/viewer part (support files)
 Package: libzlcore-tqt-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt
 Description: ZLibrary TQt3-based development library (development files)
  This package contains development files for the ZLibrary core.
@@ -70,6 +76,7 @@ Description: ZLibrary TQt3-based development library (development files)
 Package: libzltext-tqt-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzltext-tqt
 Description: ZLibrary TQt3-based text model/viewer part (development files)
  This package contains development files for the ZLibrary text model/viewer
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
index 4b2f1a823..4f30f38c6 100644
--- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
@@ -1,2 +1,2 @@
 /usr/include/zlibrary-tqt/core
-/usr/lib/x86_64-linux-gnu/libzlcore-tqt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
index f13e427b0..3a6addd23 100644
--- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
@@ -1 +1 @@
-/usr/lib/x86_64-linux-gnu/libzlcore-tqt.so.*
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so.*
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
index eda8a3beb..95be86c20 100644
--- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
@@ -1,2 +1,2 @@
 /usr/include/zlibrary-tqt/text
-/usr/lib/x86_64-linux-gnu/libzltext-tqt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
index 5d79675c1..3faed63a9 100644
--- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
@@ -1 +1 @@
-/usr/lib/x86_64-linux-gnu/libzltext-tqt.so.*
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so.*