Merge with debian version 40.1d.dfsg-1

[Emmet Hikory]

Binary package hint: scorched3d

Please merge the new debian changes (including the .desktop file update :)). The Debian changelog since the last Ubuntu merge is below:

scorched3d (40.1d.dfsg-1) unstable; urgency=low

  [ Gonéri Le Bouder ]
  * remove the Applications category from the desktop file since
    its not an official categorie
    http://standards.freedesktop.org/menu-spec/latest/apa.html

  [ Bruno "Fuddl" Kleinert ]
  * New upstream release
  * Replace non-free fronts (Closes: #298932)
  * Removed all dpatches
    01-cleanup-configure.ac.dpatch: /usr/X11R6 is nearly empty, now
    01-fix-autogen.sh.dpatch: no need to call autogen.sh anymore
    01_HtmlHelpDialog_cpp.dpatch: documentation gets properly installed
    02_cast-fixes.dpatch: merged with upstream
    03_netserver.dpatch: merged with upstream
    04_alut-linkage.dpatch: fixed by ./configure LIBS=-lalut
    05_formatstring.dpatch: merged with upstream
    06_wx-wxT-breakage.dpatch: merged with upstream

  [ Reinhard Tartler ]
  * Make the scorched3d package binNMU safe

  [ Eddy Petrișor ]
  * added dependency on dpkg-dev (>= 1.13.19) because of the binNMU change
    done by Reinhard

 -- Eddy Petrișor <email address hidden> Sat, 23 Dec 2006 14:57:22 +0200

[Emmet Hikory (persia)]

The attached debdiff to 40.1d.dfsg-1 includes all remaining Ubuntu changes and comments.

[Emmet Hikory (persia)]

The attached debdiff is the differences between the last Ubuntu version and the current, just in case that is a preferable update path.

[Daniel T Chen (crimsun)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue, 9 Jan 2007 09:45:12 +0900
Source: scorched3d
Binary: scorched3d scorched3d-data scorched3d-dbg scorched3d-doc
Architecture: source
Version: 40.1d.dfsg-1ubuntu1
Distribution: feisty
Urgency: low
Maintainer: Debian Games Team <email address hidden>
Changed-By: Emmet Hikory <email address hidden>
Description:
 scorched3d - 3D artillery game similar to Scorched Earth
 scorched3d-data - data files for Scorched3D game
 scorched3d-dbg - 3D artillery game similar to Scorched Earth, debug data
 scorched3d-doc - documentation for Scorched3D game
Closes: 298932
Changes:
 scorched3d (40.1d.dfsg-1ubuntu1) feisty; urgency=low
 .
   * merge debian changes. Last change left:
     + debian/rules: add dh_iconcache
 .
 scorched3d (40.1d.dfsg-1) unstable; urgency=low
 .
   [ Gonéri Le Bouder ]
   * remove the Applications category from the desktop file since
     its not an official categorie
     http://standards.freedesktop.org/menu-spec/latest/apa.html
 .
   [ Bruno "Fuddl" Kleinert ]
   * New upstream release
   * Replace non-free fronts (Closes: #298932)
   * Removed all dpatches
     01-cleanup-configure.ac.dpatch: /usr/X11R6 is nearly empty, now
     01-fix-autogen.sh.dpatch: no need to call autogen.sh anymore
     01_HtmlHelpDialog_cpp.dpatch: documentation gets properly installed
     02_cast-fixes.dpatch: merged with upstream
     03_netserver.dpatch: merged with upstream
     04_alut-linkage.dpatch: fixed by ./configure LIBS=-lalut
     05_formatstring.dpatch: merged with upstream
     06_wx-wxT-breakage.dpatch: merged with upstream
 .
   [ Reinhard Tartler ]
   * Make the scorched3d package binNMU safe
   * make scorched3d-doc recommending instead of depending on scorched3d
 .
   [ Eddy Petrișor ]
   * added dependency on dpkg-dev (>= 1.13.19) because of the binNMU change
     done by Reinhard
Files:
 a9a72574e8d32f522d3fa7fa9e773502 1056 games optional scorched3d_40.1d.dfsg-1ubuntu1.dsc
 382914540d0ec7eef2d7cf7d479bfbaa 55625384 games optional scorched3d_40.1d.dfsg.orig.tar.gz
 2797b5bf07e82883bd4cb978db88e70c 194988 games optional scorched3d_40.1d.dfsg-1ubuntu1.diff.gz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFFo410e9GwFciKvaMRAkM0AJ0X62XBIfZaucDRlOZYL58DvcAZkgCglNjz
xyZY+Rr9Ebl256EcGTaDWoA=
=upNx
-----END PGP SIGNATURE-----

[Emmet Hikory (persia)]

Built on all architectures.