tags 670966 + patch tags 741410 + patch tags 741411 + patch thanks Attaching a patch against the debian directory of version 1.3.1-2.
-- Florent
diff -ur fgo-1.3.1/debian/changelog fgo-1.5.0.for_debian/debian/changelog --- fgo-1.3.1/debian/changelog 2011-08-06 15:03:31.000000000 +0200 +++ fgo-1.5.0.for_debian/debian/changelog 2014-03-12 11:57:33.597893568 +0100 @@ -1,3 +1,24 @@ +fgo (1.5.0-1) unstable; urgency=low + + * New upstream release (closes: #741410). + * Update fgo-config.patch (most notably using the correct paths for + --fg-root and --fg-scenery). Closes: #670966. + * Install the 'data' directory under /usr/share/games/fgo. + * debian/copyright: update to comply with + <http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/> + (closes: #741411). + * debian/fgo.desktop: + - update the Version field to indicate the version of the Desktop + Entry Specification, not FGo!; + - make the icon reference more robust (no path and no extension); + - fix a typo. + * debian/links: + - use the correct icon path (under the 'data' subdirectory of + /usr/share/games/fgo and choosing the icon with best quality); + - remove the leading slashes. + + -- Florent Rougon <[email protected]> Wed, 12 Mar 2014 11:57:33 +0100 + fgo (1.3.1-2) unstable; urgency=low * Fixed lintian info warning about encoding in .desktop file diff -ur fgo-1.3.1/debian/copyright fgo-1.5.0.for_debian/debian/copyright --- fgo-1.3.1/debian/copyright 2011-08-05 17:09:15.000000000 +0200 +++ fgo-1.5.0.for_debian/debian/copyright 2014-03-12 00:36:58.007589920 +0100 @@ -1,28 +1,27 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174 -Name: FGo -Maintainer: Debian FlightGear Crew <[email protected]> +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FGo! Source: http://sites.google.com/site/erobosprojects/flightgear/add-ons/fgo +Debian-Maintainer: Debian FlightGear Crew <[email protected]> -Copyright: 2011, Robert Leda <[email protected]> - -License: WTFPL +Files: * +Copyright: 2009-2014 Robert 'erobo' Leda <[email protected]> +License: WTFPL-2 Files: debian/* -Copyright: 2011, Christopher Baines <[email protected]> -License: WTFPL - -License: WTFPL - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2004 Sam Hocevar <[email protected]> - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. +Copyright: 2011 Christopher Baines <[email protected]> +License: WTFPL-2 +License: WTFPL-2 + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + . + Copyright (C) 2004 Sam Hocevar <[email protected]> + . + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + . + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + . + 0. You just DO WHAT THE FUCK YOU WANT TO. diff -ur fgo-1.3.1/debian/fgo.desktop fgo-1.5.0.for_debian/debian/fgo.desktop --- fgo-1.3.1/debian/fgo.desktop 2011-08-06 14:56:01.000000000 +0200 +++ fgo-1.5.0.for_debian/debian/fgo.desktop 2014-03-12 00:36:58.035589921 +0100 @@ -1,12 +1,10 @@ - [Desktop Entry] +Version=1.0 Type=Application -Version=1.4 Name=FGo! Name[en_GB]=FGo! Exec=fgo Terminal=false Categories=Game;Simulation; -Comment=Graphical launcher for the FlightGear Filght Simulator -Icon=/usr/share/pixmaps/fgo.png - +Comment=Graphical launcher for the FlightGear Flight Simulator +Icon=fgo diff -ur fgo-1.3.1/debian/install fgo-1.5.0.for_debian/debian/install --- fgo-1.3.1/debian/install 2011-08-05 18:20:39.000000000 +0200 +++ fgo-1.5.0.for_debian/debian/install 2014-03-12 00:36:58.019589921 +0100 @@ -1,4 +1,5 @@ src/ /usr/share/games/fgo/ +data/ /usr/share/games/fgo/ fgo /usr/share/games/fgo/ debian/fgo.desktop /usr/share/applications diff -ur fgo-1.3.1/debian/links fgo-1.5.0.for_debian/debian/links --- fgo-1.3.1/debian/links 2011-08-05 18:29:19.000000000 +0200 +++ fgo-1.5.0.for_debian/debian/links 2014-03-12 00:36:58.031589921 +0100 @@ -1,2 +1,2 @@ -/usr/share/games/fgo/fgo /usr/games/fgo -/usr/share/games/fgo/src/pics/icon.png /usr/share/pixmaps/fgo.png +usr/share/games/fgo/fgo usr/games/fgo +usr/share/games/fgo/data/pics/icons/256x256/fgo.png usr/share/pixmaps/fgo.png diff -ur fgo-1.3.1/debian/patches/fgo-config.patch fgo-1.5.0.for_debian/debian/patches/fgo-config.patch --- fgo-1.3.1/debian/patches/fgo-config.patch 2010-09-01 18:20:38.000000000 +0200 +++ fgo-1.5.0.for_debian/debian/patches/fgo-config.patch 2014-03-12 00:36:57.951589919 +0100 @@ -1,21 +1,13 @@ -This patch ammends the preset configuration for FGo to match the default Debian setup ---- a/src/config/presets -+++ b/src/config/presets -@@ -8,3 +8,17 @@ - # --fg-root=/usr/local/FlightGear/fgdata - # --fg-scenery=/usr/local/FlightGear/fgdata/Scenery - # FG_BIN=/usr/locale/bin/fgfs -+ -+--airport=KSFO -+--fg-root=/usr/share/games/FlightGear/ -+--fg-scenery=/usr/share/games/FlightGear/Scenery -+AI_SCENARIOS= -+APT_DATA_SOURCE=0 +--- a/data/config/presets ++++ b/data/config/presets +@@ -53,7 +53,7 @@ + # + # Any number of options can be selected, but to get FGo! ready to work + # you only need: +-# --fg-root= +-# --fg-scenery= +-# FG_BIN= ++--fg-root=/usr/share/games/flightgear ++--fg-scenery=/usr/share/games/flightgear/Scenery +FG_BIN=/usr/games/fgfs -+FG_WORKING_DIR= -+FILTER_APT_LIST=0 -+LANG= -+TERRASYNC=0 -+TERRASYNC_BIN=/usr/games/terrasync -+TERRASYNC_PORT=5501 -+TERRASYNC_SCENERY= +
