wmclockmon, 0.8.1-4

[Jeremy Sowden]

On 2020-05-14, at 18:31:21 +0200, Andreas Metzler wrote:
> On 2020-05-14 Jeremy Sowden <jeremy at azazel.net> wrote:
> > I've prepared a new wmclockmon package including a fix for the
> > gcc-10 FTBFS.
> >
> > Andreas, would you mind reviewing?
>
> git's debian subdir combined with wmclockmon_0.8.1.orig.tar.gz
> (e5569e326f5542a181dd123836f652ee) does not build for me:
>
> dpkg-source: info: applying update_autotools.patch
> dpkg-source: info: applying build_against_gtk2.patch
> patching file wmclockmon-cal/mainwindow.c
> Hunk #4 FAILED at 159.
> Hunk #7 FAILED at 246.
> 2 out of 10 hunks FAILED
> patching file wmclockmon-config/dialogs.c
> patching file wmclockmon-config/edit.c
> patching file wmclockmon-config/mainwindow.c
> patching file wmclockmon-cal/Makefile.am
> patching file wmclockmon-config/Makefile.am
> patching file configure.ac
> dpkg-source: info: the patch has fuzz which is not allowed, or is
> malformed
> [...]

Ah.  That will be because of this commit:

  https://salsa.debian.org/wmaker-team/wmclockmon/-/commit/cc3979da4e58c0d4e15044e55626d27e0fe22c8b

The contents of the master branch were slightly different from upstream,
and one of the differences broke `gbp buildpackage` because the
build_against_gtk2.patch patch to fail to apply to upstream.  I updated
master to reflect upstream and amended the patch to match.  It turns out
that the .orig tar-ball matches master as it was before I changed it.

Not sure how to proceed.  I could just revert the patch and leave gbp
broken.  Another possibility would be to update upstream to match master
and move the upstream tag.

What do you think?

J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-wmaker-devel/attachments/20200514/b64e888b/attachment.sig>