This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository freeorion.
commit c8abb6c28ccab3b9a24d76eaf9abad1f6788a7b2 Author: Markus Koschany <[email protected]> Date: Sun Oct 23 18:15:20 2016 +0200 Apply patch from Gianfranco Costamagna and install libraries into Multiarch directories. Closes: #841824 --- debian/changelog | 10 ++++++++++ debian/freeorion.install | 2 +- debian/patches/multiarch-fix.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 ++- 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b86acc..be6ca70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +freeorion (0.4.6-2) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * d/p/multiarch-fix.patch: + - make the package multiarch ready, by fixing a wrong + cmake inclusion order + * d/{rules,freeorion.install} multiarchify. (Closes: #841824) + + -- Markus Koschany <[email protected]> Sun, 23 Oct 2016 18:15:01 +0200 + freeorion (0.4.6-1) unstable; urgency=medium * New upstream release. diff --git a/debian/freeorion.install b/debian/freeorion.install index fe7f9eb..4723e4a 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/patches/multiarch-fix.patch b/debian/patches/multiarch-fix.patch new file mode 100644 index 0000000..f42a79f --- /dev/null +++ b/debian/patches/multiarch-fix.patch @@ -0,0 +1,24 @@ +Description: the include(GNUInstallDirs) should go *after* "project" declaration. +Author: Gianfranco Costamagna <[email protected]> + +Last-Update: 2016-10-23 + +--- freeorion-0.4.6.orig/CMakeLists.txt ++++ freeorion-0.4.6/CMakeLists.txt +@@ -1,7 +1,5 @@ + cmake_minimum_required(VERSION 2.8.5) + +-include(GNUInstallDirs) +- + list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake ${CMAKE_HOME_DIRECTORY}/GG/cmake) + set(CMAKE_CONFIGURATION_TYPES Debug Release) + IF(NOT CMAKE_BUILD_TYPE) +@@ -18,6 +16,8 @@ message(STATUS "Build type CMAKE_BUILD_T + ######################################## + project(FreeOrion) + ++include(GNUInstallDirs) ++ + set(FreeOrion_VERSION 0.4.6) + + set(MINIMUM_BOOST_VERSION 1.54.0) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..31194f7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +multiarch-fix.patch 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
