From: Peter Michael Green Date: Thu, 5 Apr 2018 18:52:46 +0000 (+0000) Subject: Manual merge of version 0.7.0-1+rpi2 and 0.8.1.1-1 to produce 0.8.1.1-1+rpi1 X-Git-Tag: archive/raspbian/0.8.1.1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f8c5b7ab6497b17b16539e58cc9509826cda6c3e;p=openorienteering-mapper.git Manual merge of version 0.7.0-1+rpi2 and 0.8.1.1-1 to produce 0.8.1.1-1+rpi1 --- f8c5b7ab6497b17b16539e58cc9509826cda6c3e diff --cc debian/changelog index e55360e,b9e2e65..5f866bb --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,20 +1,30 @@@ - openorienteering-mapper (0.7.0-1+rpi2) buster-staging; urgency=medium ++openorienteering-mapper (0.8.1.1-1+rpi1) buster-staging; urgency=medium + ++ [changes brought forward from 0.7.0-1+rpi1 by Peter Michael Green at Thu, 26 Oct 2017 13:33:40 +0000] ++ * Use "debian" as "provider" for "licensing information". ++ ++ [changes brought forward from 0.7.0-1+rpi2 by Peter Michael Green at Thu, 15 Mar 2018 01:08:30 +0000] + * Disable testsuite. + - -- Peter Michael Green Thu, 15 Mar 2018 01:08:30 +0000 ++ -- Peter Michael Green Thu, 05 Apr 2018 16:31:54 +0000 + - openorienteering-mapper (0.7.0-1+rpi1) buster-staging; urgency=medium + openorienteering-mapper (0.8.1.1-1) unstable; urgency=medium - * Use "debian" as "provider" for "licensing information". - - -- Peter Michael Green Thu, 26 Oct 2017 13:33:40 +0000 + [ Gaudenz Steinlin ] + * New upstream release + - Fix build on big-endian systems (Closes: #865180) + - Fix reproducible builds (Closes: #876934) + - Update for PROJ5 + * Change VCS URLs to salsa.debian.org + * Document updating to a new upstream release + + [ Graham Inggs ] + * Add Build-Depends on sqlite3 + * Switch to debhelper compat level 11 + * Skip tests when DEB_BUILD_OPTIONS=nocheck + * Bump Standards-Version to 4.1.3, no changes + + -- Graham Inggs Thu, 29 Mar 2018 13:49:31 +0000 openorienteering-mapper (0.7.0-1) unstable; urgency=medium diff --cc debian/rules index 6f5a5a1,f1e7300..ec0088a --- a/debian/rules +++ b/debian/rules @@@ -44,6 -44,8 +44,9 @@@ override_dh_auto_install /usr/bin/chrpath -d $(PKGDIR)/usr/bin/Mapper override_dh_auto_test: + ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # The tests need a running X server, so use Xvfb to run the tests in automated # build environments. - cd obj-$(DEB_HOST_GNU_TYPE) ; xvfb-run /usr/bin/ctest --force-new-ctest-process -j1 --extra-verbose + #cd obj-$(DEB_HOST_GNU_TYPE) ; xvfb-run /usr/bin/ctest --force-new-ctest-process -j1 --extra-verbose + endif ++