Rebasing the pavucontrol git

[Christer Stenbrenden]

On Tue, 04 Mar 2014, Léo Cavaillé wrote:

> Hello,
> 
> Thanks to the work of Christer, we know have:
> * a committed patch for RC bug #735898
> * a nearly ready 2.0-1 upstream version to release
> 
> Desperately, there was a problem during the import of new upstream
> and upstream was not merged properly in master to prepare new
> release (seems like cherry-picking to me).
> Please consider using, gbp import-orig next time.
> 

Hello Léo,

not sure what went wrong. I used gpb import-orig on the upstream
tarball, but since I'm new to packaging according to debian standards
and gbp in general, I must have done something stupid. I also used 'gbp
qp' to include the patch, which I found to be working well. Next time
I'll publish an external branch for others to review, before I push to
master. Sorry for the inconvenience.

c.