Hi,
On 25.06.2017 13:12, Ian Jackson wrote:
> Ralf Jung writes ("Bug#865905: dgit build fails with: dpkg-source: error:
> missing orig.tar or debian.tar file in v2.0 source package"):
>> Actual behavior:
>> $ dgit -D build
> ...
>> * Add new version to changelog, git commit
>
> New upstream version ?
Ah, good catch! I accidentally changed the upstream version. That
fixed it. I suppose I could have guessed this from "missing orig.tar"...
Would be nice to have some way to automate this... really all I want is
"whatever is the current Debian package, plus these patches of mine".
Right now, updating involves rebasing with --interactive and then
manually fixing the commit that touches changelog.
Btw, thanks a huge lot for dgit -- that already makes this kind of local
patching much more pleasant than it used to be, because I no longer have
to deal with quilt, and I am no longer affected by whatever packaging
structure the maintainer decided to use.
>> Additional information:
>>
>> I have no idea why it is talking about v2.0 source packages;
>> debian/source/format says "3.0 (quilt)".
>
> That's dpkg-source being odd.
>
>> The funny thing is that I used the same workflow a couple of months ago and
>> it
>> worked fine. I am not sure if it's some change in dgit or in the package
>> that
>> broke things, but right now I find myself unable to build this package with
>> dgit. (Which is a problem, because I need some patch in there or else the
>> system is rather unusable.)
>
> Yes, this should work. Something is wrong. I can't tell yet whether
> its something you've done wrong, but definitely the error message
> should be better.
>
> Can you run it again with -DD ?
Here you go:
> $ dgit -DD build
> + git diff --quiet HEAD
> #massaging# dpkg-buildpackage '-i'\\'.git/' -I.git -us -uc
> Format `3.0 (quilt)', need to check/update patch stack
> checking for vendor-specific debian/patches/debian.series (Dpkg::Vendor
> `current vendor')
> checking for vendor-specific debian/patches/debian.series ((base) distro
> being accessed)
> checking for vendor-specific debian/patches/debian.series ((nominal) distro
> being accessed)
> | git rev-parse 'HEAD~0'
> => `8f8f7fd3f17ae5bccbf3c93a0cc1bfa9587cc9f6'
> CD .git/dgit/unpack
> examining quilt state (multiple patches, linear mode)
> QF linkorigs kde-config-touchpad_5.8.6-1+local_all.deb,
> ../../../../kde-config-touchpad_5.8.6-1+local_all.deb ?
> QF linkorigs libkfontinst5-dbgsym_5.8.6-1+local_amd64.deb,
> ../../../../libkfontinst5-dbgsym_5.8.6-1+local_amd64.deb ?
> QF linkorigs libkfontinst5_5.8.6-1+local_amd64.deb,
> ../../../../libkfontinst5_5.8.6-1+local_amd64.deb ?
> QF linkorigs libkfontinstui5-dbgsym_5.8.6-1+local_amd64.deb,
> ../../../../libkfontinstui5-dbgsym_5.8.6-1+local_amd64.deb ?
> QF linkorigs libkfontinstui5_5.8.6-1+local_amd64.deb,
> ../../../../libkfontinstui5_5.8.6-1+local_amd64.deb ?
> QF linkorigs plasma-desktop, ../../../../plasma-desktop ?
> QF linkorigs plasma-desktop-data_5.8.6-1+local_all.deb,
> ../../../../plasma-desktop-data_5.8.6-1+local_all.deb ?
> QF linkorigs plasma-desktop-dbgsym_5.8.6-1+local_amd64.deb,
> ../../../../plasma-desktop-dbgsym_5.8.6-1+local_amd64.deb ?
> QF linkorigs plasma-desktop-dev_5.8.6-1+local_amd64.deb,
> ../../../../plasma-desktop-dev_5.8.6-1+local_amd64.deb ?
> QF linkorigs plasma-desktop_5.8.6-1+local.debian.tar.xz,
> ../../../../plasma-desktop_5.8.6-1+local.debian.tar.xz ?
> QF linkorigs plasma-desktop_5.8.6-1+local.dsc,
> ../../../../plasma-desktop_5.8.6-1+local.dsc ?
> QF linkorigs plasma-desktop_5.8.6-1+local_amd64.buildinfo,
> ../../../../plasma-desktop_5.8.6-1+local_amd64.buildinfo ?
> QF linkorigs plasma-desktop_5.8.6-1+local_amd64.changes,
> ../../../../plasma-desktop_5.8.6-1+local_amd64.changes ?
> QF linkorigs plasma-desktop_5.8.6-1+local_amd64.deb,
> ../../../../plasma-desktop_5.8.6-1+local_amd64.deb ?
> QF linkorigs plasma-desktop_5.8.6-1+local_source.changes,
> ../../../../plasma-desktop_5.8.6-1+local_source.changes ?
> QF linkorigs plasma-desktop_5.8.6-1.debian.tar.xz,
> ../../../../plasma-desktop_5.8.6-1.debian.tar.xz ?
> QF linkorigs plasma-desktop_5.8.6.orig.tar.xz,
> ../../../../plasma-desktop_5.8.6.orig.tar.xz ?
> QF linkorigs plasma-desktop_5.8.7.1-1.debian.tar.xz,
> ../../../../plasma-desktop_5.8.7.1-1.debian.tar.xz ?
> QF linkorigs plasma-desktop_5.8.7.1.orig.tar.xz,
> ../../../../plasma-desktop_5.8.7.1.orig.tar.xz ?
> + env GZIP=-1n tar -zcf './plasma-desktop_5.8.7-~~DGITFAKE.debian.tar.gz' -C
> ../../.. debian/source/format debian/rules debian/control debian/changelog
> debian/patches
> + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null'
> dpkg-source: error: missing orig.tar or debian.tar file in v2.0 source package
> dgit: failed command: sh -ec 'exec dpkg-source --no-check --skip-patches -x
> fake.dsc >/dev/null'
> dgit: subprocess failed with error exit status 255
Kind regards,
Ralf
