Merge lp:~samuel-buffet/entertainer/packaging-fixes into lp:~mblayman/entertainer/packaging-fixes

[Samuel Buffet]

[Matt Layman (mblayman)]

Samuel, thanks for the input. I ended up doing these two commits manually because I was unsure about the change to local initially.

By the way, I noticed something about your commit in the way that you used Bazaar. Your commit details for the first commit indicated that you added the apps directories and the entertainer icons and also removed the icons. In order to trace the history of a file, I think that the correct thing to do would be to add the apps directory then do `bzr mv entertainer.png apps/.` I know that the result was the same in this case, and it probably didn't matter because the things that you moved were images, but, in effect, the history of the file was severed.

Imagine this had been an old source code file. If you moved a file using the add/remove method that you chose, then anyone who want to look at the history of the file would only be able to see back as far as when you added the file to a new directory. The ability to track files as they move to new directories was a big new feature for SVN over CVS, and it is a feature that is also available in bzr. I only bring up this long subject because I do Configuration Management at work and it's my job to focus on version control and traceability of files. These long winded paragraphs are purely academic and simply a way of highlighting the benefit of `bzr mv` instead of using the system's mv or cp command.

Thanks for your effort. I would have had a really difficult time figuring out the /usr/share/ to /usr/local/share.

I'm approving in spirit, even though I didn't actually merge the branch.

review: Approve