I have uploaded another NMU.
diff -Nru tftp-hpa-5.2+20150808/debian/changelog 
tftp-hpa-5.2+20150808/debian/changelog
--- tftp-hpa-5.2+20150808/debian/changelog      2022-10-25 22:43:20.000000000 
+0200
+++ tftp-hpa-5.2+20150808/debian/changelog      2022-10-25 22:20:18.000000000 
+0200
@@ -1,3 +1,12 @@
+tftp-hpa (5.2+20150808-1.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Versioned Breaks and Replaces on tftp (Closes: #1022722).
+  * d/copyright: Drop the BSD advertisement clause.
+  * Move the package to 3.0 format.
+
+ -- Bastian Germann <b...@debian.org>  Tue, 25 Oct 2022 22:20:18 +0200
+
 tftp-hpa (5.2+20150808-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru tftp-hpa-5.2+20150808/debian/control 
tftp-hpa-5.2+20150808/debian/control
--- tftp-hpa-5.2+20150808/debian/control        2022-10-25 22:43:20.000000000 
+0200
+++ tftp-hpa-5.2+20150808/debian/control        2022-10-25 22:20:18.000000000 
+0200
@@ -1,6 +1,6 @@
 Source: tftp-hpa
 Section: net
-Priority: extra
+Priority: optional
 Maintainer: Ron Lee <r...@debian.org>
 Build-Depends: debhelper (>= 9), autoconf, autotools-dev, libwrap0-dev, 
po-debconf
 Standards-Version: 3.9.6.1
@@ -24,7 +24,6 @@
 
 Package: tftp-hpa-dbg
 Section: debug
-Priority: extra
 Architecture: linux-any kfreebsd-any
 Depends: tftp-hpa (= ${binary:Version}), tftpd-hpa (= ${binary:Version})
 Description: HPA's tftp (debug)
diff -Nru tftp-hpa-5.2+20150808/debian/copyright 
tftp-hpa-5.2+20150808/debian/copyright
--- tftp-hpa-5.2+20150808/debian/copyright      2022-10-25 22:43:20.000000000 
+0200
+++ tftp-hpa-5.2+20150808/debian/copyright      2022-10-25 22:20:18.000000000 
+0200
@@ -53,10 +53,7 @@
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-      This product includes software developed by the University of
-      California, Berkeley and its contributors.
+ 3. <deleted>
  4. Neither the name of the University nor the names of its contributors
     may be used to endorse or promote products derived from this software
     without specific prior written permission.
diff -Nru tftp-hpa-5.2+20150808/debian/patches/extern-sigjmp_buf.patch 
tftp-hpa-5.2+20150808/debian/patches/extern-sigjmp_buf.patch
--- tftp-hpa-5.2+20150808/debian/patches/extern-sigjmp_buf.patch        
1970-01-01 01:00:00.000000000 +0100
+++ tftp-hpa-5.2+20150808/debian/patches/extern-sigjmp_buf.patch        
2022-10-25 22:20:18.000000000 +0200
@@ -0,0 +1,11 @@
+--- tftp-hpa-5.2+20150808.orig/tftp/tftp.c
++++ tftp-hpa-5.2+20150808/tftp/tftp.c
+@@ -48,7 +48,7 @@
+ #define PKTSIZE    SEGSIZE+4
+ char ackbuf[PKTSIZE];
+ int timeout;
+-sigjmp_buf toplevel;
++extern sigjmp_buf toplevel;
+ sigjmp_buf timeoutbuf;
+ 
+ static void nak(int, const char *);
diff -Nru tftp-hpa-5.2+20150808/debian/patches/series 
tftp-hpa-5.2+20150808/debian/patches/series
--- tftp-hpa-5.2+20150808/debian/patches/series 1970-01-01 01:00:00.000000000 
+0100
+++ tftp-hpa-5.2+20150808/debian/patches/series 2022-10-25 22:20:18.000000000 
+0200
@@ -0,0 +1 @@
+extern-sigjmp_buf.patch
diff -Nru tftp-hpa-5.2+20150808/debian/source/format 
tftp-hpa-5.2+20150808/debian/source/format
--- tftp-hpa-5.2+20150808/debian/source/format  1970-01-01 01:00:00.000000000 
+0100
+++ tftp-hpa-5.2+20150808/debian/source/format  2022-10-25 22:20:18.000000000 
+0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru tftp-hpa-5.2+20150808/tftp/tftp.c tftp-hpa-5.2+20150808/tftp/tftp.c
--- tftp-hpa-5.2+20150808/tftp/tftp.c   2022-10-25 22:43:20.000000000 +0200
+++ tftp-hpa-5.2+20150808/tftp/tftp.c   2015-08-08 06:24:45.000000000 +0200
@@ -48,7 +48,7 @@
 #define PKTSIZE    SEGSIZE+4
 char ackbuf[PKTSIZE];
 int timeout;
-extern sigjmp_buf toplevel;
+sigjmp_buf toplevel;
 sigjmp_buf timeoutbuf;
 
 static void nak(int, const char *);

Reply via email to