diff -u cbmplugs-1.2.2/debian/changelog cbmplugs-1.2.2/debian/changelog
--- cbmplugs-1.2.2/debian/changelog
+++ cbmplugs-1.2.2/debian/changelog
@@ -1,3 +1,10 @@
+cbmplugs (1.2.2-1+rpi1) bullseye-staging; urgency=medium
+
+  * Adjust enum declaration to avoid declaring an unused
+    variable in multiple compilatoin units (Closes: 957069 )
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 28 Aug 2020 01:56:53 +0000
+
 cbmplugs (1.2.2-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- cbmplugs-1.2.2.orig/cbmplugs.h
+++ cbmplugs-1.2.2/cbmplugs.h
@@ -33,7 +33,7 @@
 					GimpParam **return_vals)
 #endif
 
-enum {
+enum gfxformat {
 	KOALA = 0x0,
 	ADVOCP,
 	OCP,
@@ -56,7 +56,7 @@
 	SHFLI,
 	SHFXL,
 	HWS,
-} gfxformat;
+};
 
 gint32 load_image(char *filename, guint8 type);
 gint save_image(char *filename, gint32 image_ID, guint8 type);