Package: tuxtype
Version: 1.7.4.dfsg1


Tuxtype upstream tarball already provides a .desktop file, while the one presently installed by Debian doesn't have upstream translations and rely on a non-standard directory (/usr/share/tuxtype, instead of the default /usr/share/pixmaps), thus having to specify a full path to the icon (should be Icon=tuxtype without extension, provided the icon is either in PNG, SVG or the old XPM format kept for backwards compability reasons).

While doing that, let's use the new icon for tuxtype (in the upstream tarball, named "tuxtype.png") which would clean the diff.gz and be more informative.

Attached are the files in debian affected by the change, debian/tuxtype.xpm and debian/tuxtype.desktop can be simply removed. I propose creating usr/share/applications in debian/tuxtype.dirs instead of an mkdir in debian/rules, since debian/tuxtype.dirs exists and is already used for two directories. You'll also note that upstream has changed the menu categories to Education/Languages - although the Languages subcategory isn't really pertinent, see : http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html#category-registry


Diffs:
diff tuxtype-1.7.4.dfsg1/debian/rules rules
66,68c66,67
< cp $(CURDIR)/debian/tuxtype.xpm $(CURDIR)/debian/tuxtype/usr/share/tuxtype/tuxtype.xpm
<    mkdir -p $(CURDIR)/debian/tuxtype/usr/share/applications
<    cp $(CURDIR)/debian/tuxtype.desktop \
---
> cp $(CURDIR)/icon.png $(CURDIR)/debian/tuxtype/usr/share/pixmaps/tuxtype.png
>    cp $(CURDIR)/tuxtype.desktop \

diff tuxtype-1.7.4.dfsg1/debian/tuxtype.dirs tuxtype.dirs
2c2,3
< usr/share/tuxtype
---
> usr/share/pixmaps
> usr/share/applications

diff tuxtype-1.7.4.dfsg1/debian/menu menu
1,3c1,3
< ?package(tuxtype):needs="X11" section="Games/Action"\
<   icon="/usr/share/tuxtype/tuxtype.xpm" \
<   title="Tuxtype" command="/usr/games/tuxtype"
---
> ?package(tuxtype):needs="X11" section="Education/Languages"\
>   icon="/usr/share/pixmaps/tuxtype.png" \
>   title="Tux Typing" command="/usr/games/tuxtype"
?package(tuxtype):needs="X11" section="Education/Languages"\
  icon="/usr/share/pixmaps/tuxtype.png" \
  title="Tux Typing" command="/usr/games/tuxtype"
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.

# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1

# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)


CFLAGS = -Wall -g

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
else
        CFLAGS += -O2
endif

config.status: 
        dh_testdir
        QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
        # Add here commands to configure the package.
        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info --bindir=\$${prefix}/games


build: build-arch build-indep


build-arch: build-arch-stamp

build-arch-stamp:  config.status
        dh_testdir
        # Add here commands to compile the package.
        $(MAKE)
        touch build-arch-stamp

build-indep: build-indep-stamp
build-indep-stamp:  config.status
        touch build-indep-stamp

clean:
        dh_testdir
        dh_testroot
        QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
        rm -f build-arch-stamp build-indep-stamp install-stamp
        [ ! -f Makefile ] || $(MAKE) distclean
        dh_clean 


install:
        dh_testdir
        dh_testroot
        dh_clean -k 
        dh_installdirs 
        # Add here commands to install the package into debian/tuxtype.
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        dh_installdirs -ptuxtype-data  usr/share/
        dh_installdirs
        cp $(CURDIR)/icon.png 
$(CURDIR)/debian/tuxtype/usr/share/pixmaps/tuxtype.png
        cp $(CURDIR)/tuxtype.desktop \
                $(CURDIR)/debian/tuxtype/usr/share/applications/tuxtype.desktop
        rm $(CURDIR)/debian/tmp/usr/share/tuxtype/fonts -Rf

        touch install-stamp

install-arch: install
install-indep: install
        
binary-common:
        dh_testdir
        dh_testroot
        dh_installchangelogs ChangeLog
        dh_installdocs
        dh_installmenu
        dh_installman
        dh_install --sourcedir=debian/tmp
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb

# Build architecture-independent files here.
binary-indep: build-indep install-indep
        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common

# Build architecture-dependent files here.
binary-arch: build-arch install-arch
        $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common

binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install tuxtype-data
usr/games
usr/share/pixmaps
usr/share/applications

Reply via email to