--otQf6Gf4W1sw+0jP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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 <anbe@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/ slangasek@ubuntu.com vorlon@debian.org
--otQf6Gf4W1sw+0jP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="nmu_linux-atm.debdiff" Content-Transfer-Encoding: quoted-printable
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
+ <
ametzler@bebt.de> Closes: #1063401.
+
+ -- Steve Langasek <
vorlon@debian.org> Fri, 16 Feb 2024 21:08:19 +0000
+
+linux-atm (1:2.5.1-5.1~exp1) experimenta