diff -Nru protobuf-3.6.1.3/debian/changelog protobuf-3.6.1.3/debian/changelog --- protobuf-3.6.1.3/debian/changelog 2018-12-09 12:45:11.000000000 +0000 +++ protobuf-3.6.1.3/debian/changelog 2018-12-11 16:14:24.000000000 +0000 @@ -1,3 +1,10 @@ +protobuf (3.6.1.3-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 3.6.1-4+rpi1 by Peter Michael Green at Thu, 25 Oct 2018 12:28:38 +0000] + * Add armhf to libatomic architectures list. + + -- Raspbian forward porter Tue, 11 Dec 2018 16:14:24 +0000 + protobuf (3.6.1.3-1) unstable; urgency=medium * New upstream release. diff -Nru protobuf-3.6.1.3/debian/rules protobuf-3.6.1.3/debian/rules --- protobuf-3.6.1.3/debian/rules 2018-11-26 23:23:31.000000000 +0000 +++ protobuf-3.6.1.3/debian/rules 2018-12-11 16:14:23.000000000 +0000 @@ -10,7 +10,7 @@ export DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR = debian/ruby-google-protobuf export GEM2DEB_TEST_RUNNER = --check-dependencies -ifneq (,$(findstring $(DEB_BUILD_ARCH), armel m68k mips mipsel powerpc powerpcspe sh4)) +ifneq (,$(findstring $(DEB_BUILD_ARCH), armhf armel m68k mips mipsel powerpc powerpcspe sh4)) export DEB_LDFLAGS_MAINT_APPEND = -latomic endif