Bug#656838: oce FTBFS on Alpha: Alpha Linux is misdetected as Alpha OSF1 Unix

[Adam C Powell IV]

Hello,

On Mon, 2012-02-27 at 15:45 +0100, D. Barbier wrote:
> Le 27 février 2012 15:24, Adam C Powell IV <hazelsct at debian.org> a écrit :
> > On Sun, 2012-02-26 at 08:54 -0500, Adam C Powell IV wrote:
> > [snip]
> > There are a couple of issues in the git repository though.  I
> > accidentally merged pristine-tar into Debian on January 8, and am not
> > sure how to un-merge it, though was able to build in spite of it, sorry
> > about that!
> 
> Hello Adam,
> 
> Try:
>   $ git rebase --onto fd53673  9a7eb41 debian
>   $ git diff HEAD origin/debian
>   $
> 
> You will have to use the --force command-line flag of git push in
> order to upload this new head.

Great, I think this worked.

> > And the last upstream tag is 0.7.0, can you please merge in the newer
> > upstream tags?
> 
> There are normal tags, and not annotated ones, see
>    http://anonscm.debian.org/gitweb/?p=debian-science/packages/oce.git;a=tags
> 
> Does this cause trouble?

No, not especially, I just like to have them there for completeness.
But I think we're fine at this point.

Thanks again,
Adam
-- 
GPG fingerprint: D54D 1AEE B11C CE9B A02B  C5DD 526F 01E8 564E E4B6

Engineering consulting with open source tools
http://www.opennovation.com/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers/attachments/20120227/bf350566/attachment.pgp>