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

[Herbert Fortes]

On 09-09-2016 12:18, James Cowgill wrote:
> 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

I will need some help. I do not have good knowledge.
about git.

- debian/source/local-options did not exist in 0.60.11-2
- HOWTO you mean '^M$' ?
	This really is my fault. I complained and I did:
        $ git config core.autocrlf true
        $ git config core.safecrlf false
- .pc I really did not notice it


> 
>> 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.
> 

I should notice this when ran debdiff.

What should I do ?



Regards,
Herbert