diff -Nru openorienteering-mapper-0.8.4/debian/changelog openorienteering-mapper-0.8.4/debian/changelog --- openorienteering-mapper-0.8.4/debian/changelog 2018-12-25 11:21:02.000000000 +0000 +++ openorienteering-mapper-0.8.4/debian/changelog 2019-01-03 00:56:51.000000000 +0000 @@ -1,3 +1,13 @@ +openorienteering-mapper (0.8.4-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. + + -- Raspbian forward porter Thu, 03 Jan 2019 00:56:51 +0000 + openorienteering-mapper (0.8.4-1) unstable; urgency=medium * New upstream release diff -Nru openorienteering-mapper-0.8.4/debian/patches/force-debian-license-info.patch openorienteering-mapper-0.8.4/debian/patches/force-debian-license-info.patch --- openorienteering-mapper-0.8.4/debian/patches/force-debian-license-info.patch 1970-01-01 00:00:00.000000000 +0000 +++ openorienteering-mapper-0.8.4/debian/patches/force-debian-license-info.patch 2019-01-03 00:56:51.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Use "debian" as "provider" for "licensing information". +Author: Peter Michael Green + +--- openorienteering-mapper-0.7.0.orig/doc/licensing/CMakeLists.txt ++++ openorienteering-mapper-0.7.0/doc/licensing/CMakeLists.txt +@@ -42,7 +42,7 @@ elseif(UNIX) + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(system) +- set(default_provider "${system}") ++ set(default_provider "debian") + else() + set(default_provider NOTFOUND) + endif() diff -Nru openorienteering-mapper-0.8.4/debian/patches/series openorienteering-mapper-0.8.4/debian/patches/series --- openorienteering-mapper-0.8.4/debian/patches/series 2018-12-25 09:59:12.000000000 +0000 +++ openorienteering-mapper-0.8.4/debian/patches/series 2019-01-03 00:56:51.000000000 +0000 @@ -1 +1,2 @@ fix-help-data-dir.patch +force-debian-license-info.patch diff -Nru openorienteering-mapper-0.8.4/debian/rules openorienteering-mapper-0.8.4/debian/rules --- openorienteering-mapper-0.8.4/debian/rules 2018-12-25 09:59:12.000000000 +0000 +++ openorienteering-mapper-0.8.4/debian/rules 2019-01-03 00:56:51.000000000 +0000 @@ -47,5 +47,6 @@ 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 +