diff -Nru ck-0.7.1/debian/changelog ck-0.7.1/debian/changelog --- ck-0.7.1/debian/changelog 2022-07-07 08:14:36.000000000 +0000 +++ ck-0.7.1/debian/changelog 2022-07-13 22:59:47.000000000 +0000 @@ -1,3 +1,11 @@ +ck (0.7.1-8+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 0.7.1-7+rpi1 by Peter Michael Green at Mon, 20 Jun 2022 02:10:46 +0000] + * Remove inappropriate compiler flags. + * Fix clean target. + + -- Raspbian forward porter Wed, 13 Jul 2022 22:59:47 +0000 + ck (0.7.1-8) sid; urgency=medium * Uploading to sid. diff -Nru ck-0.7.1/debian/patches/remove-inappropriate-march.patch ck-0.7.1/debian/patches/remove-inappropriate-march.patch --- ck-0.7.1/debian/patches/remove-inappropriate-march.patch 1970-01-01 00:00:00.000000000 +0000 +++ ck-0.7.1/debian/patches/remove-inappropriate-march.patch 2022-07-13 22:59:47.000000000 +0000 @@ -0,0 +1,20 @@ +Description: remove inappropriate -march +Author: Peter Michael Green + +--- ck-0.7.1.orig/configure ++++ ck-0.7.1/configure +@@ -506,14 +506,6 @@ case $PLATFORM in + ENVIRONMENT=64 + ;; + arm|armv6|armv6l|armv7|armv7l) +- case "$PLATFORM" in +- "armv6"|"armv6l") +- CFLAGS="$CFLAGS -march=armv6k"; +- ;; +- "armv7"|"armv7l") +- CFLAGS="$CFLAGS -march=armv7-a"; +- ;; +- esac + RTM_ENABLE="CK_MD_RTM_DISABLE" + LSE_ENABLE="CK_MD_LSE_DISABLE" + MM="${MM:-"CK_MD_RMO"}" diff -Nru ck-0.7.1/debian/rules ck-0.7.1/debian/rules --- ck-0.7.1/debian/rules 2022-07-07 08:14:36.000000000 +0000 +++ ck-0.7.1/debian/rules 2022-07-13 22:59:47.000000000 +0000 @@ -6,11 +6,6 @@ PLATFORM = --platform=unknown endif -ifeq ($(DEB_HOST_ARCH),armhf) - DEB_CFLAGS_MAINT_APPEND = -march=armv7-a+fp - export DEB_CFLAGS_MAINT_APPEND -endif - ifeq ($(DEB_HOST_ARCH), i386) PLATFORM = --disable-sse endif @@ -31,3 +26,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386)) $(MAKE) -j1 check endif + +execute_after_dh_auto_clean: + rm -f build/ck.spec include/freebsd/ck_md.h src/Makefile