From what I can see by looking at the Ubuntu and Debian versions of this package, Debian has applied all of the Ubuntu changes in version 1.0.5-2 of qtemu. This means that we can sync this package instead of merging it. Here is the Debian changelog entry for version 1.0.5-2:
qtemu (1.0.5-2) unstable; urgency=low
* Add kfreebsd-i386 and kfreebsd-amd64 to the architecture list.
(Closes: #493482)
* Bump Standards-Version to 3.8.0 (no changes needed).
* Bump compat/debhelper to 6.
* Merge from Ubuntu:
- Add desktop and icon files. (Closes: #460932)
- Add build dependency on sharutils for uudecode.
From what I can see by looking at the Ubuntu and Debian versions of this package, Debian has applied all of the Ubuntu changes in version 1.0.5-2 of qtemu. This means that we can sync this package instead of merging it. Here is the Debian changelog entry for version 1.0.5-2:
qtemu (1.0.5-2) unstable; urgency=low
* Add kfreebsd-i386 and kfreebsd-amd64 to the architecture list.
(Closes: #493482)
* Bump Standards-Version to 3.8.0 (no changes needed).
* Bump compat/debhelper to 6.
* Merge from Ubuntu:
- Add desktop and icon files. (Closes: #460932)
- Add build dependency on sharutils for uudecode.
-- Fathi Boudra <email address hidden> Sun, 10 Aug 2008 11:44:33 +0200