Merging our sources

[Cesare Falco]

Hello Manu,

> One hand if you drop the sdlmame package now, users making an upgrade
> from the last LTS release to the next one will miss the package
Yeah, I had the same thought just after clicking the "send" button. :/
We'll need them until Ubuntu 12.04 (at least).

> it's fine, go ahead
Committed.
Twice, as I later realized that I had updated the manpages
in another place. ;)

> 
> IMHO, for the mess package building in debian/rules, let stick now with
> what we have in git and if it proves unmaintanable we will change it
Ok, let's see what happens. :)

Cheers,
Cesare.