Merge ~danilogondolfo/ubuntu/+source/netcat-openbsd:merge-lp2042431-noble into ubuntu/+source/netcat-openbsd:debian/sid

[Danilo Egea Gondolfo]

[Danilo Egea Gondolfo (danilogondolfo)]

Autopkgtest results

https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-netcat-openbsd/noble/amd64/n/netcat-openbsd/20231101_122310_62656@/log.gz
https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-netcat-openbsd/noble/arm64/n/netcat-openbsd/20231101_122403_e70f0@/log.gz
https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-netcat-openbsd/noble/armhf/n/netcat-openbsd/20231101_122125_d3bce@/log.gz
https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-netcat-openbsd/noble/i386/n/netcat-openbsd/20231101_122240_693a5@/log.gz
https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-netcat-openbsd/noble/ppc64el/n/netcat-openbsd/20231101_123218_693a5@/log.gz
https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-netcat-openbsd/noble/s390x/n/netcat-openbsd/20231101_122537_5f7cb@/log.gz

PPA

https://launchpad.net/~danilogondolfo/+archive/ubuntu/netcat-openbsd

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Danilo.

I have a question about your last commit. I see that you've changed the following changelog entry:

@@ -14,7 +14,7 @@ netcat-openbsd (1.226-1) unstable; urgency=medium

 netcat-openbsd (1.225-1ubuntu1) mantic; urgency=medium

- * Merge from Debian unstable (LP: #2025666). Remaining changes:
+ * Merge from Debian unstable. Remaining changes:
     - Don't build-depend on strace on i386 where it's unavailable.

but I couldn't find a reason for this change. I always frown upon changes to previous changelog entries, so I decided to ask :-).

review: Needs Information

[Danilo Egea Gondolfo (danilogondolfo)]

Hi Sergio, thanks for looking at it. Another coredev who sponsored some of my merges some time ago suggested I should drop this kind of LP bug references from the previous changelog entry. I honestly don't have any opinion on that, and being new to deb packaging I adopted the suggestion (they never said it should be removed, just that they use to do that). That's the sole reason :)

Again, I don't have an opinion on that and I can put it back if you say otherwise ;)

[Sergio Durigan Junior (sergiodj)]

Ah, got it.

Let me explain it to you, then. When you generate the .changes file, dpkg-buildpackage will scan the last changelog entry, look for strings like "LP: #nnnnnn", and add the proper header to the .changes file (called "Launchpad-Bugs-Fixed") which will contain a list of bugs to be closed when this release is accepted.

When you're doing merges with git-ubuntu, sometimes you end up with entries in the changelog for changes that are being dropped, but that were previously added to fix a bug. Say, for example, you have a changelog entry like the following:

