Prepare to convert to gbp-pq
Switch to gbp-pq to manage patches.