Set debian/compat to 10 (multiarch)

7 files changed, 32 insertions, 32 deletions

diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 6bdf28f..e6c69b4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: https://github.com/xroche/httrack.git
 
 Package: httrack
 Architecture: any
-Multi-Arch: no
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: webhttrack, httrack-doc
 Description: Copy websites to your computer (Offline browser)
@@ -27,7 +27,7 @@ Description: Copy websites to your computer (Offline browser)
 
 Package: webhttrack
 Architecture: any
-Multi-Arch: no
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}, webhttrack-common, iceape-browser | iceweasel | icecat | mozilla | firefox | mozilla-firefox | www-browser | sensible-utils
 Replaces: webhttrack-common (<< 3.43.9-2)
 Breaks: webhttrack-common (<< 3.43.9-2)
@@ -50,7 +50,7 @@ Description: Copy websites to your computer, httrack with a Web interface
 
 Package: webhttrack-common
 Architecture: all
-Multi-Arch: allowed
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: webhttrack common files
  This package is the common files of webhttrack, website copier and
@@ -58,7 +58,7 @@ Description: webhttrack common files
 
 Package: libhttrack2
 Architecture: any
-Multi-Arch: no
+Multi-Arch: same
 Section: libs
 Replaces: libhttrack1
 Conflicts: libhttrack1
@@ -69,7 +69,7 @@ Description: Httrack website copier library
 
 Package: libhttrack-dev
 Architecture: any
-Multi-Arch: no
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, ${shlibs:Depends}, zlib1g-dev
 Description: Httrack website copier includes and development files
@@ -78,7 +78,7 @@ Description: Httrack website copier includes and development files
 
 Package: httrack-doc
 Architecture: all
-Multi-Arch: allowed
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Description: Httrack website copier additional documentation
@@ -87,7 +87,7 @@ Description: Httrack website copier additional documentation
 
 Package: proxytrack
 Architecture: any
-Multi-Arch: no
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: squid, httrack
 Description: Build HTTP Caches using archived websites copied by HTTrack
diff --git a/debian/libhttrack-dev.files b/debian/libhttrack-dev.files
index fd67463..3878ba8 100644
--- a/debian/libhttrack-dev.files
+++ b/debian/libhttrack-dev.files
@@ -1,6 +1,6 @@
 usr/include/httrack
-usr/lib/libhttrack.{so}
-usr/lib/libhtsjava.{so}
+usr/lib/*/libhttrack.{so}
+usr/lib/*/libhtsjava.{so}
 usr/share/httrack/libtest
-usr/lib/httrack/libtest
+usr/lib/*/httrack/libtest
 usr/share/lintian/overrides/libhttrack-dev
diff --git a/debian/libhttrack-swf1.files b/debian/libhttrack-swf1.files
index 1869929..0a7147e 100644
--- a/debian/libhttrack-swf1.files
+++ b/debian/libhttrack-swf1.files
@@ -1,2 +1,2 @@
-usr/lib/libhtsswf.so.1.0.0
-usr/lib/libhtsswf.so.1
+usr/lib/*/libhtsswf.so.1.0.0
+usr/lib/*/libhtsswf.so.1
diff --git a/debian/libhttrack2.files b/debian/libhttrack2.files
index 4977ce0..291ddb1 100644
--- a/debian/libhttrack2.files
+++ b/debian/libhttrack2.files
@@ -1,5 +1,5 @@
-usr/lib/libhttrack.so.2.0.49
-usr/lib/libhttrack.so.2
-usr/lib/libhtsjava.so.2.0.49
-usr/lib/libhtsjava.so.2
+usr/lib/*/libhttrack.so.2.0.49
+usr/lib/*/libhttrack.so.2
+usr/lib/*/libhtsjava.so.2.0.49
+usr/lib/*/libhtsjava.so.2
 usr/share/httrack/templates
diff --git a/debian/rules b/debian/rules
index 7367eb6..c5e320a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,27 +82,27 @@ install: build
 		$(CURDIR)/debian/httrack/usr/share/doc/httrack/httrack-doc.html
 
 	# place libraries and cleanup
-	mkdir -p $(CURDIR)/debian/httrack/usr/lib/httrack/
+	mkdir -p $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/
 	mv $(CURDIR)/debian/httrack/usr/bin/htsserver \
-		$(CURDIR)/debian/httrack/usr/lib/httrack/
+		$(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/
 	# remove *.la (https://wiki.debian.org/ReleaseGoals/LAFileRemoval)
-	rm -f $(CURDIR)/debian/httrack/usr/lib/*.la
-	rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.la
+	rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+	rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.la
 	# remove *.a unless we do not have *.so files
 	# see BUG #744594
-	if ls $(CURDIR)/debian/httrack/usr/lib/*.so >/dev/null 2>/dev/null ; then \
-		rm -f $(CURDIR)/debian/httrack/usr/lib/*.a ; \
+	if ls $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.so >/dev/null 2>/dev/null ; then \
+		rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.a ; \
 	fi
-	if ls $(CURDIR)/debian/httrack/usr/lib/httrack/*.so >/dev/null 2>/dev/null ; then \
-		rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.a ; \
+	if ls $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.so >/dev/null 2>/dev/null ; then \
+		rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.a ; \
 	fi
-	mv $(CURDIR)/debian/httrack/usr/lib/httrack/lib* \
+	mv $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/lib* \
 		$(CURDIR)/debian/httrack/usr/share/httrack/libtest/
-	mkdir -p $(CURDIR)/debian/httrack/usr/lib/httrack/libtest
+	mkdir -p $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest
 	mv $(CURDIR)/debian/httrack/usr/share/httrack/libtest/lib* \
-		$(CURDIR)/debian/httrack/usr/lib/httrack/libtest
+		$(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest
 	ln -s ../../../share/httrack/libtest/readme.txt \
-		 $(CURDIR)/debian/httrack/usr/lib/httrack/libtest/readme.txt
+		 $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest/readme.txt
 
 	# Lintian overrides
 	mkdir -p $(CURDIR)/debian/httrack/usr/share/lintian/overrides
@@ -143,10 +143,10 @@ binary-arch: build install
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a -X/usr/lib/httrack/libtest --version-info
+	dh_makeshlibs -a -X/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest --version-info
 	dh_installdeb -a
 	# we depend on the current version (ABI may change)
-	dh_shlibdeps -a -ldebian/libhttrack2/usr/lib
+	dh_shlibdeps -a -ldebian/libhttrack2/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
diff --git a/debian/webhttrack.files b/debian/webhttrack.files
index 01ff5a9..219f33d 100644
--- a/debian/webhttrack.files
+++ b/debian/webhttrack.files
@@ -1,4 +1,4 @@
-usr/lib/httrack/htsserver
+usr/lib/*/httrack/htsserver
 usr/bin/webhttrack
 usr/share/man/man1/webhttrack.1
 usr/share/man/man1/htsserver.1