Bas Couwenberg pushed to branch master at Debian GIS Project / qmapshack
Commits: be77c260 by Bas Couwenberg at 2018-07-17T18:54:22+02:00 Don't bother to regenerate the icons. (LP: 1780046) - - - - - 55c29e93 by Bas Couwenberg at 2018-07-17T18:55:59+02:00 Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -qmapshack (1.11.1-2) UNRELEASED; urgency=medium +qmapshack (1.11.1-2) unstable; urgency=medium * Strip trailing whitespace from control & rules files. * Bump Standards-Version to 4.1.5, no changes. + * Don't bother to regenerate the icons. + (LP: 1780046) - -- Bas Couwenberg <[email protected]> Mon, 07 May 2018 22:15:29 +0200 + -- Bas Couwenberg <[email protected]> Tue, 17 Jul 2018 18:55:27 +0200 qmapshack (1.11.1-1) unstable; urgency=medium ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Section: science Priority: optional Build-Depends: cmake, debhelper (>= 9.20120417~), - inkscape, libalglib-dev, libgdal-dev (>= 1.10.1-0~), libproj-dev, ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,6 @@ # Enable hardening build flags export DEB_BUILD_MAINT_OPTIONS=hardening=+all -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) - export QT_SELECT := qt5 # one ring to rule them all ... @@ -14,24 +12,6 @@ export QT_SELECT := qt5 override_dh_auto_configure: dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1 -override_dh_auto_build: -ifeq (,$(findstring $(DEB_HOST_ARCH),"arm64 mips64el powerpc hurd-i386")) - # Don't regenerate icons on architectures where inkscape fails - $(RM) $(CURDIR)/src/icons/16x16/* - $(RM) $(CURDIR)/src/icons/32x32/* - $(RM) $(CURDIR)/src/icons/48x48/* - $(RM) $(CURDIR)/src/icons/cache/32x32/* - $(RM) $(CURDIR)/src/icons/waypoints/32x32/* - $(RM) $(CURDIR)/src/pics/compass.png - - cd $(CURDIR)/src/icons/ && bash makeicons - cd $(CURDIR)/src/icons/cache/ && bash makeicons - cd $(CURDIR)/src/icons/waypoints/ && bash makeicons - inkscape -D -w 180 -h 180 $(CURDIR)/src/qmapshack/pics/compass.svg --export-png=$(CURDIR)/src/qmapshack/pics/compass.png -endif - - dh_auto_build - override_dh_install: dh_install --list-missing View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/compare/2224b400b93a46f883443484d1da73d61eebda9c...55c29e9309e4b3bd7428c91025b0ee630483a492 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/compare/2224b400b93a46f883443484d1da73d61eebda9c...55c29e9309e4b3bd7428c91025b0ee630483a492 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
