Please merge kid3 from debian unstable

[Andy Price]

Binary package hint: kid3

Ubuntu: kid3_0.9-1ubuntu1
Debian: kid3_0.9-3
Merge: kid3_0.9-3ubuntu1

(Please see attached debdiff)

- I've kept the Ubuntu MOTU maintainer field and the usage of dh_iconcache in debian/rules since it installs icons to /usr/share/icons/hicolor/
- Although MoM highlighted some .po file conflicts, there were no actual differences on closer inspection. No idea what happened there but I made sure to keep the .DEBIAN versions as the original anyway.

Thanks

[Emmet Hikory (persia)]

Thank you for the merge. Please update dh_iconcache to dh_icons so that this change may be later merged back into Debian (although Debian adoption is still under discussion). Beyond that, it looks sane. Please resubscribe ubuntu-universe-sponsors for review once this adjustment has been made, and be sure to adjust the assigee and status as appropriate.

[Andy Price (andy-price)]

This debdiff changes dh_iconcache to dh_icons and updates the changelog timestamp. Thanks for pointing that out.

[Daniel Holbach (dholbach)]

Checking it out.

[Daniel Holbach (dholbach)]

 kid3 (0.9-3ubuntu1) gutsy; urgency=low
 .
   * Merge from debian unstable, remaining changes:
     - debian/rules: Use dh_icons instead of dh_iconcache
     - debian/control: Set maintainer to Ubuntu MOTU Developers
 .
 kid3 (0.9-3) unstable; urgency=low
 .
   * Add patch to use custom import/export formats with empty fields.
    (Closes: #432953)
 .
 kid3 (0.9-2) unstable; urgency=low
 .
   [ Mark Purcell ]
   * Install debian/watch file
   * Add myself to uploaders
   * Add debian/rules get-orig-source target for http://buildserver.net
 .
   [Ana Beatriz Guerrero Lopez]
   * Package split, now it provides: kid3 (integrated with KDE) and kid3-qt
     (for non-KDE users).
   * Improve package descriptions. Thanks Urs!
   * Added post-release patches: kid3-0.9-desktop, kid3-0.9-kid3-qt-icon and
     kid3-0.9-remove_user_actions
   * New needed b-d libvorbis-dev, libtag1-dev, docbook-utils and quilt.

[Daniel Holbach (dholbach)]

Please add (LP: #126697) to the bug next time, so it will be automatically closed.

Apart from that: good work!

[Daniel Holbach (dholbach)]

Grrrrrrrr... Ubuntu and Debian tarballs differ:

179075bbbe5f015e5e47194fc7c2c7b6 1/kid3_0.9.orig.tar.gz
0814b8aaba004b6ea19021d42e3376b6 2/kid3_0.9.orig.tar.gz

Re-uploaded.