Bug#951572: buster-pu: package uml-utilities/20070815.2-1

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

On 2020-02-29 15:29, Ritesh Raj Sarraf wrote:
> Dear Adam,
>
> On Tue, 2020-02-25 at 21:10 +0000, Adam D. Barratt wrote:
> > On Mon, 2020-02-24 at 15:37 +0530, Ritesh Raj Sarraf wrote:
> > > So my changelog was incorrect as it set to 20070815.3-1+deb10u4,
> > > which actually should be 20070815.3-1+deb10u1, as this is uml-
> > > utilities package's first stable update proposed.
> >
> > No. stable currently has 20070815.2-1, so this should either be .2-
> > 1+deb10u1 (adding the patch on top of the stable package) or
> > -3.1~deb10u1 (backporting the newer upload).
>
> Do you mean the latter (i.e. a new upstream release) can go into Debian
> Stable as a update package ?

If the new upstream release only contains bug fixes that are appropriate 
for a stable update, then it's possible. As above, that package would 
still need a version number that was lower than the corresponding upload 
to unstable, in the same way as if you were preparing the package for 
stable-backports.

[...]
> It looks to be that I may have messed up the packaging for the package
> in the upload to Buster. This source package already contains a .pc/
> folder, which in my understanding, it should not. But this is now
> already part of Debian Buster.

No, it's created by dpkg-source when you extract the source package.

> If I try to add a quilt patch for the actual issue, I run into other
> packaging related problems.
>
> dh_clean
>  dpkg-source -i.git -I.git -b .
> dpkg-source: info: using source format '3.0 (quilt)'
> dpkg-source: info: building uml-utilities using existing
> ./uml-utilities_20070815.2.orig.tar.gz
> dpkg-source: info: using patch list from debian/patches/series
> dpkg-source: info: local changes detected, the modified files are:
>  uml-utilities-20070815.2/Makefile
> dpkg-source: error: aborting due to unexpected upstream changes, see
> /tmp/uml-utilities_20070815.2-1+deb10u1.diff.WPat51
> dpkg-source: info: you can integrate the local changes with dpkg-source 
> --commit
> dpkg-buildpackage: error: dpkg-source -i.git -I.git -b . subprocess
> returned exit status 2
[...]
> I think the problem is that the orig tarball already had a patch
> applied on top of it and with a new patch introduced, the conflicts
> arise.

That looks like you've made the change directly, rather than in a quilt 
patch (which is indeed what your original diff did). How did you make 
the patch?

The error being returned means that there are changes to the source 
package (outside of debian/) that aren't part of a quilt patch.

(I'm afraid this is beginning to get a little off-topic for 
debian-release to be entirely honest.)

Regards,

Adam