Merge ~sudipmuk/ubuntu/+source/dublin-traceroute:merge-0.4.2-3-oracular into ubuntu/+source/dublin-traceroute:debian/sid

[Sudip Mukherjee]

[Sudip Mukherjee (sudipmuk)]

The build can be seen at https://launchpad.net/~sudipmuk/+archive/ubuntu/dublin-traceroute-merge/+packages

https://bugs.debian.org/1070341 has been raised for the Ubuntu delta.

[Simon Quigley (tsimonq2)]

Thank you!

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sudipmuk, tsimonq2
Uploaders: sudipmuk, tsimonq2
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

This migrated already.

diff --git a/debian/changelog b/debian/changelog
index ae13fd3..cbe55c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,48 @@
+dublin-traceroute (0.4.2-3ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Remove dependency on libtins4.5.
+  * Dropped changes:
+    - d/control: dependency on libssl-dev, added in Debian.
+
+ -- Sudip Mukherjee <[e-mail]>  Fri, 03 May 2024 23:24:26 +0100
+
 dublin-traceroute (0.4.2-3) unstable; urgency=medium
 
   * Update libtins version (Closes: #1069986)
 
  -- Federico Ceratto <[e-mail]>  Sun, 28 Apr 2024 12:53:43 +0200
 
+dublin-traceroute (0.4.2-2ubuntu1) noble; urgency=medium
+
+  * Fix build failure with correct dependencies. (LP: #2060658)
+
+ -- Sudip Mukherjee <[e-mail]>  Tue, 09 Apr 2024 15:19:06 +0100
+
+dublin-traceroute (0.4.2-2build4) noble; urgency=medium
+
+  * Rebuild against latest libtins
+
+ -- Jeremy Bícha <[e-mail]>  Sun, 18 Feb 2024 13:17:38 -0500
+
+dublin-traceroute (0.4.2-2build3) jammy; urgency=medium
+
+  * No-change rebuild against libjsoncpp25
+
+ -- Steve Langasek <[e-mail]>  Tue, 14 Dec 2021 07:46:48 +0000
+
+dublin-traceroute (0.4.2-2build2) hirsute; urgency=medium
+
+  * Rebuild against new libjsoncpp24.
+
+ -- Gianfranco Costamagna <[e-mail]>  Mon, 07 Dec 2020 15:21:52 +0100
+
+dublin-traceroute (0.4.2-2build1) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <[e-mail]>  Mon, 23 Mar 2020 19:15:36 +0100
+
 dublin-traceroute (0.4.2-2) unstable; urgency=medium
 
   * Update dependencies (Closes: #894345)
diff --git a/debian/control b/debian/control
index e75fb1e..8bcecfb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
 Source: dublin-traceroute
 Section: net
 Priority: optional
-Maintainer: Federico Ceratto <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Federico Ceratto <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
  cmake,
  libpcap-dev,
  libssl-dev,
- libtins4.5 (>= 4.5),
  libtins-dev (>= 4.5),
  pkg-config,
  libjsoncpp-dev