2011/4/4 Felipe Sateler <fsate...@debian.org>:
> On Mon, Mar 28, 2011 at 18:42, Dan S <danstowell+de...@gmail.com> wrote:
>> 2011/3/28 Dan S <danstowell+de...@gmail.com>:
>>> 2011/3/28 Felipe Sateler <fsate...@debian.org>:
>>>>>>> I've pushed a commit to that branch that apparently solves the issue.
>>>>>>
>>>>>> Great, works here, thanks.
>>>>>>
>>>>>> Someone else started the supercollider packaging (on ubuntu) and he
>>>>>> had reasons for going with --install-sandbox. He is bcc'ed here -
>>>>>> Artem please send me (or deb-mm) a mail if you have objections.
>>>>>>
>>>>>> I'll merge that branch into master, and send the change upstream (for
>>>>>> inclusion in 3.4.2).
>>>>>
>>>>> Remember to include the change in master as a patch instead of
>>>>> directly modifying SConstruct!
>>>>
>>>> Ping?
>>>
>>> Thanks for the nudge - now committed. Any feedback welcome - this was
>>> the first time I used quilt "properly"
>>
>> ...and now SC 3.4.2 has been released on the same day. So I've
>> imported it into the git (3 patches no longer needed, hooray) - all
>> testing and feedback welcome.
>
>
> Looks like you didn't actually merge the upstream branch into master
> but instead imported the new tarball as a new commit.

I used git-import-orig, surely that's the right thing to do?
<http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.NEW.UPSTREAM>

Dan

> Any ideas on how to fix this? One could revert the commit and do a
> proper merge, I guess. Any other options?

_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to