Dist-upgrade is for distribution upgrade, like from lenny to squeeze. There is no such thing as maemo6. Just do upgrade, like you said in your first post.