Please merge ksimus from Debian unstable to hardy

[Saša Bodiroža]

Hello,

I think that ksimus should be merged from Debian unstable. This is the list of remaining Ubuntu changes:
  - Modified .desktop as indicated by Phil Bull
  - Fix up ksimus.desktop file (move to /usr/share/applications):
    ksimus.desktop file is not installed in Debian's rules file.
  - Enabled dh_installmenu and dh_desktop
  - Added dh_iconcache

Additionally, I set the Maintainer field to Ubuntu MOTU Developers in debian/control and replaced dh_iconcache with dh_icons in debian/rules.

[Saša Bodiroža (jazzva)]

I removed the *.po changes from this debdiff.

[Cesare Tirabassi (norsetto)]

Looks good.

1) Can you also fix up the desktop file so that it validates correctly against current standards?
2) I would clean up the changelog, so as to not repeat the same changes. For instance:

  * Merge from debian unstable, remaining changes:
    - Update .desktop to current standards and move to /usr/share/applications.
    - Enable dh_installmenu.
    - Add dh_icons and dh_desktop.
    - Set Maintainer field to Ubuntu MOTU Developers.

Thanks, please re-subscribe u-u-s once corrected.

[Cesare Tirabassi (norsetto)]

You are right about the Maintainer field modification, please keep it as you did as a separate change.

[Saša Bodiroža (jazzva)]

I fixed the desktop files.

There is a new specification for desktop files with Type=MimeType[1]. I changed ksimus/x-ksimus.desktop to ksimus/x-ksimus.xml according to the spec. Also, I replaced "x-ksimus.desktop" to "x-ksimus.xml" in configuration files, so that it installs correctly.

[1] http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec

[Emmet Hikory (persia)]

Thanks for the debdiff. There are a few things I notice on review:

1) Because you've changed to dh_icons, dh_iconcache is not a remaining change
2) The debdiff contains apparent modifications to the build system (Makefile.am, Makefile.in, etc.) that are not reported in debian/changelog: are these intentional?

[Saša Bodiroža (jazzva)]

Thanks for taking a look at the debdiff, Emmet.

I forgot to include the new changelog, so I uploaded the debdiff with the wrong one. I'm sorry for that. The modifications to the build system files are intentional. I had to replace x-ksimus.desktop with x-ksimus.xml, and then edit the build system files, in order to install the new xml file.

[Andrea Veri (av)]

Next time, can you please add debdiffs in a better format? e.g not in text/html but in text/plain, so a MOTU can easily review the debdiff here in LP, without wgetting it every time. Thanks.

[Luca Falavigna (dktrkranz)]

New revision in Debian uses quilt patch system. Could you please prepare a new debdiff by pushing some of your changes into quilt?

[Saša Bodiroža (jazzva)]

Hello,

I've prepared a new debdiff. All changes that were not in debian/ are applied using patch system at buildtime.

[Luke Yelavich (themuso)]

Please don't assign yourself to the bug if it is a merge sponsor request.

[Saša Bodiroža (jazzva)]

Sorry, I forgot to unassign myself when I uploaded the corrected debdiff.

[Saša Bodiroža (jazzva)]

ksimus (0.3.6-2-13ubuntu1) hardy; urgency=low

  * Merge from debian unstable, remaining changes:
    - Modified .desktop as indicated by Phil Bull
    - Fix up ksimus.desktop file.
      + Move to /usr/share/applications.
    - Enabled dh_installmenu and dh_desktop
    (Closes LP: #161837)
  * In debian/control:
    - Set Maintainer field to Ubuntu MOTU Developers.
  * In debian/rules:
    - Replaced dh_iconcache with dh_icons.
  * Replaced ksimus/x-ksimus.desktop with ksimus/x-ksimus.xml according
    to freedesktop.org's shared-mime-info-spec specification.
  * Edited build system files to use x-ksimus.xml instead of x-ksimus.desktop

ksimus (0.3.6-2-13) unstable; urgency=low

  * QA upload.
  * Updated debian/menu to reflect new Debian Menu Sub-Policy.
  * Added missing cstdlib include. (Closes: #417305)
    - Thanks to Martin Michlmayr for the test and patch.

 -- Sasa Bodiroza <email address hidden> Mon, 22 Oct 2007 11:27:23 +0100