Well, I have to check, but IIRC the collection was indeed supposedly set to be moved to the Figueres Castle (in the province of Girona, but not in Girona city itself, just to clarify), bit I think it's still far from being actually on display there.
I'll confirm before you leave, though.
Best,
Marc