Hi all,

I plan to fix RC bugs #965747 and #999046 by NMU.

Please see the debdiff as attachment.

I'll wait until 20th Dec and then upload it to delay/10 queue.

Yours,
Paul
diff -Nru netsend-0.0~svnr250/debian/changelog 
netsend-0.0~svnr250/debian/changelog
--- netsend-0.0~svnr250/debian/changelog        2022-12-13 07:49:30.000000000 
+0800
+++ netsend-0.0~svnr250/debian/changelog        2022-12-13 07:24:55.000000000 
+0800
@@ -1,3 +1,12 @@
+netsend (0.0~svnr250-1.5) unstable; urgency=low
+
+  * Non-maintainer upload. (Closes: #1011647)
+  * Bump debhelper compat to 12 (Closes: #965747)
+  * debian/rules: Use dh. (Closes: #999046)
+  * Port to DebSrc3.0 (quilt).
+
+ -- Ying-Chun Liu (PaulLiu) <paul...@debian.org>  Tue, 13 Dec 2022 07:24:55 
+0800
+
 netsend (0.0~svnr250-1.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru netsend-0.0~svnr250/debian/compat netsend-0.0~svnr250/debian/compat
--- netsend-0.0~svnr250/debian/compat   2022-12-13 07:49:30.000000000 +0800
+++ netsend-0.0~svnr250/debian/compat   1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-5
diff -Nru netsend-0.0~svnr250/debian/control netsend-0.0~svnr250/debian/control
--- netsend-0.0~svnr250/debian/control  2022-12-13 07:49:30.000000000 +0800
+++ netsend-0.0~svnr250/debian/control  2022-12-13 07:24:55.000000000 +0800
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Martin Peylo <deb...@izac.de>
-Build-Depends: debhelper (>= 5), linux-libc-dev, perl
+Build-Depends: debhelper-compat (= 12), linux-libc-dev, perl
 Standards-Version: 3.7.3
 Homepage: http://netsend.berlios.de/
 
diff -Nru netsend-0.0~svnr250/debian/netsend.examples 
netsend-0.0~svnr250/debian/netsend.examples
--- netsend-0.0~svnr250/debian/netsend.examples 1970-01-01 08:00:00.000000000 
+0800
+++ netsend-0.0~svnr250/debian/netsend.examples 2022-12-13 07:24:55.000000000 
+0800
@@ -0,0 +1 @@
+unit_test.sh
diff -Nru netsend-0.0~svnr250/debian/netsend.manpages 
netsend-0.0~svnr250/debian/netsend.manpages
--- netsend-0.0~svnr250/debian/netsend.manpages 1970-01-01 08:00:00.000000000 
+0800
+++ netsend-0.0~svnr250/debian/netsend.manpages 2022-12-13 07:24:55.000000000 
+0800
@@ -0,0 +1 @@
+netsend.1
diff -Nru netsend-0.0~svnr250/debian/patches/0001_Makefile.patch 
netsend-0.0~svnr250/debian/patches/0001_Makefile.patch
--- netsend-0.0~svnr250/debian/patches/0001_Makefile.patch      1970-01-01 
08:00:00.000000000 +0800
+++ netsend-0.0~svnr250/debian/patches/0001_Makefile.patch      2022-12-13 
07:24:55.000000000 +0800
@@ -0,0 +1,11 @@
+--- netsend-0.0~svnr250.orig/Makefile
++++ netsend-0.0~svnr250/Makefile
+@@ -44,7 +44,7 @@
+       @bash configure
+ 
+ $(TARGET): $(OBJECTS)
+-      $(CC) $(LIBS) $(CFLAGS) -o $(TARGET) $(OBJECTS)
++      $(CC) $(CFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
+ 
+ %.o: %.c analyze.h error.h global.h xfuncs.h Makefile
+       $(CC) $(CFLAGS) -c  $< -o $@
diff -Nru netsend-0.0~svnr250/debian/patches/0002_netsend_pod.patch 
netsend-0.0~svnr250/debian/patches/0002_netsend_pod.patch
--- netsend-0.0~svnr250/debian/patches/0002_netsend_pod.patch   1970-01-01 
08:00:00.000000000 +0800
+++ netsend-0.0~svnr250/debian/patches/0002_netsend_pod.patch   2022-12-13 
07:24:55.000000000 +0800
@@ -0,0 +1,14 @@
+--- netsend-0.0~svnr250.orig/netsend.pod
++++ netsend-0.0~svnr250/netsend.pod
+@@ -128,6 +128,11 @@
+ 
+ =back
+ 
++=back
++
++=back
++
++=back
+ 
+ =head1 EXIT STATUS
+ 
diff -Nru netsend-0.0~svnr250/debian/patches/0003_proto_udplite_recv.patch 
netsend-0.0~svnr250/debian/patches/0003_proto_udplite_recv.patch
--- netsend-0.0~svnr250/debian/patches/0003_proto_udplite_recv.patch    
1970-01-01 08:00:00.000000000 +0800
+++ netsend-0.0~svnr250/debian/patches/0003_proto_udplite_recv.patch    
2022-12-13 07:24:55.000000000 +0800
@@ -0,0 +1,10 @@
+--- netsend-0.0~svnr250.orig/proto_udplite_recv.c
++++ netsend-0.0~svnr250/proto_udplite_recv.c
+@@ -22,6 +22,7 @@
+ 
+ #include <errno.h>
+ #include <stdio.h>
++#include <limits.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff -Nru netsend-0.0~svnr250/debian/patches/0004_proto_udplite_trans.patch 
netsend-0.0~svnr250/debian/patches/0004_proto_udplite_trans.patch
--- netsend-0.0~svnr250/debian/patches/0004_proto_udplite_trans.patch   
1970-01-01 08:00:00.000000000 +0800
+++ netsend-0.0~svnr250/debian/patches/0004_proto_udplite_trans.patch   
2022-12-13 07:24:55.000000000 +0800
@@ -0,0 +1,10 @@
+--- netsend-0.0~svnr250.orig/proto_udplite_trans.c
++++ netsend-0.0~svnr250/proto_udplite_trans.c
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <errno.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
diff -Nru netsend-0.0~svnr250/debian/patches/series 
netsend-0.0~svnr250/debian/patches/series
--- netsend-0.0~svnr250/debian/patches/series   1970-01-01 08:00:00.000000000 
+0800
+++ netsend-0.0~svnr250/debian/patches/series   2022-12-13 07:24:55.000000000 
+0800
@@ -0,0 +1,4 @@
+0001_Makefile.patch
+0002_netsend_pod.patch
+0003_proto_udplite_recv.patch
+0004_proto_udplite_trans.patch
diff -Nru netsend-0.0~svnr250/debian/rules netsend-0.0~svnr250/debian/rules
--- netsend-0.0~svnr250/debian/rules    2022-12-13 07:49:30.000000000 +0800
+++ netsend-0.0~svnr250/debian/rules    2022-12-13 07:24:55.000000000 +0800
@@ -15,87 +15,23 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+%:
+       dh $@
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-config.status: configure
-       dh_testdir
+override_dh_auto_configure:
        # Actually --prefix is ignored so far (svn rev 206)
        ./configure --prefix=$(CURDIR)/debian/netsend/usr
 
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-
+override_dh_auto_build:
        # This builds netsend
-       $(MAKE)
+       dh_auto_build
        # This builds netsend.1
-       $(MAKE) man
-
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       # Add here commands to clean up after the build process.
-       $(MAKE) distclean
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
+       dh_auto_build -- man
 
+override_dh_auto_install:
        # Upstream make ignores the "configure --prefix="
        # setting so far (svn rev 203)
-       $(MAKE) DESTDIR=$(CURDIR)/debian/netsend/usr install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples unit_test.sh
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman netsend.1
-#      dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh_auto_install -- DESTDIR=$(CURDIR)/debian/netsend/usr
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_test:
+       # don't test the network commands.
diff -Nru netsend-0.0~svnr250/debian/source/format 
netsend-0.0~svnr250/debian/source/format
--- netsend-0.0~svnr250/debian/source/format    1970-01-01 08:00:00.000000000 
+0800
+++ netsend-0.0~svnr250/debian/source/format    2022-12-13 07:24:55.000000000 
+0800
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru netsend-0.0~svnr250/Makefile netsend-0.0~svnr250/Makefile
--- netsend-0.0~svnr250/Makefile        2022-12-13 07:49:30.000000000 +0800
+++ netsend-0.0~svnr250/Makefile        2008-04-07 00:11:58.000000000 +0800
@@ -44,7 +44,7 @@
        @bash configure
 
 $(TARGET): $(OBJECTS)
-       $(CC) $(CFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
+       $(CC) $(LIBS) $(CFLAGS) -o $(TARGET) $(OBJECTS)
 
 %.o: %.c analyze.h error.h global.h xfuncs.h Makefile
        $(CC) $(CFLAGS) -c  $< -o $@
diff -Nru netsend-0.0~svnr250/netsend.pod netsend-0.0~svnr250/netsend.pod
--- netsend-0.0~svnr250/netsend.pod     2022-12-13 07:49:30.000000000 +0800
+++ netsend-0.0~svnr250/netsend.pod     2008-04-07 00:11:58.000000000 +0800
@@ -128,11 +128,6 @@
 
 =back
 
-=back
-
-=back
-
-=back
 
 =head1 EXIT STATUS
 
diff -Nru netsend-0.0~svnr250/proto_udplite_recv.c 
netsend-0.0~svnr250/proto_udplite_recv.c
--- netsend-0.0~svnr250/proto_udplite_recv.c    2022-12-13 07:49:30.000000000 
+0800
+++ netsend-0.0~svnr250/proto_udplite_recv.c    2008-04-07 00:11:58.000000000 
+0800
@@ -22,7 +22,6 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <limits.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
diff -Nru netsend-0.0~svnr250/proto_udplite_trans.c 
netsend-0.0~svnr250/proto_udplite_trans.c
--- netsend-0.0~svnr250/proto_udplite_trans.c   2022-12-13 07:49:30.000000000 
+0800
+++ netsend-0.0~svnr250/proto_udplite_trans.c   2008-04-07 00:11:58.000000000 
+0800
@@ -24,7 +24,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <limits.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

Attachment: OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to