[Pkg-fonts-devel] Unable to import new version of fonts-android

[Vasudev Kamath]

Hi,

[Please keep intrigeri in Cc as this task is also part of my NM process]

I was trying to import new version of fonts-android (4.4r2 tagged) and
getting a conflict with Roboto fonts set.

It looks like there was a version of fonts-android released where Roboto
font was put into source without following steps mentioned in
README.source. I'm not sure if this is the real reason for conflict but
all Roboto fonts enter conflict state and manual resolution is not
possible as they are binary files.

One possible way I see if git option -s recursive -X theirs but I'm not
sure how I can pass this option to `gbp import-orig`. Is it possible to
do this with gbp? If not any one can suggest me how I can get the new
version imported into git without getting conflicts?..

I've the source created in my alioth login if needed I can share the
tarball directly (its about 1.21GB git download). Changes needed to
get-orig-source is already committed to fonts-android repository.

Thanks in advance.
-- 
Vasudev Kamath
http://copyninja.info
Connect on ~friendica: copyninja at samsargika.copyninja.info
IRC nick: copyninja | vasudev {irc.oftc.net | irc.freenode.net}
GPG Key: C517 C25D E408 759D 98A4  C96B 6C8F 74AE 8770 0B7E
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fonts-devel/attachments/20140511/257bfd07/attachment.sig>