On Sun, Jul 26, 2020 at 11:22:35AM +0200, Bastian Blank wrote: > On Sun, Jul 26, 2020 at 07:21:38AM +0200, Helmut Grohne wrote: > > I've prepared a NMU fixing these long-standing bugs with patches. Thanks > > to all the contributors. I've uploaded it to delayed/15. Please let me > > know if I should defer it any longer. I'm attaching a .debdiff of the > > proposed changes. > > Don't. At least in this form.
Cancelled. > > diff --minimal -Nru lvm2-2.03.07/debian/.gitignore > > lvm2-2.03.07/debian/.gitignore > > --- lvm2-2.03.07/debian/.gitignore 2020-01-07 14:46:03.000000000 +0100 > > +++ lvm2-2.03.07/debian/.gitignore 1970-01-01 01:00:00.000000000 +0100 > > @@ -1,8 +0,0 @@ > > -/autoreconf.* > > -/debhelper* > > -/files > > -/*.debhelper > > -/*.log > > -/*.substvars > > -/*/ > > -!/bin/ > > .gitignore is git metadata. How does this relate to anything? I have no clue. The .gitignore gets deleted by dpkg-source. I have no clue why it does that nor how to make it stop. If lvm2 does not work with dpkg-source, then most likely, it's a bug in lvm2. I considered this a minor nuisance easily reverted with the next MU that is properly tracked in git. > > diff --minimal -Nru lvm2-2.03.07/debian/control lvm2-2.03.07/debian/control > > --- lvm2-2.03.07/debian/control 2020-01-07 14:46:03.000000000 +0100 > > +++ lvm2-2.03.07/debian/control 2020-07-18 20:53:01.000000000 +0200 > > @@ -5,7 +5,6 @@ > > Uploaders: Bastian Blank <wa...@debian.org> > > Build-Depends: > > debhelper (>= 10.9.2), > > - dh-python, > > Needed by python packages. I know. Why do you tell me? > > @@ -59,8 +60,8 @@ > > regular block devices. > > > > Package: lvm2-dbusd > > -Architecture: linux-any > > -Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}, lvm2 (= > > ${binary:Version}), dbus, > > +Architecture: all > > +Depends: ${python3:Depends}, ${misc:Depends}, lvm2 (>= ${source:Version}), > > lvm2 (<< ${source:Version}.1), dbus, > > Err, no hacks in dependencies. Please point out what the hack is. This is a standard approach for having a version-locked dependency from an arch:all on an arch:any package. No hack involved. > > diff --minimal -Nru lvm2-2.03.07/debian/rules lvm2-2.03.07/debian/rules > > --- lvm2-2.03.07/debian/rules 2020-01-07 14:46:03.000000000 +0100 > > +++ lvm2-2.03.07/debian/rules 2020-07-18 20:53:01.000000000 +0200 > > @@ -27,7 +27,8 @@ > > endif > > > > %: > > - dh $@ --parallel --with python3 > > + dh $@ --parallel $(DH_ADDONS) > > +build binary %-indep: DH_ADDONS+=--with=python3 > > No. Can you explain why? There now is a simpler way to achive the same: Build-Depends: debhelper-compat (= 13) Build-Depends-Indep: dh-sequence-python3 Does that work any better? Helmut