[Debian-med-packaging] [probabel] 05/05: Added TeXlive fonts package needed for building the manual to d/control.

[L.C. Karssen]

Hi Andreas,

On 04-04-14 11:01, Andreas Tille wrote:
> Hi Lennart,
> 
> On Fri, Apr 04, 2014 at 10:00:32AM +0200, L.C. Karssen wrote:
>> Dear Andreas,
>>
>>
>>> push everything.
>>>  
>>
>> Strange. These are the steps I followed:
>>  git pull
>>  git import-orig --pristine-tar <path to tar.gz file>
>> this didn't finish correctly because of a conflict. After resolving it I
>> committed. See commits e9ad568c8830daba4855bb0f05b02442170b314e and
>> 6a5e79a0945920d8e44d72e800b194885d2941f3
> 
> I did the same and it worked.  

Strange... In my case there was a conflict with two Makefile.in files.
Since we use dh_autoreconf I could simple remove those two files from
git as they will be regenerated anyway. Would that be an acceptable
solution?

> The fact that you can not add the same
> tag in the upstream branch is no problem here.  At least it worked
> perfectly at my side (and thus I pushed). 

Thanks!

>  For the future please always
> remember to use --pristine-tar.  I'd recommend to copy the advise given
> in Debian Med policy strictly (which I'm personally doing as well - or
> rather I have put this commandline into an own local script since
> otherwise I would forget as well).

I'm a bit confused now about the exact commands to use. Should it be:

 git import-orig --pristine-tar <path to tar.gz file>

or

 gbp import-orig --pristine-tar <path to tar.gz file>

or yet another command?



>  
>> Could it be that the tar file got missed because of the merge conflict?
> 
> I have no idea - at my side it just worked.

OK. I guess we'll see what happens on the next upstream release.

>  
>> Another maybe related thing: when pushing with the --tags option I get a
>> warning that tag v0.4.2 already exists. It seems that tag 0.4.3 got
>> pushed correctly, though.
> 
> I simply got this working on my side, pushed and uploaded.  No idea what
> might went wrong at your side.
> 
> Thanks for your preparation anyway
> 
>        Andreas.
> 

Thanks for your time!


Lennart.

-- 
*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
L.C. Karssen
Utrecht
The Netherlands

lennart at karssen.org
http://blog.karssen.org
GPG key ID: A88F554A
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 230 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/debian-med-packaging/attachments/20140407/2fa25575/attachment.sig>