diff -Nru hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/changelog hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/changelog
--- hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/changelog	2017-02-20 01:20:23.000000000 +0000
+++ hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/changelog	2018-08-21 18:17:16.000000000 +0000
@@ -1,3 +1,11 @@
+hdmi2usb-fx2-firmware (0.0.0~git20151225-2) unstable; urgency=medium
+
+  * Migrate VCS to Salsa.
+  * Bump Standards-Version to 4.2.0, no changes needed.
+  * Change putchar() & getchar() prototypes to match sdcc. (Closes: #906363)
+
+ -- Stefano Rivera <stefanor@debian.org>  Tue, 21 Aug 2018 11:17:16 -0700
+
 hdmi2usb-fx2-firmware (0.0.0~git20151225-1) unstable; urgency=low
 
   * New upstream release (different git branch)
diff -Nru hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/control hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/control
--- hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/control	2017-02-20 01:20:23.000000000 +0000
+++ hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/control	2018-08-21 18:17:16.000000000 +0000
@@ -3,10 +3,10 @@
 Section: video
 Priority: optional
 Build-Depends: debhelper (>= 9), dh-exec, libusb-1.0-0-dev, sdcc
-Standards-Version: 3.9.8
+Standards-Version: 4.2.0
 Homepage: https://github.com/mithro/fx2lib/tree/cdc-usb-serialno-from-eeprom
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/hdmi2usb-fx2-firmware.git
-Vcs-Browser: https://anonscm.debian.org/git/collab-maint/hdmi2usb-fx2-firmware.git
+Vcs-Git: https://salsa.debian.org/debian/hdmi2usb-fx2-firmware.git
+Vcs-Browser: https://salsa.debian.org/debian/hdmi2usb-fx2-firmware
 
 Package: hdmi2usb-fx2-firmware
 Architecture: all
diff -Nru hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/patches/putchar-prototype hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/patches/putchar-prototype
--- hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/patches/putchar-prototype	1970-01-01 00:00:00.000000000 +0000
+++ hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/patches/putchar-prototype	2018-08-21 18:17:16.000000000 +0000
@@ -0,0 +1,44 @@
+From: Stefano Rivera <stefanor@debian.org>
+Date: Tue, 21 Aug 2018 10:05:03 -0700
+Subject: Change putchar() & getchar() prototype to match sdcc
+
+They changed prototype to be standards-compliant (upstream bug #2505)
+---
+ include/serial.h | 4 ++--
+ lib/serial.c     | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/serial.h b/include/serial.h
+index 7cdd4d7..5b7a60d 100644
+--- a/include/serial.h
++++ b/include/serial.h
+@@ -51,5 +51,5 @@ void sio0_init( DWORD baud_rate ) __critical ; // baud_rate max should be 57600
+  putchar('\\n') or putchar('\\r') both transmit \\r\\n
+  Just use one or the other. (This makes terminal echo easy)
+ **/
+-void putchar(char c);
+-char getchar();
++int putchar(int c);
++int getchar();
+diff --git a/lib/serial.c b/lib/serial.c
+index ce98b2c..328cbe3 100644
+--- a/lib/serial.c
++++ b/lib/serial.c
+@@ -69,7 +69,7 @@ void sio0_init( DWORD baud_rate ) __critical { // baud_rate max should be 57600
+ 
+ }
+ 
+-char getchar() {
++int getchar() {
+   char c;
+   while (!RI)
+     ;  
+@@ -84,7 +84,7 @@ void _transchar(char c) {
+  SBUF0=c;
+ }
+ 
+-void putchar (char c) {
++int putchar (int c) {
+   if (c=='\n') _transchar('\r'); // transmit \r\n
+   _transchar(c);  
+   if (c == '\r' ) _transchar('\n'); // transmit \r\n
diff -Nru hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/patches/series hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/patches/series
--- hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ hdmi2usb-fx2-firmware-0.0.0~git20151225/debian/patches/series	2018-08-21 18:17:16.000000000 +0000
@@ -0,0 +1 @@
+putchar-prototype