Merge ~dviererbe/ubuntu/+source/inetutils:ubuntu/devel into ubuntu/+source/inetutils:ubuntu/devel

Proposed by Dominik Viererbe
Status: Merged
Merge reported by: Dominik Viererbe
Merged at revision: f7d3fc42981f4bf707f890c6aad24adca00a4ea1
Proposed branch: ~dviererbe/ubuntu/+source/inetutils:ubuntu/devel
Merge into: ubuntu/+source/inetutils:ubuntu/devel
Diff against target: 66 lines (+10/-6)
4 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/tests/control (+0/-1)
debian/tests/test-root-commands (+2/-4)
Reviewer Review Type Date Requested Status
Lukas Märdian (community) Approve
Review via email: mp+439257@code.launchpad.net

Description of the change

Remove inetutils-ping package (LP: #2009814)

 * debian/{control,rules}: removed ping/ping6 build config
 * debian/tests/{control,test-root-commands}: disabled ping/ping6
   testing config
 * deleted declarative install files and man pages:
   - debian/inetutils-ping.{install,lintian-overrides,manpages}
   - debian/local/man/{ping,ping6}.1

See: https://launchpad.net/bugs/2009814

To post a comment you must log in.
Revision history for this message
Lukas Märdian (slyon) wrote :

Thanks, this lgtm overall!

A few nitpick comments:

* The git commit message tries to mimic the commit messages synthesized by git-ubuntu importer. Let's just have clean commit messages, containing one single logical change per commit. E.g. one "Update changelog", one "Update maintainer", one "debian/{control,rules}: removed ping/ping6 build config", one "debian/tests/{control,test-root-commands}: disabled ping/ping6 testing", etc.

If the uploader/sponsor does a git-ubuntu compatible upload, those clean commit history will be preserved. If a classic upload is done, a commit message will be synthesized on import.

* Let's try to keep line length in d/changelog <= 80 chars, especially this line:
"* debian/tests/{control,test-root-commands}: disabled ping/ping6 testing"

* Thanks for providing a PPA with test-builds of this change! If you could also provide logs of your successful autopkgtest run, that'd be fantastic!

+1 I'm happy to sponsor this once FFe is granted by the release team.

review: Approve
Revision history for this message
Dominik Viererbe (dviererbe) wrote :

@slyon I attached the autopkgtest output to the FFe bug-ticket (See https://bugs.launchpad.net/ubuntu/+source/inetutils/+bug/2009814/comments/7)

Please note that I don't have the capability to build riscv64 in my PPA, but I don't see a reason why this should fail with all the other architectures building fine.

Thanks that I was allowed to do this MIR. I learned so much more than just by reading documentation.

9cdc88d... by Dominik Viererbe

d/changelog: add entry for disabled ping tests

f7d3fc4... by Dominik Viererbe

d/control: update-maintainer

Revision history for this message
Dominik Viererbe (dviererbe) wrote :

I pushed the changes that only disable the tests, but not the build of inetutils-ping.
See: https://bugs.launchpad.net/ubuntu/+source/inetutils/+bug/2009814/comments/8

Revision history for this message
Lukas Märdian (slyon) wrote :

Thanks! This change set is even smaller, LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index d9974ef..7ce0b02 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+inetutils (2:2.4-2ubuntu1) lunar; urgency=medium
7+
8+ * Do not test the inetutils-ping package (LP: #2009814)
9+
10+ -- Dominik Viererbe <dominik.viererbe@canonical.com> Thu, 23 Mar 2023 11:32:35 +0200
11+
12 inetutils (2:2.4-2) unstable; urgency=medium
13
14 * Add support for new RFC4443 ICMPv6 destination unreachable codes.
15diff --git a/debian/control b/debian/control
16index 62d9d77..da3fb08 100644
17--- a/debian/control
18+++ b/debian/control
19@@ -1,7 +1,8 @@
20 Source: inetutils
21 Section: net
22 Priority: optional
23-Maintainer: Guillem Jover <guillem@debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Guillem Jover <guillem@debian.org>
26 Vcs-Browser: https://git.hadrons.org/cgit/debian/pkgs/inetutils.git
27 Vcs-Git: https://git.hadrons.org/git/debian/pkgs/inetutils.git
28 Homepage: https://www.gnu.org/software/inetutils/
29diff --git a/debian/tests/control b/debian/tests/control
30index fa56d30..f53a210 100644
31--- a/debian/tests/control
32+++ b/debian/tests/control
33@@ -28,7 +28,6 @@ Depends:
34 net-tools,
35 inetutils-ftp,
36 inetutils-ftpd,
37- inetutils-ping,
38 inetutils-traceroute,
39 Restrictions:
40 allow-stderr
41diff --git a/debian/tests/test-root-commands b/debian/tests/test-root-commands
42index 1fa1530..3244559 100755
43--- a/debian/tests/test-root-commands
44+++ b/debian/tests/test-root-commands
45@@ -7,10 +7,10 @@ autoreconf -f -i
46 --disable-libls \
47 --disable-servers \
48 --disable-clients \
49+ --disable-ping \
50+ --disable-ping6 \
51 --enable-ftp \
52 --enable-ftpd \
53- --enable-ping \
54- --enable-ping6 \
55 --enable-traceroute \
56 # EOL
57
58@@ -20,8 +20,6 @@ export VERBOSE=1
59
60 export FTP=$(command -v inetutils-ftp)
61 export FTPD=$(command -v ftpd)
62-export PING6=$(command -v ping6)
63-export PING=$(command -v ping)
64 export TRACEROUTE=$(command -v inetutils-traceroute)
65
66 make -C lib 2>&1

Subscribers

People subscribed via source and target branches