RFU jed 1:0.99.19~pre143-1

[Rafael Laboissiere]

* Jörg Sommer <joerg at alea.gnuu.de> [2008-06-23 21:55]:

> Hi Rafael,
> 
> Rafael Laboissiere schrieb am Mon 23. Jun, 16:40 (+0200):
> > * Rafael Laboissiere <rafael at debian.org> [2008-06-23 13:30]:
> > 
> > > * Jörg Sommer <joerg at alea.gnuu.de> [2008-06-22 22:19]:
> > > 
> > > > But we can't replace the XWINDOWS, because it's a keyword of S‐Lang.
> > > 
> > > Thanks for the explanation, I understand the problem now.  We should add a
> > > Lintian override for this.
> 
> Yes.

Ok, I will add this.  BTW, it is in one of the patches that I sent
previously.

> > Okay, I prepared two patches for the above.  You will find them attached
> > below.  If you agree,
> 
> Sorry, no.
> 
> Firstly, what about starting a new version 0.99.19~pre143-2. I've
> tagged the old version and it seems to be much clearer.

Okay, I will upload 0.99.19~pre143-1 as in the git repository and start -2
as you suggest However, please, next time hold on with the tagging until the
version is actually uploaded.

> Secondly, the patch for the override makes changes to pieces out of
> scope.
> 
> -  * debian.control: Bump Standards-Version to 3.8.0 (no changes needed) [RL]
> +  * debian/control: Bump Standards-Version to 3.8.0 (no changes needed) [RL]

I sent you two patches in my last message.  The first
(standards-version.diff) contained a typo that is fixed above
("debian.control" instead of "debian/control").  The second
(override-mispelling-xwindows.diff) introduces the Lintian override.

> And you should not update the date. You should start a new version with
> “Thu, 01 Jan 1970 00:00:00 +0000”. This avoids to have this line in
> every diff and eases cherry-picks, mergen and rebases.
> 
> - -- Rafael Laboissiere <rafael at debian.org>  Mon, 23 Jun 2008 13:31:17 +0200
> + -- Rafael Laboissiere <rafael at debian.org>  Mon, 23 Jun 2008 14:08:29 +0200

I do not see a problem with changing the trailer line, provided that the
distribution is clearly tagged "UNRELEASED".  I use dpkg-dev-el for editing
debian/changelog (yes, it's Emacs, but there nothing equivalent for JED :-)
and it updates the trailer line each time I do C-c/C-e and C-c/C-c (it is
very handy, actually).

> +  * debian/jed-common.lintian-overrides: Add override for Lintian warning
> +    about wrong spelling of XWINDOWS (this is a false positive, because
> +    this word is a S-Lang keyword) [RL]
> +  * debian/rules: Call dh_lintian for jed-common
> +  * debian/control: Build-depend on debhelper >= 6.0.7, since this is the
> +    version where dh_lintian appeared
> +  * debian/compat: Bump debhelper compatibility level to 6
> 
> Is it really worth to mention the change in every file? Why not “Bumped
> the debhelper compatibility level to 6 and added the version 6.0.7 in the
> Build-Depends (BTW: You forgot the S) field to get support for
> dh_lintian.” Maybe you can join the other messages, too.

It is a matter of style.  I prefer mine, because it is clear which files
have been changed. However, as ususal, YMMV.

BTW, I do not forgot the S in "Build-depend".  It is a verb.  If I follow
your remark, I will have to write "Adds", "Calls", and "Bumps" in the
changelog entries, which I do not want.

> And what about making two commits: the first for the bump and the second
> for the lintian override. This seems to be much clearer to me.

This is what I did locally in my git repository (hence the two patches that
I sent previously).

> > I will apply them and upload the package to experimental.  Also, I can
> > git push the patches to the Alioth repository (BTW, could you tell me
> > again the cookbook for doing it?)
> 
> % git fetch
> % git checkout -b 0.99.19 origin/0.99.19
> % xjed debian/changelog
> % git commit -m "Start a new version" debian/changelog
> % xjed debian/…
> % git add debian/…
> % git commit
> …
> % xjed debian/changelog
> % git commit -m "Release of 1:0.99.19~pre143-2" debian/changelog
> % git tag 1%3A0.99.19%7Epre143-2
> 
> % git push origin 0.99.19
> % git push --tags
> 
> or use
> 
> % git push origin 0.99.19:refs/heads/rl-0.99.19
> 
> and give me a short change for a review.

Thanks for the tutorial.  I will try the refs/heads/rl-0.99.19 option above,
since this seems to interfere less with the way you are managing the
repository at Alioth.

> And can you include the fix for the rxvt problem?

What do you mean exactly?

-- 
Rafael