diff -Nru synaptic-0.84.8/debian/changelog synaptic-0.84.8+rpi1/debian/changelog --- synaptic-0.84.8/debian/changelog 2019-10-15 04:58:08.000000000 +0000 +++ synaptic-0.84.8+rpi1/debian/changelog 2019-10-22 20:22:37.000000000 +0000 @@ -1,3 +1,13 @@ +synaptic (0.84.8+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 0.81.2+rpi1 by Peter Michael Green at Fri, 01 Aug 2014 01:51:30 +0000] + * Fix build on raspbian (see: #744371). + + [changes introduced in 0.83+rpi1+nmu1 by Peter Michael Green] + * Force build system to apply patches for Debian regardless of system. + + -- Raspbian forward porter Tue, 22 Oct 2019 20:22:37 +0000 + synaptic (0.84.8) unstable; urgency=medium * debian/control: diff -Nru synaptic-0.84.8/debian/patches/00list synaptic-0.84.8+rpi1/debian/patches/00list --- synaptic-0.84.8/debian/patches/00list 2019-10-15 04:58:08.000000000 +0000 +++ synaptic-0.84.8+rpi1/debian/patches/00list 2019-10-22 20:22:37.000000000 +0000 @@ -1,3 +0,0 @@ -01_ubuntu_changelog -#10_ubuntu_maintenance_gui - diff -Nru synaptic-0.84.8/debian/rules synaptic-0.84.8+rpi1/debian/rules --- synaptic-0.84.8/debian/rules 2019-10-15 04:58:08.000000000 +0000 +++ synaptic-0.84.8+rpi1/debian/rules 2019-10-22 20:22:37.000000000 +0000 @@ -1,7 +1,8 @@ #!/usr/bin/make -f # make the package build on ubuntu and debian -DIST = $(shell lsb_release -i -s) +# DIST = $(shell lsb_release -i -s) +DIST = Debian DHFLAGS=--parallel CONFIGURE_FLAGS= --prefix=/usr \ @@ -48,7 +49,9 @@ # unpatch override_dh_auto_clean: - cp debian/patches/00list.$(DIST) debian/patches/00list - dpatch deapply-all + if [ -e debian/patches/00list.$(DIST) ]; then \ + cp debian/patches/00list.$(DIST) debian/patches/00list;\ + dpatch deapply-all;\ + fi; rm -rf patch-stamp debian/patched dh_auto_clean $(DHFLAGS)