Bug#1062753: Bug#1063401: atm-tools: has gained /usr/share/doc/libatm1/changelog.*
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 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.0 +0200
> +++ linux-atm-2.5.1/debian/rules 2024-02-10 13:31:02.0 +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/changelog2023-12-20 21:41:15.0 +
+++ linux-atm-2.5.1/debian/changelog2024-02-16 21:08:19.0 +
@@ -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
+ Closes: #1063401.
+
+ -- Steve Langasek Fri, 16 Feb 2024 21:08:19 +
+
+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 Fri, 02 Feb 2024 23:16:33 +
+
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.0 +
+++ linux-atm-2.5.1/debian/control 2024-02-02 23:16:33.0 +
@@ -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.0
+
+++ linux-atm-2.5.1/debian/libatm1.install 1970-01-01 00:00:00.0
+
@@ -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.0
+
+++ linux-atm-2.5.1/debian/libatm1.symbols 1970-01-01 00:00:00.0
+
@@ -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_re
Processing of linux-atm_2.5.1-5.1~exp2_source.changes
linux-atm_2.5.1-5.1~exp2_source.changes uploaded successfully to localhost along with the files: linux-atm_2.5.1-5.1~exp2.dsc linux-atm_2.5.1-5.1~exp2.debian.tar.xz linux-atm_2.5.1-5.1~exp2_source.buildinfo Greetings, Your Debian queue daemon (running on host usper.debian.org)
linux-atm_2.5.1-5.1~exp2_source.changes ACCEPTED into experimental
Thank you for your contribution to Debian. Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Fri, 16 Feb 2024 21:08:19 + Source: linux-atm Architecture: source Version: 1:2.5.1-5.1~exp2 Distribution: experimental Urgency: medium Maintainer: Debian QA Group Changed-By: Steve Langasek Closes: 1063401 Changes: linux-atm (1:2.5.1-5.1~exp2) experimental; urgency=medium . * Fix issues with the previous NMU; thanks, Andreas Metzler Closes: #1063401. Checksums-Sha1: 988445e1efc23400142d4c85acb08fd162a5c3e4 1989 linux-atm_2.5.1-5.1~exp2.dsc 04a054d9df4029d12f7e8d7a1776e2f0fff8d921 11080 linux-atm_2.5.1-5.1~exp2.debian.tar.xz d7872e803e45ea9426296928c3f64e016f7f5e1f 6716 linux-atm_2.5.1-5.1~exp2_source.buildinfo Checksums-Sha256: 6ec33eab860c607a576aa4906d9e6b6829f6e19250e885861e9ead5a13c26783 1989 linux-atm_2.5.1-5.1~exp2.dsc f85a7cce55d556272953b1235b07de8e8078b1420c506de8113e52b76d8b5445 11080 linux-atm_2.5.1-5.1~exp2.debian.tar.xz 3e7e904f05f0cdcd70329fc5e29bee94034da7fd896a7d963f4327632746dd98 6716 linux-atm_2.5.1-5.1~exp2_source.buildinfo Files: 3f79f512fb262e9033505fd67ae0b21b 1989 net optional linux-atm_2.5.1-5.1~exp2.dsc 9da0b24f8b0745d1fd1186d24f2a56da 11080 net optional linux-atm_2.5.1-5.1~exp2.debian.tar.xz 2dbdff349524343814bc92cbe4144e4d 6716 net optional linux-atm_2.5.1-5.1~exp2_source.buildinfo -BEGIN PGP SIGNATURE- iQJGBAEBCgAwFiEErEg/aN5yj0PyIC/KVo0w8yGyEz0FAmXPztgSHHZvcmxvbkBk ZWJpYW4ub3JnAAoJEFaNMPMhshM91t8P/36izd8tB4jUI0LpNc0I6SvAi3Vq0yXV u/cMkT4N05nPrkGY5RCALOfMTwvMDLcEqpi+E+0AJqoqkv6Ljs3tyLxb3qhYMkt4 tZ9jlonhIbKfFTjvUKidBGbiVMHJy3/ndBytjZpS/vvEogoYFJ4qD9ebW1+bHR7K jn5DxyO18vLcQz5+N0eBTlYOQPKhmUiNYKLKxIIIoNQdyWyBT7XNu7p9H06pY5Ri YoX2tq9kqs0sQQ9Z+KCR61lDAaJMMqbp/f6+tmV4wlKfnzKCBKWT2wSy8mPLcXAo dNV4rDZSTKWuCQbpQZNLfjP+a+Rci6doDbrLl1o7480UWpZ8JhfdXiZ7RekBFj7s VwihJuMN3J6DNIaYPaKAniivFFUT81jIghqsWFUdJBtwTxPr/ohaNUgS72BFBGK1 rF/t2olCuXl5tgDrwjvXyKfgUYGKBJ+6VxylYsy06U0OLIm6xEnq7WiTpWy+nvlQ Kmx7IZXTe/kbGaovQQ0DlChzSLoBuXH3Ljt7iu7hcWzfDxAIEObrYu92C1D4IiZv pS9lVKklTYmczoW6h8Aa0kvWRn6dbVeTWhaaCjb0oPO3WNNvACmBO60VRz435dc5 aDv8gxxY9x+e2p6dAwOXJlC8XzvgoeX9rNQFY92xUNrSq/EXIF0ZgJ/6JQqex6BK rwL483vUddaj =+nYP -END PGP SIGNATURE- pgpkRznABp3PG.pgp Description: PGP signature
Bug#1063401: marked as done (atm-tools: has gained /usr/share/doc/libatm1/changelog.*)
Your message dated Fri, 16 Feb 2024 21:53:55 +
with message-id
and subject line Bug#1063401: fixed in linux-atm 1:2.5.1-5.1~exp2
has caused the Debian Bug report #1063401,
regarding atm-tools: has gained /usr/share/doc/libatm1/changelog.*
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1063401: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1063401
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: atm-tools
Version: 1:2.5.1-5.1~exp1
Severity: serious
User: debian-...@lists.debian.org
Usertags: time-t
X-Debbugs-Cc: Steve Langasek
atm-tools/experimental has gained two unexpected files, causing file
conflicts on upgrades:
$ debdiff atm-tools_1%3a2.5.1-5_amd64.deb atm-tools_1%3a2.5.1-5.1~exp1_amd64.deb
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-
-rw-r--r-- root/root /usr/share/doc/libatm1/changelog.Debian.gz
-rw-r--r-- root/root /usr/share/doc/libatm1/changelog.gz
Control files: lines which differ (wdiff format)
Depends: [-libatm1 (= 1:2.5.1-5),-] {+libatm1t64 (>= 2.4.1-17~),+} libc6 (>=
2.34), libfl2 (>= [-2.5.33)-] {+2.5.33), libatm1 (= 1:2.5.1-5.1~exp1)+}
Installed-Size: [-1197-] {+1243+}
Version: [-1:2.5.1-5-] {+1:2.5.1-5.1~exp1+}
There is still an libatm1 dependency, and the new libatm1t64 dependency
seems to miss the epoch.
Andreas
BTW, linux-atm is orphaned, so you should do QA instead of NMU uploads.
--- End Message ---
--- Begin Message ---
Source: linux-atm
Source-Version: 1:2.5.1-5.1~exp2
Done: Steve Langasek
We believe that the bug you reported is fixed in the latest version of
linux-atm, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1063...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Steve Langasek (supplier of updated linux-atm package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
Format: 1.8
Date: Fri, 16 Feb 2024 21:08:19 +
Source: linux-atm
Architecture: source
Version: 1:2.5.1-5.1~exp2
Distribution: experimental
Urgency: medium
Maintainer: Debian QA Group
Changed-By: Steve Langasek
Closes: 1063401
Changes:
linux-atm (1:2.5.1-5.1~exp2) experimental; urgency=medium
.
* Fix issues with the previous NMU; thanks, Andreas Metzler
Closes: #1063401.
Checksums-Sha1:
988445e1efc23400142d4c85acb08fd162a5c3e4 1989 linux-atm_2.5.1-5.1~exp2.dsc
04a054d9df4029d12f7e8d7a1776e2f0fff8d921 11080
linux-atm_2.5.1-5.1~exp2.debian.tar.xz
d7872e803e45ea9426296928c3f64e016f7f5e1f 6716
linux-atm_2.5.1-5.1~exp2_source.buildinfo
Checksums-Sha256:
6ec33eab860c607a576aa4906d9e6b6829f6e19250e885861e9ead5a13c26783 1989
linux-atm_2.5.1-5.1~exp2.dsc
f85a7cce55d556272953b1235b07de8e8078b1420c506de8113e52b76d8b5445 11080
linux-atm_2.5.1-5.1~exp2.debian.tar.xz
3e7e904f05f0cdcd70329fc5e29bee94034da7fd896a7d963f4327632746dd98 6716
linux-atm_2.5.1-5.1~exp2_source.buildinfo
Files:
3f79f512fb262e9033505fd67ae0b21b 1989 net optional linux-atm_2.5.1-5.1~exp2.dsc
9da0b24f8b0745d1fd1186d24f2a56da 11080 net optional
linux-atm_2.5.1-5.1~exp2.debian.tar.xz
2dbdff349524343814bc92cbe4144e4d 6716 net optional
linux-atm_2.5.1-5.1~exp2_source.buildinfo
-BEGIN PGP SIGNATURE-
iQJGBAEBCgAwFiEErEg/aN5yj0PyIC/KVo0w8yGyEz0FAmXPztgSHHZvcmxvbkBk
ZWJpYW4ub3JnAAoJEFaNMPMhshM91t8P/36izd8tB4jUI0LpNc0I6SvAi3Vq0yXV
u/cMkT4N05nPrkGY5RCALOfMTwvMDLcEqpi+E+0AJqoqkv6Ljs3tyLxb3qhYMkt4
tZ9jlonhIbKfFTjvUKidBGbiVMHJy3/ndBytjZpS/vvEogoYFJ4qD9ebW1+bHR7K
jn5DxyO18vLcQz5+N0eBTlYOQPKhmUiNYKLKxIIIoNQdyWyBT7XNu7p9H06pY5Ri
YoX2tq9kqs0sQQ9Z+KCR61lDAaJMMqbp/f6+tmV4wlKfnzKCBKWT2wSy8mPLcXAo
dNV4rDZSTKWuCQbpQZNLfjP+a+Rci6doDbrLl1o7480UWpZ8JhfdXiZ7RekBFj7s
VwihJuMN3J6DNIaYPaKAniivFFUT81jIghqsWFUdJBtwTxPr/ohaNUgS72BFBGK1
rF/t2olCuXl5tgDrwjvXyKfgUYGKBJ+6VxylYsy06U0OLIm6xEnq7WiTpWy+nvlQ
Kmx7IZXTe/kbGaovQQ0DlChzSLoBuXH3Ljt7iu7hcWzfDxAIEObrYu92C1D4IiZv
pS9lVKklTYmczoW6h8Aa0kvWRn6dbVeTWhaaCjb0oPO3WNNvACmBO60VRz435dc5
aDv8gxxY9x+e2p6dAwOXJlC8XzvgoeX9rNQFY92xUNrSq/EXIF0ZgJ/6JQqex6BK
rwL483vUddaj
=+nYP
-END PGP SIGNATURE-
Processed: severity of 1063887 is important
Processing commands for cont...@bugs.debian.org: > severity 1063887 important Bug #1063887 [src:wvstreams] wvstreams: NMU diff for 64-bit time_t transition Severity set to 'important' from 'serious' > thanks Stopping processing here. Please contact me if you need assistance. -- 1063887: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1063887 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Processing of wvstreams_4.6.1-17.1~exp1_source.changes
wvstreams_4.6.1-17.1~exp1_source.changes uploaded successfully to localhost along with the files: wvstreams_4.6.1-17.1~exp1.dsc wvstreams_4.6.1-17.1~exp1.debian.tar.xz wvstreams_4.6.1-17.1~exp1_source.buildinfo Greetings, Your Debian queue daemon (running on host usper.debian.org)
