2011/4/16 Felipe Sateler <fsate...@debian.org>: > On Fri, Apr 15, 2011 at 18:45, Dan S <danstowell+de...@gmail.com> wrote: >> 2011/4/15 Felipe Sateler <fsate...@debian.org>: >>> On Fri, Apr 15, 2011 at 09:40, Dan S <danstowell+de...@gmail.com> wrote: >>> >>>>>> I've tried to import 3.4.3 onto a clean repository (using >>>>>> git-import-orig) and it hit a merge conflict. >>>>>> >>>>>> A log of my session is at <http://pastie.org/1792082> - I'd be >>>>>> grateful for any advice on whatever might have gone wrong. Am I using >>>>>> git-import-orig as intended? >>>>> >>>>> Yes. But the borked import of 3.4.2 breaks it. Try first merging from >>>>> the upstream branch and then using git-import-orig. >>>> >>>> Ah, now I see. OK it works now, and all is looking good. My local git >>>> history (on master) now looks like >>>> http://pastie.org/1797302 >>>> >>>> Please let me know if it looks like the right things have happened - >>>> then I'll push. >>> >>> Looks good to me. >> >> OK pushed, thanks. > > Some more comments: > > - Do we really want an empty Extensions dir in the supercollider > package? What purpose does it serve?
It's the place where users will place extensions (both server plugins and language extensions). For usability purposes I think it's better to have this rather than to expect people to create it (they may misspell it, etc). It's inside SuperCollider's own folder /usr/share/SuperCollider rather than cluttering anywhere else, so I'd argue it's not a problem. > - I would really like to fold all the -dev packages into one. I don't > see much point in splitting them. I've discussed it with the upstream devs and we're OK with merging them, so I've done that. Best, Dan -- To UNSUBSCRIBE, email to debian-wnpp-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/banlktinneq3cssc7twvhq0z3opmefcv...@mail.gmail.com
