diff -u flightgear-0.9.10/debian/dirs flightgear-0.9.10/debian/dirs --- flightgear-0.9.10/debian/dirs +++ flightgear-0.9.10/debian/dirs @@ -1,0 +2,2 @@ +usr/share/applications +usr/share/pixmaps diff -u flightgear-0.9.10/debian/flightgear.desktop flightgear-0.9.10/debian/flightgear.desktop --- flightgear-0.9.10/debian/flightgear.desktop +++ flightgear-0.9.10/debian/flightgear.desktop @@ -2,10 +2,9 @@ -Encoding=UTF-8 Type=Application -Version=1.4 +Version=1.0 Name=FlightGear Exec=fgfs Terminal=false Categories=Game;Simulation; Comment=A flight simulator Comment[pt]=Simulação de Vôo -Icon= +Icon=flightgear diff -u flightgear-0.9.10/debian/changelog flightgear-0.9.10/debian/changelog --- flightgear-0.9.10/debian/changelog +++ flightgear-0.9.10/debian/changelog @@ -1,3 +1,27 @@ +flightgear (0.9.10-2ubuntu2) gutsy; urgency=low + + * Add 48x48 icon (LP: #133600) + - add flightgear.xpm in debian/ + - add icon copyright's information in debian/copyright + * Modify Maintainer value to match Debian-Maintainer-Field Spec + * Update debian/flightgear.desktop: + - Add icon + - Removal of the Encoding entry (deprecated) + - Change Version to 1.0 + * General clean-up: + - Add usr/share/pixmaps and usr/share/applications in debian/dirs + - Remove mkdir of usr/share/applications in debian/rules + - Change installation method of desktop file from cp to install + - Rework debian/copyright in compliance to present standards + - Update debian/watch + - Creation of a debian/compat file (level 5) and removal of all DH_COMPAT + reference in debian/rules + - Update of the Builds-Dependence to debhelper to >>5.0.0 and removal of + the deprecated dh_testversion in debian/rules + - Update of the Standard-Version debian/control to 3.7.2 + + -- Christophe Sauthier Thu, 13 Sep 2007 22:40:17 +0200 + flightgear (0.9.10-2ubuntu1) feisty; urgency=low * Added debian/flightgear.desktop. diff -u flightgear-0.9.10/debian/control flightgear-0.9.10/debian/control --- flightgear-0.9.10/debian/control +++ flightgear-0.9.10/debian/control @@ -1,14 +1,15 @@ Source: flightgear -Section: games +Section: universe/games Priority: extra -Maintainer: Ove Kaaven -Build-Depends: debhelper (>> 3.0.0), +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Ove Kaaven +Build-Depends: debhelper (>> 5.0.0), libx11-dev, libxext-dev, libxi-dev, libice-dev, libsm-dev, libxt-dev, libxmu-dev, libgl1-mesa-dev | xlibmesa-gl-dev | libgl-dev, libglu1-mesa-dev | libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev, libglut3-dev, zlib1g-dev, libjpeg62-dev | libjpeg-dev, plib1.8.4-dev, libopenal-dev, libalut-dev, autotools-dev, simgear-dev (>= 0.3.10) -Standards-Version: 3.5.5 +Standards-Version: 3.7.2 Package: flightgear Architecture: any diff -u flightgear-0.9.10/debian/copyright flightgear-0.9.10/debian/copyright --- flightgear-0.9.10/debian/copyright +++ flightgear-0.9.10/debian/copyright @@ -2,13 +2,37 @@ -Tue, 6 Feb 2001 15:46:57 +0100. +Tue, 6 Feb 2001 15:46:57 +0100. -It was downloaded from ftp://ftp.flightgear.org/pub/fgfs/Source/ +The current Ubuntu maintainer is Ubuntu MOTU Developers -Upstream Authors: Curtis L. Olson -and the rest of the FlightGear team (see the Thanks file). +It was downloaded from: ftp://ftp.flightgear.org/pub/fgfs/Source -Copyright (C) 1999-2000 Curtis L. Olson +Upstream Authors: Curtis L. Olson and the rest +of the FlighGear team (see Thanks file). + +Copyright: 1999 - 2000 Curtis L. Olson + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License with +the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; +if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth +Floor, Boston, MA 02110-1301, USA -You are free to distribute this software under the terms of -the GNU General Public License. On Debian systems, the complete text of the GNU General Public -License can be found in /usr/share/common-licenses/GPL file. +License, version 2, can be found in /usr/share/common-licenses/GPL-2. + +The icon flightgear.xpm is derived from flightgear.pgn which is (C) 2005, +Josh Babcock and is licensed under the GPL version 2, +see above. + +flightgear.pgn has been downloaded from: +http://jrbabcock.home.comcast.net/flightgear/icons/ + +The Debian packaging is (C) 2007, Christophe and +is licensed under the GPL version 2, see above. diff -u flightgear-0.9.10/debian/rules flightgear-0.9.10/debian/rules --- flightgear-0.9.10/debian/rules +++ flightgear-0.9.10/debian/rules @@ -5,9 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=3 - CFLAGS=-O2 $(DEBUGFLAGS) ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS+=-g @@ -57,19 +54,15 @@ $(MAKE) install prefix=$(CURDIR)/debian/flightgear/usr - mkdir -p debian/flightgear/usr/share/applications - cp debian/flightgear.desktop debian/flightgear/usr/share/applications - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install - dh_testversion 2 dh_testdir dh_testroot -# dh_installdebconf + dh_install dh_installdocs cp docs-mini/* debian/flightgear/usr/share/doc/flightgear || true cp utils/TerraSync/README.txt debian/flightgear/usr/share/doc/flightgear/README.TerraSync diff -u flightgear-0.9.10/debian/watch flightgear-0.9.10/debian/watch --- flightgear-0.9.10/debian/watch +++ flightgear-0.9.10/debian/watch @@ -2,2 +2,2 @@ -#ftp.flightgear.org /pub/fgfs/Source FlightGear-(.*)\.tar\.gz debian uupdate -ftp.ihg.uni-duisburg.de /Mirrors/ftp.flightgear.org/Source FlightGear-(.*)\.tar\.gz debian uupdate +ftp.flightgear.org /pub/fgfs/Source FlightGear-(.*)\.tar\.gz debian uupdate +#ftp.ihg.uni-duisburg.de /Mirrors/ftp.flightgear.org/Source FlightGear-(.*)\.tar\.gz debian uupdate only in patch2: unchanged: --- flightgear-0.9.10.orig/debian/install +++ flightgear-0.9.10/debian/install @@ -0,0 +1,2 @@ +debian/flightgear.desktop /usr/share/applications +debian/flightgear.xpm /usr/share/pixmaps only in patch2: unchanged: --- flightgear-0.9.10.orig/debian/flightgear.xpm +++ flightgear-0.9.10/debian/flightgear.xpm @@ -0,0 +1,72 @@ +/* XPM */ +static char * test_xpm[] = { +"48 48 21 1", +" c None", +". c #000100", +"+ c #3E76AE", +"@ c #46769C", +"# c #5689B4", +"$ c #508AC9", +"% c #678DA2", +"& c #75AAEB", +"* c #7BADD8", +"= c #A4ACAB", +"- c #99B4C6", +"; c #9DC8F1", +"> c #BED0D8", +", c #CFCBD3", +"' c #CED0CC", +") c #DFE7E6", +"! c #E5E8DD", +"~ c #EAE5E9", +"{ c #FCFF48", +"] c #F7F8ED", +"^ c #F7F8F9", +"{{{{{{......{{{{{{]]]]]]^^^^^^^^^^^^^^^^^^^^^^))", +"{{{{{{......{{{{{{]]^]]]^^^^^^^^^^^^^]^^^^^^^^)>", +"{{{{{{......{{{{{{]^^^^^^^^^^^^^^^^]^^]^^^^^^^'=", +"{{{{{{......{{{{{{]]^^^^^^^^^^^^^^])]^^^^^^^)',=", +"{{{{{{......{{{{{{]^^^^^^~]^]^^^^]!!]^~~~~]]!'==", +"{{{{{{......{{{{{{^^^^^^~^^]^]^^)^]))^~^~~)!,,,=", +"......{{{{{{......^^^^)>>>>>>>)>>>>>>>;>>>>>>''=", +"......{{{{{{......^^^^-%##$#+#########%###@%%='=", +"......{{{{{{......^)])-@++++++++++++++@@@++@@=!=", +"......{{{{{{......^^]]-@++++$$$+$$$$$$$#$$$+%='=", +"......{{{{{{......]]!]-@++$$$$&$$$$&$$$##$$$%''=", +"......{{{{{{......]]])-@++$$&#**#*&&*******%%=>=", +"{{{{{{......{{{{{{]]])-@+$$$&***-%%*-%-%%*%-=>>=", +"{{{{{{......{{{{{{]^^~-++$$$&&-;>)>>>>>>>>>!=',=", +"{{{{{{......{{{{{{^^^~-++$$&&**)))]]])^^)!!!!'>=", +"{{{{{{......{{{{{{^^^~-@+$#$&**)]))))~^)))'''''=", +"{{{{{{......{{{{{{^^~^;@$$$$&&*))~^)^~~!!!)'',==", +"{{{{{{......{{{{{{]^^^-@$$$&&&*)~~~~)]!!!),~,,,=", +"......{{{{{{......]]]^-@$$&$&&;)~~~)]]!]))~>,,,=", +"......{{{{{{......]]^^-@+$**&*-))))!)))))>>>,,,=", +"......{{{{{{......^^^^-@#$**&;->---%%%%%###%>'==", +"......{{{{{{......^^~^-@+#*&&*;;*&*##+@+#@@@>',=", +"......{{{{{{......^^^^-##$*&&&;;*&&&$$$++#@%->'=", +"......{{{{{{......^^^)-@##&;;&;;;&&*&#&$$$*#>',=", +"{{{{{{......{{{{{{]]]]-@$#*;;;;;;&&****&&&**>,-=", +"{{{{{{......{{{{{{]!]]-@$$*;;;*;;***********>,,=", +"{{{{{{......{{{{{{]]!)-#$#*;;;;>>;;>>->;;;,;,,'=", +"{{{{{{......{{{{{{]]]^-@$#*;;;>)^))>))>~~~^^~,,=", +"{{{{{{......{{{{{{]^^^-++#**;;>))^)))>))>^~~,'==", +"{{{{{{......{{{{{{^^]^-@#$*;;;>))~~))~)])))~'~,=", +"......{{{{{{......^^^^-+$#**&;))]~~))')!]!!!~,>=", +"......{{{{{{......^^^^-@+#*;;;>)^^~))~)!!!!'~>~=", +"......{{{{{{......]]]^-#$#**&;>)))^^~)))!))),'>=", +"......{{{{{{......]]^^-@+#&;&;>))~))^^~'~~~~)''>", +"......{{{{{{......]]]^-+$#*&;;-!!)~!!!^~~~'!~''=", +"......{{{{{{......]^]^-@##*;*;>!]!'~'!~)~~~''''=", +"{{{{{{......{{{{{{^^~^>@##**;*;)]!!~,~~)~~~'~''=", +"{{{{{{......{{{{{{]^])-@$$&&;;-)!!)~)''~')~''''=", +"{{{{{{......{{{{{{]^^^-+$$&*&;*>!!!~~~)~~!~'''==", +"{{{{{{......{{{{{{]]^^-@$$&&&;;)'!'))!~')'~',',=", +"{{{{{{......{{{{{{^]]^-@@#**;--)!!~~~)!~~)~','>=", +"{{{{{{......{{{{{{]^]!'%%%=>->>)~~~>~~'~~!)'',,=", +"......{{{{{{......^^]]!!)))))!!!',~),~''~'~''',=", +"......{{{{{{......^^]]!)>''!'!'),,,''''~''~~',>=", +"......{{{{{{......^^~]))>>,,''''~,,)'~',~'',',,-", +"......{{{{{{......^^~,,>,,,=,''',,'=,=,''',',,,=", +"......{{{{{{......]~~,='>,-,==,===,====,='='=,,,", +"......{{{{{{......!,=====%======%==============="}; only in patch2: unchanged: --- flightgear-0.9.10.orig/debian/compat +++ flightgear-0.9.10/debian/compat @@ -0,0 +1 @@ +5