foo (1.1-1ubuntu1) noble; urgency=medium

  * d/p/0001-fix.patch: Fix bug XYZ (LP: #nnnn).

 -- ....

and then, when you prepare a new merge, you can drop the fix. You'd end up with something like:

foo (1.2-1ubuntu1) noble; urgency=medium

  * Merge ... Remaining changes:
    - ....
  * Drop changes:
    - d/p/0001-fix.patch: Fix bug XYZ (LP: #nnnn).
      [ Fixed upstream. ]

 -- ....

However, if we were to upload this package as is, dpkg-buildpackage would *still* consider #nnnn to be fixed by this new upload, which would be wrong. On the other reason, it's a good practice to mention the bug that was fixed before, so what can we do? The answer is to remove the colon between "LP" and "#nnnn". This way, dpkg-buildpackage won't match the line and the bug won't be listed in the .changes file.

git-ubuntu implements a mechanism to do that for you automatically, and it works most of the time, but there are a few situations when it might miss and "forget" to remove the colon. In this case, you have to do it by hand, which is probably what that other Core Dev told you to do.

Now, remember when I said that dpkg-buildpackage only scans the last changelog entry? For that reason, you don't actually need to care about removing LP bug references from previous entries. They won't be considered anyway.

I hope this makes things clearer, and explains why I asked the question (and why you can actually revert part of the commit).

[Danilo Egea Gondolfo (danilogondolfo)]

Hi Sergio, thanks for the explanation. That makes sense. I reverted that part of the commit. Thanks! :)

[Sergio Durigan Junior (sergiodj)]

Thanks, Danilo.

Uploaded:

$ dput ssh-ubuntu netcat-openbsd_1.226-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: /home/sergio/work/netcat-openbsd/netcat-openbsd_1.226-1ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/netcat-openbsd/netcat-openbsd_1.226-1ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ssh-ubuntu (via sftp to upload.ubuntu.com):
  Uploading netcat-openbsd_1.226-1ubuntu1.dsc: done.
  Uploading netcat-openbsd_1.226.orig.tar.gz: done.
  Uploading netcat-openbsd_1.226-1ubuntu1.debian.tar.xz: done.
  Uploading netcat-openbsd_1.226-1ubuntu1_source.buildinfo: done.
  Uploading netcat-openbsd_1.226-1ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

Unmerged commits

8ba7ada... by Danilo Egea Gondolfo on 2023-11-01

changelog

70634e3... by Danilo Egea Gondolfo on 2023-11-01

update-maintainer

db68e1c... by Danilo Egea Gondolfo on 2023-11-01

reconstruct-changelog

14510a1... by Danilo Egea Gondolfo on 2023-11-01

merge-changelogs

55f4b14... by Danilo Egea Gondolfo on 2023-07-05

Don't build-depend on strace on i386 where it's unavailable.

diff --git a/debian/changelog b/debian/changelog
index 638911a..33904d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netcat-openbsd (1.226-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2042431). Remaining changes:
+    - Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Wed, 01 Nov 2023 10:27:32 +0000
+
 netcat-openbsd (1.226-1) unstable; urgency=medium
 
   [ Guilhem Moulin ]
@@ -5,6 +12,13 @@ netcat-openbsd (1.226-1) unstable; urgency=medium
 
  -- Guilhem Moulin <[e-mail]>  Mon, 16 Oct 2023 19:31:08 +0200
 
+netcat-openbsd (1.225-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable (LP: #2025666). Remaining changes:
+    - Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Mon, 03 Jul 2023 17:30:27 +0100
+
 netcat-openbsd (1.225-1) unstable; urgency=medium
 
   [ Debian Janitor ]
@@ -30,6 +44,13 @@ netcat-openbsd (1.225-1) unstable; urgency=medium
 
  -- Guilhem Moulin <[e-mail]>  Sat, 10 Jun 2023 22:43:37 +0200
 
+netcat-openbsd (1.219-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Benjamin Drung <[e-mail]>  Mon, 20 Feb 2023 11:16:40 +0100
+
 netcat-openbsd (1.219-1) unstable; urgency=medium
 
   * New upstream release (from OpenBSD 7.2).
@@ -39,6 +60,14 @@ netcat-openbsd (1.219-1) unstable; urgency=medium
 
  -- Guilhem Moulin <[e-mail]>  Thu, 20 Oct 2022 23:19:17 +0200
 
+netcat-openbsd (1.218-5ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't build-depend on strace on i386 where it's unavailable.
+  * Drop netcat transitional package, because netcat 1.10-47 dropped it
+
+ -- Benjamin Drung <[e-mail]>  Tue, 17 May 2022 18:27:43 +0200
+
 netcat-openbsd (1.218-5) unstable; urgency=low
 
   [ Dirk Jagdmann ]
@@ -91,6 +120,16 @@ netcat-openbsd (1.218-5) unstable; urgency=low
 
  -- Guilhem Moulin <[e-mail]>  Fri, 11 Mar 2022 21:54:15 +0100
 
+netcat-openbsd (1.218-4ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes (LP: #1961983):
+    - Move the netcat transitional package here and have it depend on the
+      preferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+    - Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Heinrich Schuchardt <[e-mail]>  Wed, 23 Feb 2022 12:09:43 +0100
+
 netcat-openbsd (1.218-4) unstable; urgency=medium
 
   * d/checks/*: Allow test suite to fail due to the high rate of false
@@ -98,6 +137,16 @@ netcat-openbsd (1.218-4) unstable; urgency=medium
 
  -- Guilhem Moulin <[e-mail]>  Sat, 19 Feb 2022 11:33:57 +0100
 
+netcat-openbsd (1.218-3ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Move the netcat transitional package here and have it depend on the
+      preferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+    - Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Steve Langasek <[e-mail]>  Mon, 13 Dec 2021 23:37:43 -0800
+
 netcat-openbsd (1.218-3) unstable; urgency=medium
 
   * Upload to unstable.
@@ -157,6 +206,21 @@ netcat-openbsd (1.218-2+exp1) experimental; urgency=low
 
  -- Guilhem Moulin <[e-mail]>  Sun, 14 Nov 2021 17:17:26 +0100
 
+netcat-openbsd (1.218-2ubuntu2) jammy; urgency=medium
+
+  * Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Steve Langasek <[e-mail]>  Wed, 08 Dec 2021 00:17:56 +0000
+
+netcat-openbsd (1.218-2ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable (LP: #1950985). Remaining changes:
+    - Move the netcat transitional package here and have it depend on the
+      peferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+
+ -- Dave Jones <[e-mail]>  Sun, 14 Nov 2021 09:42:30 +0000
+
 netcat-openbsd (1.218-2) unstable; urgency=low
 
   * d/checks: Fix FTBS on some platforms:
@@ -202,6 +266,21 @@ netcat-openbsd (1.217.1-1) unstable; urgency=medium
 
  -- Guilhem Moulin <[e-mail]>  Mon, 16 Aug 2021 03:14:05 +0200
 
+netcat-openbsd (1.217-3ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:21:24 +0200
+
+netcat-openbsd (1.217-3ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Move the netcat transitional package here and have it depend on the
+      peferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+
+ -- Steve Langasek <[e-mail]>  Wed, 06 Jan 2021 14:06:46 -0800
+
 netcat-openbsd (1.217-3) unstable; urgency=low
 
   [ Debian Janitor ]
@@ -215,6 +294,15 @@ netcat-openbsd (1.217-3) unstable; urgency=low
 
  -- Guilhem Moulin <[e-mail]>  Sat, 19 Dec 2020 00:11:23 +0100
 
+netcat-openbsd (1.217-2ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Move the netcat transitional package here and have it depend on the
+      peferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+
+ -- Steve Langasek <[e-mail]>  Tue, 09 Jun 2020 13:21:58 -0700
+
 netcat-openbsd (1.217-2) unstable; urgency=low
 
   * d/patches: Make getnameinfo(3) errors non-fatal in report_sock():
@@ -247,6 +335,14 @@ netcat-openbsd (1.217-1) unstable; urgency=medium
 
  -- Guilhem Moulin <[e-mail]>  Sat, 23 May 2020 02:04:39 +0200
 
+netcat-openbsd (1.206-1ubuntu1) focal; urgency=medium
+
+  * Move the netcat transitional package here and have it depend on the
+    preferred netcat-openbsd implementation of netcat, not
+    netcat-traditional.  LP: #1780316.
+
+ -- Steve Langasek <[e-mail]>  Mon, 09 Mar 2020 11:50:15 -0700
+
 netcat-openbsd (1.206-1) unstable; urgency=medium
 
   * New upstream release (from OpenBSD 6.6)
diff --git a/debian/control b/debian/control
index 3570bb1..4ce9c66 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: netcat-openbsd
 Section: net
 Priority: important
-Maintainer: Guilhem Moulin <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Guilhem Moulin <[e-mail]>
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Build-Depends: debhelper-compat (= 13),
@@ -9,7 +10,7 @@ Build-Depends: debhelper-compat (= 13),
                libbsd-dev,
                pkg-config,
                procps [linux-any] <!nocheck>,
-               strace [linux-any] <!nocheck>
+               strace [!i386] <!nocheck>
 Vcs-Git: https://salsa.debian.org/debian/netcat-openbsd.git -b debian/latest
 Vcs-Browser: https://salsa.debian.org/debian/netcat-openbsd