[SCM] bristol/master: Import Debian patch 0.60.11-3

[James Cowgill]

Hi,

On 09/09/16 16:10, hpfn-guest at users.alioth.debian.org wrote:
> The following commit has been merged in the master branch:
> commit 681da27e9edec0abd74ef150aede33a36bab63d1
> Author: Herbert Parentes Fortes Neto <hpfn at debian.org>
> Date:   Fri Sep 9 09:04:38 2016 -0300
> 
>     Import Debian patch 0.60.11-3

This isn't how you're supposed to use git. gbp import-dsc is for
importing old dscs into git, not for new packaging.

Please fix this mess - ie revert the changes to:
 .pc
 HOWTO (line endings)
 debian/source/local-options

> diff --git a/debian/patches/series b/debian/patches/series
> index 984256e..701a3f6 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1,2 +1,3 @@
> +03-rm_alsa-iatomic.h.patch
>  01-export_statements.patch
>  02-disable_sse.patch

If you name the patch '03', then it really should be the third patch and
not the first.

But thanks for fixing the bug,
James

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20160909/38e857f9/attachment.sig>