diff -Nru uisp-20050207/debian/changelog uisp-20050207/debian/changelog
--- uisp-20050207/debian/changelog	2020-02-24 15:10:17.000000000 +0000
+++ uisp-20050207/debian/changelog	2020-02-24 14:59:15.000000000 +0000
@@ -1,3 +1,19 @@
+uisp (20050207-4.3ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Build with -Wno-error as some warn_unused_result warnings are generated.
+      Fixes FTBFS
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 24 Feb 2020 15:59:15 +0100
+
+uisp (20050207-4.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop dpatch, switch to source format 3.0 (quilt)
+  * Make the build reproducible, patch by Chris Lamb (Closes: #832290)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Fri, 09 Aug 2019 16:21:50 +0200
+
 uisp (20050207-4.2ubuntu2) bionic; urgency=high
 
   * No change rebuild to pick up -fPIE compiler default
diff -Nru uisp-20050207/debian/control uisp-20050207/debian/control
--- uisp-20050207/debian/control	2020-02-24 15:10:17.000000000 +0000
+++ uisp-20050207/debian/control	2020-02-24 14:59:15.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Margarita Manterola <marga@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>=5), dpatch
+Build-Depends: debhelper (>=5)
 Homepage: http://www.nongnu.org/uisp/
 
 Package: uisp
diff -Nru uisp-20050207/debian/patches/00list uisp-20050207/debian/patches/00list
--- uisp-20050207/debian/patches/00list	2020-02-24 15:10:17.000000000 +0000
+++ uisp-20050207/debian/patches/00list	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-10_const_char.dpatch
-20_fix_manpage.dpatch
-30_fix_g++_4.3.dpatch
-40_fix_g++_4.6.dpatch
diff -Nru uisp-20050207/debian/patches/10_const_char.dpatch uisp-20050207/debian/patches/10_const_char.dpatch
--- uisp-20050207/debian/patches/10_const_char.dpatch	2020-02-24 15:10:17.000000000 +0000
+++ uisp-20050207/debian/patches/10_const_char.dpatch	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-#
-# DP: Fix that allows the code to compile in GCC 4.2.
-# DP: Changed char* name to const char* name, to make it a explicit 
-# DP: String constant
-# DP: by <marga@debian.org>
-@DPATCH@
---- uisp/src/Avr.h	2004-03-30 23:25:44.000000000 -0300
-+++ uisp/src/Avr.h.new	2006-04-14 14:23:19.125286240 -0300
-@@ -142,7 +142,7 @@
- private:
-   /* AVR Family Device (Part) List */
-   struct TPart {
--    char* name;
-+    const char* name;
-     TByte part_family;
-     TByte part_number;
-     TAddr flash_size;
diff -Nru uisp-20050207/debian/patches/10_const_char.patch uisp-20050207/debian/patches/10_const_char.patch
--- uisp-20050207/debian/patches/10_const_char.patch	1970-01-01 00:00:00.000000000 +0000
+++ uisp-20050207/debian/patches/10_const_char.patch	2020-02-24 14:59:15.000000000 +0000
@@ -0,0 +1,16 @@
+# Fix that allows the code to compile in GCC 4.2.
+# Changed char* name to const char* name, to make it a explicit 
+# String constant
+# by <marga@debian.org>
+
+--- uisp/src/Avr.h	2004-03-30 23:25:44.000000000 -0300
++++ uisp/src/Avr.h.new	2006-04-14 14:23:19.125286240 -0300
+@@ -142,7 +142,7 @@
+ private:
+   /* AVR Family Device (Part) List */
+   struct TPart {
+-    char* name;
++    const char* name;
+     TByte part_family;
+     TByte part_number;
+     TAddr flash_size;
diff -Nru uisp-20050207/debian/patches/20_fix_manpage.dpatch uisp-20050207/debian/patches/20_fix_manpage.dpatch
--- uisp-20050207/debian/patches/20_fix_manpage.dpatch	2020-02-24 15:10:17.000000000 +0000
+++ uisp-20050207/debian/patches/20_fix_manpage.dpatch	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_fix_man2.dpatch by Margarita Manterola <marga@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Improved the manpage a bit.
-
-@DPATCH@
-diff -urNad uisp-20050207~/uisp.1.in uisp-20050207/uisp.1.in
---- uisp-20050207~/uisp.1.in	2004-10-20 13:25:07.000000000 -0300
-+++ uisp-20050207/uisp.1.in	2007-09-27 21:53:05.000000000 -0300
-@@ -1,13 +1,13 @@
- .TH UISP "1" "@DATE@" "uisp version @VERSION@" "User Commands"
- .SH NAME
--uisp \- manual page for uisp
-+uisp \- Micro In-System Programmer for Atmel's AVR MCUs
- .SH SYNOPSIS
- .B uisp
- [\fIOPTION\fR].. \fI-dprog=TYPE\fR \fI-dpart=AT90XXX\fR \fI--FUNCTION\fR.. [\fIif=SOURCE\fR] [\fIof=DEST\fR]
- .SH DESCRIPTION
- .IP
- .SS "Programming Methods:"
--\fB\-dprog\fR=avr910|pavr|stk500
-+\fB\-dprog\fR=<method>
- .RS
- .TP
- avr910
-@@ -18,10 +18,6 @@
- .TP
- stk500
- Atmel STK500
--.RE
--.HP
--\fB\-dprog\fR=dapa|stk200|abb|atdh|avrisp|bsd|fbprg|dt006|maxi|dm04|dasa|dasa2|dasa3
--.RS
- .TP
- dapa
- Direct AVR Parallel Access
diff -Nru uisp-20050207/debian/patches/20_fix_manpage.patch uisp-20050207/debian/patches/20_fix_manpage.patch
--- uisp-20050207/debian/patches/20_fix_manpage.patch	1970-01-01 00:00:00.000000000 +0000
+++ uisp-20050207/debian/patches/20_fix_manpage.patch	2020-02-24 14:59:15.000000000 +0000
@@ -0,0 +1,32 @@
+by Margarita Manterola <marga@debian.org>
+
+diff -urNad uisp-20050207~/uisp.1.in uisp-20050207/uisp.1.in
+--- uisp-20050207~/uisp.1.in	2004-10-20 13:25:07.000000000 -0300
++++ uisp-20050207/uisp.1.in	2007-09-27 21:53:05.000000000 -0300
+@@ -1,13 +1,13 @@
+ .TH UISP "1" "@DATE@" "uisp version @VERSION@" "User Commands"
+ .SH NAME
+-uisp \- manual page for uisp
++uisp \- Micro In-System Programmer for Atmel's AVR MCUs
+ .SH SYNOPSIS
+ .B uisp
+ [\fIOPTION\fR].. \fI-dprog=TYPE\fR \fI-dpart=AT90XXX\fR \fI--FUNCTION\fR.. [\fIif=SOURCE\fR] [\fIof=DEST\fR]
+ .SH DESCRIPTION
+ .IP
+ .SS "Programming Methods:"
+-\fB\-dprog\fR=avr910|pavr|stk500
++\fB\-dprog\fR=<method>
+ .RS
+ .TP
+ avr910
+@@ -18,10 +18,6 @@
+ .TP
+ stk500
+ Atmel STK500
+-.RE
+-.HP
+-\fB\-dprog\fR=dapa|stk200|abb|atdh|avrisp|bsd|fbprg|dt006|maxi|dm04|dasa|dasa2|dasa3
+-.RS
+ .TP
+ dapa
+ Direct AVR Parallel Access
diff -Nru uisp-20050207/debian/patches/30_fix_g++_4.3.dpatch uisp-20050207/debian/patches/30_fix_g++_4.3.dpatch
--- uisp-20050207/debian/patches/30_fix_g++_4.3.dpatch	2020-02-24 15:10:17.000000000 +0000
+++ uisp-20050207/debian/patches/30_fix_g++_4.3.dpatch	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix_g++_4.3.dpatch by  <marga@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad uisp-20050207~/src/Stk500.C uisp-20050207/src/Stk500.C
---- uisp-20050207~/src/Stk500.C	2007-09-27 21:42:04.000000000 -0300
-+++ uisp-20050207/src/Stk500.C	2007-09-27 21:55:41.000000000 -0300
-@@ -419,7 +419,7 @@
-   }
- 
-   pgsz = prg_part[desired_part].params.pagesize;
--  pagesize = (pgsz[0]) << 8 + pgsz[1];
-+  pagesize = (pgsz[0] << 8) + pgsz[1];
- 
-   if (pagesize == 0) {
-     pagesize = 128;
diff -Nru uisp-20050207/debian/patches/30_fix_g++_4.3.patch uisp-20050207/debian/patches/30_fix_g++_4.3.patch
--- uisp-20050207/debian/patches/30_fix_g++_4.3.patch	1970-01-01 00:00:00.000000000 +0000
+++ uisp-20050207/debian/patches/30_fix_g++_4.3.patch	2020-02-24 14:59:15.000000000 +0000
@@ -0,0 +1,14 @@
+by  <marga@debian.org>
+
+diff -urNad uisp-20050207~/src/Stk500.C uisp-20050207/src/Stk500.C
+--- uisp-20050207~/src/Stk500.C	2007-09-27 21:42:04.000000000 -0300
++++ uisp-20050207/src/Stk500.C	2007-09-27 21:55:41.000000000 -0300
+@@ -419,7 +419,7 @@
+   }
+ 
+   pgsz = prg_part[desired_part].params.pagesize;
+-  pagesize = (pgsz[0]) << 8 + pgsz[1];
++  pagesize = (pgsz[0] << 8) + pgsz[1];
+ 
+   if (pagesize == 0) {
+     pagesize = 128;
diff -Nru uisp-20050207/debian/patches/40_fix_g++_4.6.dpatch uisp-20050207/debian/patches/40_fix_g++_4.6.dpatch
--- uisp-20050207/debian/patches/40_fix_g++_4.6.dpatch	2020-02-24 15:10:17.000000000 +0000
+++ uisp-20050207/debian/patches/40_fix_g++_4.6.dpatch	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_fix_g++_4.6.dpatch by peter green <plugwash@p10link.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove unused variables.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' uisp-20050207~/src/Stk500.C uisp-20050207/src/Stk500.C
---- uisp-20050207~/src/Stk500.C	2011-10-29 23:04:59.000000000 +0000
-+++ uisp-20050207/src/Stk500.C	2011-10-29 23:06:46.000000000 +0000
-@@ -724,7 +724,6 @@
- void TStk500::ReadMem(){
-   TByte buf[0x200];
-   int wordsize;
--  TAddr addr;
-   TByte seg;
- 
-   if (segment == SEG_FLASH) {
-@@ -741,7 +740,6 @@
- 
-   EnterProgrammingMode();
- 
--  addr = 0;
-   for (unsigned int addr=0; addr<GetSegmentSize(); addr+=0x100) {
-     memcpy(buf, SetAddress, sizeof(SetAddress));
-     buf[1] = (addr/wordsize) & 0xff;
diff -Nru uisp-20050207/debian/patches/40_fix_g++_4.6.patch uisp-20050207/debian/patches/40_fix_g++_4.6.patch
--- uisp-20050207/debian/patches/40_fix_g++_4.6.patch	1970-01-01 00:00:00.000000000 +0000
+++ uisp-20050207/debian/patches/40_fix_g++_4.6.patch	2020-02-24 14:59:15.000000000 +0000
@@ -0,0 +1,21 @@
+patch by peter green <plugwash@p10link.net>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' uisp-20050207~/src/Stk500.C uisp-20050207/src/Stk500.C
+--- uisp-20050207~/src/Stk500.C	2011-10-29 23:04:59.000000000 +0000
++++ uisp-20050207/src/Stk500.C	2011-10-29 23:06:46.000000000 +0000
+@@ -724,7 +724,6 @@
+ void TStk500::ReadMem(){
+   TByte buf[0x200];
+   int wordsize;
+-  TAddr addr;
+   TByte seg;
+ 
+   if (segment == SEG_FLASH) {
+@@ -741,7 +740,6 @@
+ 
+   EnterProgrammingMode();
+ 
+-  addr = 0;
+   for (unsigned int addr=0; addr<GetSegmentSize(); addr+=0x100) {
+     memcpy(buf, SetAddress, sizeof(SetAddress));
+     buf[1] = (addr/wordsize) & 0xff;
diff -Nru uisp-20050207/debian/patches/50-reproducible-build.patch uisp-20050207/debian/patches/50-reproducible-build.patch
--- uisp-20050207/debian/patches/50-reproducible-build.patch	1970-01-01 00:00:00.000000000 +0000
+++ uisp-20050207/debian/patches/50-reproducible-build.patch	2020-02-24 14:59:15.000000000 +0000
@@ -0,0 +1,17 @@
+Patch by Chris Lamb, Debian #832290
+
+--- uisp-20050207.orig/configure.ac
++++ uisp-20050207/configure.ac
+@@ -53,7 +53,11 @@ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS([gettimeofday memset select strcasecmp strncasecmp strstr strtol])
+ 
+ # Set the DATE variable for the man page
+-DATE=`date "+%B, %Y"`
++if test -n "$SOURCE_DATE_EPOCH"; then
++	DATE=`LC_ALL date --utc --date="@$SOURCE_DATE_EPOCH" "+%B, %Y"`
++else
++	DATE=`date "+%B, %Y"`
++fi
+ AC_SUBST(DATE)
+ 
+ AC_CONFIG_FILES([Makefile
diff -Nru uisp-20050207/debian/patches/series uisp-20050207/debian/patches/series
--- uisp-20050207/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ uisp-20050207/debian/patches/series	2020-02-24 14:59:15.000000000 +0000
@@ -0,0 +1,5 @@
+10_const_char.patch
+20_fix_manpage.patch
+30_fix_g++_4.3.patch
+40_fix_g++_4.6.patch
+50-reproducible-build.patch
diff -Nru uisp-20050207/debian/rules uisp-20050207/debian/rules
--- uisp-20050207/debian/rules	2020-02-24 15:10:17.000000000 +0000
+++ uisp-20050207/debian/rules	2020-02-24 14:59:15.000000000 +0000
@@ -4,9 +4,6 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-# This package uses dpatch
-include /usr/share/dpatch/dpatch.make
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
diff -Nru uisp-20050207/debian/source/format uisp-20050207/debian/source/format
--- uisp-20050207/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ uisp-20050207/debian/source/format	2020-02-24 14:59:15.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)