Looks to me like this package no longer needs a merge but can directly
use a sync.
linpopup (1.2.0-8.2ubuntu1) feisty; urgency=low
* Merge from debian unstable, remaining changes:
- added linpopup.desktop file (part of CommonCustomization)
But a quick look at the changelog for 1.2.0-8.3 sh
** Attachment added: "linpopup_1.2.0-8.3ubuntu1.debdiff"
http://launchpadlibrarian.net/14362518/linpopup_1.2.0-8.3ubuntu1.debdiff
** Changed in: linpopup (Ubuntu)
Status: New => Confirmed
--
Please merge linpopup 1.2.0-8.3 from Debian unstable (main)
https://bugs.launchpad.net/bugs/22