[freeorion] 07/09: Revert "Install freeorion libraries into MULTIARCH directories."

[Markus Koschany]

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

apo pushed a commit to branch master
in repository freeorion.

commit 53e0664e05cf755d96eba3e48f233da9508857b8
Author: Markus Koschany <apo at debian.org>
Date:   Mon Sep 26 19:30:20 2016 +0200

    Revert "Install freeorion libraries into MULTIARCH directories."
    
    This reverts commit 9632e7c4b0b1601b3c850a7af560f93428e0afb7.
---
 debian/changelog         | 1 -
 debian/freeorion.install | 2 +-
 debian/rules             | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b216c73..bcab718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ freeorion (0.4.6-1) unstable; urgency=medium
   * New upstream release.
   * Switch to compat level 10.
   * Update get-orig-source target.
-  * Install freeorion libraries into MULTIARCH directories.
   * Update freeorion.6 man page for latest release.
   * Remove source/local-options file.
 
diff --git a/debian/freeorion.install b/debian/freeorion.install
index a6bb981..fe7f9eb 100644
--- a/debian/freeorion.install
+++ b/debian/freeorion.install
@@ -1,4 +1,4 @@
 debian/bin/*                                usr/games
 usr/bin/*                                   usr/lib/freeorion
-usr/lib/*/freeorion/*
+usr/lib/freeorion
 usr/share/applications
diff --git a/debian/rules b/debian/rules
index 8d87591..4c64f8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 #export DH_VERBOSE=1
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 WEAK_HOSTS := armel armhf
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(WEAK_HOSTS)))
@@ -30,7 +29,7 @@ override_dh_auto_build-indep:
 
 #workaround for 'dpkg-shlibdeps: error: couldn't find library libGiGi*.so'
 override_dh_shlibdeps:
-	LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/freeorion:$(LD_LIBRARY_PATH)" dh_shlibdeps
+	LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/freeorion/freeorion:$(LD_LIBRARY_PATH)" dh_shlibdeps
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.md

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