diff -Nru moonshot-trust-router-3.5.0+1/debian/changelog moonshot-trust-router-3.5.0+1+rpi1/debian/changelog
--- moonshot-trust-router-3.5.0+1/debian/changelog	2019-08-06 21:10:11.000000000 +0000
+++ moonshot-trust-router-3.5.0+1+rpi1/debian/changelog	2019-11-19 07:43:29.000000000 +0000
@@ -1,3 +1,9 @@
+moonshot-trust-router (3.5.0+1+rpi1) bullseye-staging; urgency=medium
+
+  * Remove -Werror from CFLAGS, package needs deprecated GTimeVal (Closes: 944714)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 19 Nov 2019 07:43:29 +0000
+
 moonshot-trust-router (3.5.0+1) unstable; urgency=medium
 
   [ Jisc ]
diff -Nru moonshot-trust-router-3.5.0+1/.gitignore moonshot-trust-router-3.5.0+1+rpi1/.gitignore
--- moonshot-trust-router-3.5.0+1/.gitignore	2019-08-06 21:10:11.000000000 +0000
+++ moonshot-trust-router-3.5.0+1+rpi1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-*~
-\#*\#
-.\#*
-*.o
-*.la
-*.lo
-.deps
-.dirstamp
-.libs
-aclocal.m4
-build-aux
-configure
-Makefile.in
-Makefile
-autom4te.cache
-m4/*
-!m4/.ignore-this-file
-ltmain.sh
-libtool
-config.*
-tr/trust_router
-common/dh_test/tr_dh_test
-common/t_constraint
-tid/example/tids
-tid/example/tidc
\ No newline at end of file
diff -Nru moonshot-trust-router-3.5.0+1/gsscon/test/.gitignore moonshot-trust-router-3.5.0+1+rpi1/gsscon/test/.gitignore
--- moonshot-trust-router-3.5.0+1/gsscon/test/.gitignore	2019-08-06 21:10:11.000000000 +0000
+++ moonshot-trust-router-3.5.0+1+rpi1/gsscon/test/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-gsscon_client
-gsscon_server
diff -Nru moonshot-trust-router-3.5.0+1/Makefile.am moonshot-trust-router-3.5.0+1+rpi1/Makefile.am
--- moonshot-trust-router-3.5.0+1/Makefile.am	2019-08-06 21:10:11.000000000 +0000
+++ moonshot-trust-router-3.5.0+1+rpi1/Makefile.am	2019-11-19 07:43:07.000000000 +0000
@@ -6,7 +6,7 @@
               common/tests/commtest common/tests/name_test common/tests/filt_test mon/tests/test_mon_req_encode \
               mon/tests/test_mon_req_decode mon/tests/test_mon_resp_encode tr/trmon
 AM_CPPFLAGS=-I$(srcdir)/include $(GLIB_CFLAGS)
-AM_CFLAGS = -Wall -Werror=missing-prototypes -Werror -Wno-parentheses $(GLIB_CFLAGS)
+AM_CFLAGS = -Wall -Werror=missing-prototypes -Wno-parentheses $(GLIB_CFLAGS)
 SUBDIRS = gsscon
 common_srcs = \
     common/tr_name.c \