wmclockmon, 0.8.1-4

[Jeremy Sowden]

On 2020-05-16, at 09:01:47 +0200, Andreas Metzler wrote:
> On 2020-05-15 Jeremy Sowden <jeremy at azazel.net> wrote:
> > On 2020-05-15, at 09:05:53 +0100, Jeremy Sowden wrote:
> >> On 2020-05-14, at 19:29:48 +0100, Jeremy Sowden wrote:
> >>> On 2020-05-14, at 18:31:21 +0200, Andreas Metzler wrote:
> [...]
> >>>> git's debian subdir combined with wmclockmon_0.8.1.orig.tar.gz
> >>>> (e5569e326f5542a181dd123836f652ee) does not build for me:
> [...]
> >>> 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.
>
> So upstream/0.8.1 does not match the orig.tar.gz?

Correct.

> (Just checked that Debian' tar.gz matches the upstream tarball on
> http://tnemeth.free.fr/projets/dockapps.html) I do not think that is
> nice and it would be nice to fix it, perhaps even with a force-push.

Done.  I moved the original upstream/0.8.1 commit on to a separate
branch, renamed the tag and reimported 0.8.1.

> >> [...] I'll revert the commit and tell gbp not to use upstream to
> >> generate the tar-ball.
>
> > Done.
>
> I think you have not yet git pushed, can you do that?

Done.

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/20200516/c614c103/attachment-0001.sig>