Merge lp:~carsteng/ubuntu-docs/trusty into lp:ubuntu-docs/trusty

Yes, this version of the screen shot script doesn't work anyhow. The re-worked one from the 13.10 cycle never made the freeze deadline, and this cycle has not been revived.

I am not a believer in the automatic sceenshot script, and I think it should be deleted.

I did the (U.S. English) screenshots last cycle, and am about 1/3 done for this cycle (because one has to wait until after UI freeze, just a couple of days ago). I do not set the time to the release number when I do screenshots.

Hey Doug,

thanks for your comment. To be honest, I think this script is not the best solution in the current state. It is IMHO very rigid with all the xdotool commands and fixed pause values. I guess it does the job very well on a fresh installed ubuntu with no additional packages. I tested it also on my current working laptop and it started different applications as on my test machine (because xdotool only types the first three letters to the dash, in my case I have texmaker installed and the script starts this application instead of the text editor).

Well, in my opinion, the script needs some rework to be a bit more flexible and explicit (it is not writte in the code, what should be the result of a special xdotool sequence), or, as you mentioned, it should be deleted and all screenshots should be done by hand (What we already do in the ubuntu manual project).

And yes, to set the time to the current version number is a nice gimmick, not more. :-)

But well, my small patch was more for me, to start my contribution to the docs project and to test the merging process here in LP. :-)

Greetings, Carsten

On 2014-03-16 18:25, Carsten Gerlach wrote:
> But well, my small patch was more for me, to start my contribution to
> the docs project and to test the merging process here in LP. :-)

And in that respect your merge proposal was a great success. :)

Thanks Carsten; looking forward to more proposals.

Hi Gunnar,

thanks for your nice message :-)

It would be a small success of this merge proposal for me, if someone could confirm it ;-)

Greetings, Carsten

Ok, since we are not using the script it doesn't make a difference, but if it makes you happy so why not. ;-)

But you'd better get used to merge proposals being turned down for various reasons. I have made quite a few proposals that never made it anywhere. But I usually learned from it.

Note: Last cycle (13.10) John Kim [<email address hidden>] was testing script revisions written by John Carruthers [<email address hidden>] and they worked well, so so we were told.

You could follow up with them if you wanted to try it.

I am stuck on a couple of the screenshots and I would like to know what the script gets for unity-appmenu-intro.png and color-profile-default.png

References:
https://lists.ubuntu.com/archives/ubuntu-doc/2013-September/017648.html

It was not my intention to clobber revision 376, as I seem to have done. It also was not my intent not to name revision 377 properly.

I lost my way and messed up in the "bzr help diverged-branches" procedure.

Doug,

This is what I usually do in those situations:
- uncommit conflicting revision(s) in your local copy
- pull
- commit again
- push

@Gunnar:

Thanks. I'll do that next time.