This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch xenial-ppa in repository freeorion.
commit bf1907f1d01a107f765ccac94485ad0915fe5550 Author: Markus Koschany <[email protected]> Date: Thu Oct 6 17:36:50 2016 +0200 Install libs into Multiarch directories due to Ubuntu CMAKE delta. --- debian/changelog | 6 ++++-- debian/freeorion.install | 2 +- debian/rules | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7c9c01..a446ecb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -freeorion (0.4.6-1~ppa1~xenial2) xenial; urgency=medium +freeorion (0.4.6-1~ppa1~xenial3) xenial; urgency=medium - * No change rebuild for xenial. + * Rebuild for Xenial. + * Use compat level 9 again. + * Install libs into Multiarch directories due to Ubuntu CMAKE delta. -- Markus Koschany <[email protected]> Thu, 06 Oct 2016 15:05:53 +0200 diff --git a/debian/freeorion.install b/debian/freeorion.install index fe7f9eb..a6bb981 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 4c64f8b..8d87591 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ #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))) @@ -29,7 +30,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/freeorion/freeorion:$(LD_LIBRARY_PATH)" dh_shlibdeps + LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
