Benat Atorrasagasti Ordonez was sentenced to five years in prison, in his absence, by a court in France in 2008 on charges including carrying out acts of terrorism.
He came to Scotland under his own name in 2001, worked as a driver for a wine importing company and had two children with a former partner. He now has a new partner.
But last year European Arrest Warrants were issued by France and Spain seeking his extradition. The Spanish warrant accuses him of being a member of ETA and gathering information on politicians.
He was arrested at his home in Sloan Street in Leith in July and has remained in custody since.
At Edinburgh Sheriff Court last month, Mungo Bovey QC, defending, told Sheriff Alastair Noble that his client would not oppose his return to France.
The French authorities had indicated that if he returned, he could apply for a new trial. The case was continued until yesterday.
Granting the warrant, Sheriff Noble said it was accepted that Ordonez had not had any indication of the trial there.