Please merge njam 1.25-4 from Debian unstable

[Mb]

Binary package hint: njam

Merge njam 1.25-4 from Debian unstable.
Ubuntu component: universe
Debian component: main

List of Ubuntu changes to keep:
    - updated .desktop file to be freedesktop-compliant
    - updated maintainer field in debian/control

List of Ubuntu changes dropped:
    - Install .desktop in debian/rules
the package now installs the .desktop file

Debian changelog (since njam 1.25-3ubuntu1):
njam (1.25-4) unstable; urgency=low

  * Added njam.desktop file (Closes: #439699)
  * Make .desktop file freedesktop-compliant
  * njam binary should be in /usr/games (Closes: #439787)
  * Fixed njam can't write to hi score file (Closes: #439786)

 -- Anibal Avelar (Fixxxer) <email address hidden> Tue, 23 Oct 2007 00:34:27 -0500

[Cesare Tirabassi (norsetto)]

Why is the status new?

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

Corrected

[Cesare Tirabassi (norsetto)]

Is it necessary to add the .xpm icon in pixmaps?
If it isn't (as I suspect), I don't think a delta is justified just for fixing the deprecated encoding field. In this case please resubmit a sync request and simply file a bug report in debian.

Thanks.

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

Without doing that change I can't see the njam icon in the menu. I've filed the bug report in Debian.

[Emmet Hikory (persia)]

The .xpm icon is indeed required to support the Debian menu system (as required by users of e.g. fluxbox). If the debian bug is not addressed in a reasonable amount of time, please resubmit a merge debdiff including the .xpm icon, and resubscribe ubuntu-universe-sponsors. Thank you.

[Cesare Tirabassi (norsetto)]

If thats the purpose of the .xpm icon than it is necessary to include it in njam.menu too, since it is not using any icon at the moment.

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

What about this ?

[Cesare Tirabassi (norsetto)]

Looks ok, but, do you have an escape \ on the previous line? Like this:

?package(njam):needs="X11" section="Games/Board" \
  title="njam" command="/usr/games/njam" \
  icon="/usr/share/pixmaps/njam.xpm"

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

Yeah, my mistake, thank you for your patience and sorry.

[Cesare Tirabassi (norsetto)]

Don't be sorry, thats what we are here for.
I'm really nitty-picking here, but on the icon I see there are many colors defined which are effectively just color noise. Would it make sense to reduce the palette?

[Cesare Tirabassi (norsetto)]

I think I know also why you could not see the icon before. Seems like there is a missing call to dh_icons, so, since the icon is in /usr/share/icons, is not registered and is not found by Gnome (until is registered by some other package).

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

So is it sufficient to insert a dh_icons call in debian/rules instead of adding a new icon ?

[Cesare Tirabassi (norsetto)]

For the Gnome menu yes.

If we want to have an icon in the debian menu too than we need to add an .xpm icon.

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

I've reduced the palette.

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

Subscribing U-U-S

[Cesare Tirabassi (norsetto)]

Can you make pacman eye more visible and the background transparent? As it is now its just a yellow blob on black which isn't very nice.
I would also correct the .desktop Comment field in accordance to the Gnome HIG.
Thanks for all the work you have done so far!

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

What about this blob? :)

[Cesare Tirabassi (norsetto)]

Still had to make few changes:

the icon name in the menu was wrong
clarified the changelog
changed the date

Uploaded (much nicer blob the way :-)).

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

njam (1.25-4ubuntu1) hardy; urgency=low

  * Merge from Debian unstable (LP: #159318) remaining changes:
    - updated .desktop file to be freedesktop and HIG compliant
    - updated maintainer field in debian/control
  * Add debian/njamicon.xpm icon
  * debian/njam.menu:
    - added icon field

njam (1.25-4) unstable; urgency=low

  * Added njam.desktop file (Closes: #439699)
  * Make .desktop file freedesktop-compliant
  * njam binary should be in /usr/games (Closes: #439787)
  * Fixed njam can't write to hi score file (Closes: #439786)

 -- Mario Bonino <email address hidden> Fri, 30 Nov 2007 22:53:17 +0100