Thanks for the patch. Attached is the consolidated patch for a subsequent upload to experimental.
On Sat, Feb 10, 2024 at 01:55:30PM +0100, Andreas Metzler wrote: > Control: tags -1 patch > > On 2024-02-07 Andreas Beckmann <a...@debian.org> wrote: > > Package: atm-tools > > Version: 1:2.5.1-5.1~exp1 > [...] > > atm-tools/experimental has gained two unexpected files, causing file > > conflicts on upgrades: > [...] > > There is still an libatm1 dependency, and the new libatm1t64 dependency > > seems to miss the epoch. > > Hello, > > Both issues are fixed by a one-line-change, a dh_lintian call should > also be added. > > diff -Nru linux-atm-2.5.1/debian/rules linux-atm-2.5.1/debian/rules > --- linux-atm-2.5.1/debian/rules 2019-07-19 11:14:25.000000000 +0200 > +++ linux-atm-2.5.1/debian/rules 2024-02-10 13:31:02.000000000 +0100 > @@ -72,7 +72,7 @@ > dh_testroot > dh_install --sourcedir=debian/tmp > rm debian/atm-tools/usr/share/man/man8/br2684ctl.8 > - dh_installdocs --link-doc=libatm1 > + dh_installdocs --link-doc=libatm1t64 > dh_installinit --init-script=atm > dh_installsystemd --name=atm > dh_installman > @@ -80,6 +80,7 @@ > dh_link > dh_strip > dh_compress > + dh_lintian > dh_fixperms > dh_makeshlibs -- -c4 > dh_installdeb > > cu Andreas > -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru linux-atm-2.5.1/debian/changelog linux-atm-2.5.1/debian/changelog
--- linux-atm-2.5.1/debian/changelog 2023-12-20 21:41:15.000000000 +0000
+++ linux-atm-2.5.1/debian/changelog 2024-02-16 21:08:19.000000000 +0000
@@ -1,3 +1,17 @@
+linux-atm (1:2.5.1-5.1~exp2) experimental; urgency=medium
+
+ * Fix issues with the previous NMU; thanks, Andreas Metzler
+ <ametz...@bebt.de> Closes: #1063401.
+
+ -- Steve Langasek <vor...@debian.org> Fri, 16 Feb 2024 21:08:19 +0000
+
+linux-atm (1:2.5.1-5.1~exp1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek <vor...@debian.org> Fri, 02 Feb 2024 23:16:33 +0000
+
linux-atm (1:2.5.1-5) unstable; urgency=medium
* QA upload.
diff -Nru linux-atm-2.5.1/debian/control linux-atm-2.5.1/debian/control
--- linux-atm-2.5.1/debian/control 2023-12-20 21:41:15.000000000 +0000
+++ linux-atm-2.5.1/debian/control 2024-02-02 23:16:33.000000000 +0000
@@ -46,7 +46,10 @@
uses one of these protocols: RFC 1483 bridged (RFC 2684 bridged),
RFC 1483 bridged (RFC 2684 routed), PPP over Ethernet (PPPoE).
-Package: libatm1
+Package: libatm1t64
+Provides: ${t64:Provides}
+Replaces: libatm1
+Breaks: libatm1 (<< ${source:Version})
Section: libs
Architecture: linux-any
Multi-Arch: same
@@ -59,7 +62,7 @@
Package: libatm1-dev
Section: libdevel
Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libatm1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libatm1t64 (= ${binary:Version})
Provides: libatm-dev
Description: Development files for compiling ATM programs
Header files and development libraries for compiling ATM (Asynchronous
diff -Nru linux-atm-2.5.1/debian/libatm1.install
linux-atm-2.5.1/debian/libatm1.install
--- linux-atm-2.5.1/debian/libatm1.install 2019-07-19 09:14:25.000000000
+0000
+++ linux-atm-2.5.1/debian/libatm1.install 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib/*/libatm.so.*
diff -Nru linux-atm-2.5.1/debian/libatm1.symbols
linux-atm-2.5.1/debian/libatm1.symbols
--- linux-atm-2.5.1/debian/libatm1.symbols 2019-07-19 09:14:25.000000000
+0000
+++ linux-atm-2.5.1/debian/libatm1.symbols 1970-01-01 00:00:00.000000000
+0000
@@ -1,43 +0,0 @@
-libatm.so.1 libatm1 #MINVER#
- __atmlib_fetch@Base 2.4.1-17~
- __t2q_get_rate@Base 2.4.1-17~
- alloc@Base 2.4.1-17~
- ans_byaddr@Base 2.4.1-17~
- ans_byname@Base 2.4.1-17~
- atm2text@Base 2.4.1-17~
- atm_equal@Base 2.4.1-17~
- atm_tcpip_port_mapping@Base 2.4.1-17~
- diag@Base 2.4.1-17~
- diag_dump@Base 2.4.1-17~
- diag_fatal_debug_hook@Base 2.4.1-17~
- expire_timers@Base 2.4.1-17~
- get_logfile@Base 2.4.1-17~
- get_verbosity@Base 2.4.1-17~
- kptr_eq@Base 2.4.1-17~
- kptr_print@Base 2.4.1-17~
- next_timer@Base 2.4.1-17~
- now@Base 2.4.1-17~
- pop_timer@Base 2.4.1-17~
- qos2text@Base 2.4.1-17~
- qos_equal@Base 2.4.1-17~
- read_netl@Base 2.4.1-17~
- sap2text@Base 2.4.1-17~
- sap_equal@Base 2.4.1-17~
- sdu2cell@Base 2.4.1-17~
- set_application@Base 2.4.1-17~
- set_logfile@Base 2.4.1-17~
- set_verbosity@Base 2.4.1-17~
- start_timer@Base 2.4.1-17~
- stop_timer@Base 2.4.1-17~
- text2atm@Base 2.4.1-17~
- text2ip@Base 2.4.1-17~
- text2qos@Base 2.4.1-17~
- text2sap@Base 2.4.1-17~
- timer_handler@Base 2.4.1-17~
- un_attach@Base 2.4.1-17~
- un_create@Base 2.4.1-17~
- un_recv@Base 2.4.1-17~
- un_recv_connect@Base 2.4.1-17~
- un_reply@Base 2.4.1-17~
- un_send@Base 2.4.1-17~
- vdiag@Base 2.4.1-17~
diff -Nru linux-atm-2.5.1/debian/libatm1t64.install
linux-atm-2.5.1/debian/libatm1t64.install
--- linux-atm-2.5.1/debian/libatm1t64.install 1970-01-01 00:00:00.000000000
+0000
+++ linux-atm-2.5.1/debian/libatm1t64.install 2024-02-02 23:16:33.000000000
+0000
@@ -0,0 +1 @@
+usr/lib/*/libatm.so.*
diff -Nru linux-atm-2.5.1/debian/libatm1t64.lintian-overrides
linux-atm-2.5.1/debian/libatm1t64.lintian-overrides
--- linux-atm-2.5.1/debian/libatm1t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ linux-atm-2.5.1/debian/libatm1t64.lintian-overrides 2024-02-02
23:16:33.000000000 +0000
@@ -0,0 +1 @@
+libatm1t64: package-name-doesnt-match-sonames libatm1
diff -Nru linux-atm-2.5.1/debian/libatm1t64.symbols
linux-atm-2.5.1/debian/libatm1t64.symbols
--- linux-atm-2.5.1/debian/libatm1t64.symbols 1970-01-01 00:00:00.000000000
+0000
+++ linux-atm-2.5.1/debian/libatm1t64.symbols 2024-02-02 23:16:33.000000000
+0000
@@ -0,0 +1,43 @@
+libatm.so.1 libatm1t64 #MINVER#
+ __atmlib_fetch@Base 2.4.1-17~
+ __t2q_get_rate@Base 2.4.1-17~
+ alloc@Base 2.4.1-17~
+ ans_byaddr@Base 2.4.1-17~
+ ans_byname@Base 2.4.1-17~
+ atm2text@Base 2.4.1-17~
+ atm_equal@Base 2.4.1-17~
+ atm_tcpip_port_mapping@Base 2.4.1-17~
+ diag@Base 2.4.1-17~
+ diag_dump@Base 2.4.1-17~
+ diag_fatal_debug_hook@Base 2.4.1-17~
+ expire_timers@Base 2.4.1-17~
+ get_logfile@Base 2.4.1-17~
+ get_verbosity@Base 2.4.1-17~
+ kptr_eq@Base 2.4.1-17~
+ kptr_print@Base 2.4.1-17~
+ next_timer@Base 2.4.1-17~
+ now@Base 2.4.1-17~
+ pop_timer@Base 2.4.1-17~
+ qos2text@Base 2.4.1-17~
+ qos_equal@Base 2.4.1-17~
+ read_netl@Base 2.4.1-17~
+ sap2text@Base 2.4.1-17~
+ sap_equal@Base 2.4.1-17~
+ sdu2cell@Base 2.4.1-17~
+ set_application@Base 2.4.1-17~
+ set_logfile@Base 2.4.1-17~
+ set_verbosity@Base 2.4.1-17~
+ start_timer@Base 2.4.1-17~
+ stop_timer@Base 2.4.1-17~
+ text2atm@Base 2.4.1-17~
+ text2ip@Base 2.4.1-17~
+ text2qos@Base 2.4.1-17~
+ text2sap@Base 2.4.1-17~
+ timer_handler@Base 2.4.1-17~
+ un_attach@Base 2.4.1-17~
+ un_create@Base 2.4.1-17~
+ un_recv@Base 2.4.1-17~
+ un_recv_connect@Base 2.4.1-17~
+ un_reply@Base 2.4.1-17~
+ un_send@Base 2.4.1-17~
+ vdiag@Base 2.4.1-17~
diff -Nru linux-atm-2.5.1/debian/rules linux-atm-2.5.1/debian/rules
--- linux-atm-2.5.1/debian/rules 2019-07-19 09:14:25.000000000 +0000
+++ linux-atm-2.5.1/debian/rules 2024-02-16 21:06:32.000000000 +0000
@@ -72,7 +72,7 @@
dh_testroot
dh_install --sourcedir=debian/tmp
rm debian/atm-tools/usr/share/man/man8/br2684ctl.8
- dh_installdocs --link-doc=libatm1
+ dh_installdocs --link-doc=libatm1t64
dh_installinit --init-script=atm
dh_installsystemd --name=atm
dh_installman
@@ -80,6 +80,7 @@
dh_link
dh_strip
dh_compress
+ dh_lintian
dh_fixperms
dh_makeshlibs -- -c4
dh_installdeb
signature.asc
Description: PGP signature
