This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack.
commit 9c6ec051fbc331577df6c1c236af234239e9a6a2 Author: Bas Couwenberg <[email protected]> Date: Wed Aug 26 02:09:44 2015 +0200 Disable icon regeneration on arm64 due to inkscape failure. --- debian/changelog | 6 ++++++ debian/rules | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39c5dcc..16a8d3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qmapshack (1.3.0-4) UNRELEASED; urgency=medium + + * Disable icon regeneration on arm64 due to inkscape failure. + + -- Bas Couwenberg <[email protected]> Wed, 26 Aug 2015 02:08:25 +0200 + qmapshack (1.3.0-3) unstable; urgency=medium * Update Vcs-Browser URL to use HTTPS. diff --git a/debian/rules b/debian/rules index 11d0592..9359bc5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + export QT_SELECT := qt5 # one ring to rule them all ... @@ -10,6 +12,8 @@ override_dh_auto_configure: dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1 override_dh_auto_build: +ifeq (,$(findstring $(DEB_HOST_ARCH),"arm64")) + # Don't regenerate icons on arm64, inkscape fails $(RM) $(CURDIR)/src/icons/16x16/* $(RM) $(CURDIR)/src/icons/32x32/* $(RM) $(CURDIR)/src/icons/48x48/* @@ -21,6 +25,7 @@ override_dh_auto_build: cd $(CURDIR)/src/icons/cache/ && bash makeicons cd $(CURDIR)/src/icons/waypoints/ && bash makeicons inkscape -D -w 180 -h 180 $(CURDIR)/src/pics/compass.svg --export-png=$(CURDIR)/src/pics/compass.png +endif dh_auto_build -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
