Merge ~mitchdz/ubuntu/+source/libmnl:merge-lp2040389-noble into ubuntu/+source/libmnl:debian/sid

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/merge-lp2040389-noble

[Mitchell Dzurick (mitchdz)]

no changes to debian package, requesting a sync.

[Mitchell Dzurick (mitchdz)]

Made sure the dev files are there

$ wget https://launchpad.net/\~mitchdz/+archive/ubuntu/merge-lp2040389-noble/+build/27608529/+files/libmnl-dev_1.0.5-2ubuntu1\~noble1_amd64.deb
$ dpkg-deb -c libmnl-dev_1.0.5-2ubuntu1\~noble1_amd64.deb
drwxr-xr-x root/root 0 2024-01-03 16:20 ./
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/include/
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/include/libmnl/
-rw-r--r-- root/root 8052 2024-01-03 16:20 ./usr/include/libmnl/libmnl.h
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/lib/
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/lib/x86_64-linux-gnu/
-rw-r--r-- root/root 24258 2024-01-03 16:20 ./usr/lib/x86_64-linux-gnu/libmnl.a
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/lib/x86_64-linux-gnu/pkgconfig/
-rw-r--r-- root/root 324 2024-01-03 16:20 ./usr/lib/x86_64-linux-gnu/pkgconfig/libmnl.pc
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/share/
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/share/doc/
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/share/doc/libmnl-dev/
-rw-r--r-- root/root 1221 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/README
-rw-r--r-- root/root 2117 2024-01-03 16:20 ./usr/share/doc/libmnl-dev/changelog.Debian.gz
-rw-r--r-- root/root 2303 2024-01-03 16:19 ./usr/share/doc/libmnl-dev/copyright
drwxr-xr-x root/root 0 2024-01-03 16:20 ./usr/share/doc/libmnl-dev/examples/
-rw-r--r-- root/root 5498 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/genl-family-get.c
-rw-r--r-- root/root 1257 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/genl-group-events.c
-rw-r--r-- root/root 967 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/kobject-event.c
-rw-r--r-- root/root 5384 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/nf-log.c
-rw-r--r-- root/root 5936 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/nf-queue.c
-rw-r--r-- root/root 5222 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/nfct-create-batch.c
-rw-r--r-- root/root 8786 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/nfct-daemon.c
-rw-r--r-- root/root 7404 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/nfct-dump.c
-rw-r--r-- root/root 5371 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/nfct-event.c
-rw-r--r-- root/root 2704 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/rtnl-addr-add.c
-rw-r--r-- root/root 2865 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/rtnl-addr-dump.c
-rw-r--r-- root/root 2998 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/rtnl-link-dump.c
-rw-r--r-- root/root 2356 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/rtnl-link-dump2.c
-rw-r--r-- root/root 2316 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/rtnl-link-dump3.c
-rw-r--r-- root/root 2041 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/rtnl-link-event.c
-rw-r--r-- root/root 1917 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/rtnl-link-set.c
-rw-r--r-- root/root 3421 2022-04-05 04:15 ./usr/share/doc/libmnl-dev/examples/rtnl-neigh-dump...

[Bryce Harrington (bryce)]

Package sync'd.

libmnl | 1.0.5-2 | noble-proposed

review: Approve

[Andreas Hasenack (ahasenack)]

Package is in noble, marking as merged.

diff --git a/debian/changelog b/debian/changelog
index 73a304f..1524b95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libmnl (1.0.5-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2040389). Remaining changes:
+
+ -- Mitchell Dzurick <[e-mail]>  Wed, 03 Jan 2024 16:20:25 -0700
+
 libmnl (1.0.5-2) unstable; urgency=medium
 
   * Re-upload with source only, to unblock the migration policy
@@ -52,6 +58,24 @@ libmnl (1.0.5-1) unstable; urgency=medium
 
  -- Neutron Soutmun <[e-mail]>  Sat, 04 Nov 2023 14:35:17 +0700
 
+libmnl (1.0.4-3ubuntu1) kinetic; urgency=medium
+
+  * Static build does not work for libmnl (-lmnl) (LP: #1971523)
+
+ -- Michal Maloszewski <[e-mail]>  Thu, 21 Jul 2022 14:02:16 +0200
+
+libmnl (1.0.4-3build2) jammy; urgency=high
+
+  * No change rebuild for ppc64el baseline bump.
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 24 Mar 2022 13:13:28 +0100
+
+libmnl (1.0.4-3build1) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:16:42 +0200
+
 libmnl (1.0.4-3) unstable; urgency=medium
 
   [ Arturo Borrero Gonzalez ]
diff --git a/debian/control b/debian/control
index acf0dcb..720390e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: libmnl
 Priority: optional
-Maintainer: Debian Netfilter Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Netfilter Packaging Team <[e-mail]>
 Uploaders: Neutron Soutmun <[e-mail]>,
            Arturo Borrero Gonzalez <[e-mail]>,
            Jeremy Sowden <[e-mail]>