Hi,
On 25.06.2017 14:11, 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"):
>> 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.
>
> Quite annoying, yes.
>
> Have you read dgit-user(7) ? That advises using gbp dch to generate a
> new changelog entry.
Yeah, I saw that. But then I still expect rebase trouble whenever the
upstream package also touches the changelog. Also these entries will
accumulate.
Also this doesn't give me control over how the version is called, which
is a problem because I have some scripts that rely on identifying my
locally patched packages based on their version number.
>> 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.
>
> That was my goal. Thanks for the kind words.
>
> Peter Green (plugwash, of Raspbian) has some kind of gitish
> autoforwardporter for patches. I keep meaning to investigate it...
Thanks for the pointer, I'll see if I can get anything out of it!
>>> $ 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
>
> Thanks.
>
> Can you put the failing git branch somewhere so that I can repro this ?
I've put it into the master branch at
<https://github.com/RalfJung/temp.git>. Please let me know when I can
delete that repo again.
Kind regards,
Ralf
