On Mon, Apr 4, 2011 at 03:06, Dan S <danstowell+de...@gmail.com> wrote:
> 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>

Hmm, it seems to have done a broken import. Did it actually succeed in
the merge?

Also, please push the upstream tag too.


Felipe Sateler

pkg-multimedia-maintainers mailing list

Reply via email to