Debian Bug report logs - #480502
Fix include ubuntu changes

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Stefan Ebner <hellboy195@gmail.com>

To: submit@bugs.debian.org

Subject: Fix include ubuntu changes

Date: Sat, 10 May 2008 15:31:57 +0200

[Message part 1 (text/plain, inline)]

Package: flightgear
Version: 1.0.0-2



Hi,

It would be great if you can include some of our ubuntu changes so we
can sync next time.
At least please include some of them to reduce the delta between debian
and ubuntu.
Thanks :)


      - add flightgear.xpm in debian/
      - add icon copyright's information in debian/copyright
      - fix debian/flightgear.desktop:
   + General clean-up:
      - Add usr/share/pixmaps and usr/share/applications in debian/dirs
      - Rework debian/copyright in compliance to present standards
      - Update debian/watch
      - Update debian/menu
      - Creating of debian/docs

[ubuntu_fixes.debdiff (text/plain, inline)]

diff -u flightgear-1.0.0/debian/menu flightgear-1.0.0/debian/menu
--- flightgear-1.0.0/debian/menu
+++ flightgear-1.0.0/debian/menu
@@ -1,2 +1,4 @@
-?package(flightgear):needs=X11 section=Games/Simulation\
-  title="Flight Gear" command="/usr/games/fgfs"
+?package(flightgear):needs="X11"\
+  section="Games/Simulation"\
+  title="Flight Gear"\
+  command="/usr/games/fgfs"
diff -u flightgear-1.0.0/debian/flightgear.desktop flightgear-1.0.0/debian/flightgear.desktop
--- flightgear-1.0.0/debian/flightgear.desktop
+++ flightgear-1.0.0/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-1.0.0/debian/rules flightgear-1.0.0/debian/rules
--- flightgear-1.0.0/debian/rules
+++ flightgear-1.0.0/debian/rules
@@ -63,11 +63,8 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-
 	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
 	dh_installmenu
 	dh_installchangelogs ChangeLog
diff -u flightgear-1.0.0/debian/copyright flightgear-1.0.0/debian/copyright
--- flightgear-1.0.0/debian/copyright
+++ flightgear-1.0.0/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 <ubuntu-motu@lists.ubuntu.com>
 
-Upstream Authors: Curtis L. Olson <curt@flightgear.org>
-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 <curt@flightgear.org>
+Upstream Authors: Curtis  L. Olson <curtis@flightgear.org> 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 <jbabcock@atlantech.net> 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 <christophe.sauthier@gmail.com> and
+is licensed under the GPL version 2, see above.
diff -u flightgear-1.0.0/debian/docs flightgear-1.0.0/debian/docs
--- flightgear-1.0.0/debian/docs
+++ flightgear-1.0.0/debian/docs
@@ -4,0 +5,33 @@
+docs-mini/AptNavFAQ.FlightGear.html
+docs-mini/FlightGear-FAQ.html
+docs-mini/Nasal.html
+docs-mini/README.autoconf
+docs-mini/README.commands
+docs-mini/README.conditions
+docs-mini/README.digitalfilters
+docs-mini/README.electrical
+docs-mini/README.extensions
+docs-mini/README.fgjs
+docs-mini/README.gui
+docs-mini/README.introduction
+docs-mini/README.IO
+docs-mini/README.Joystick
+docs-mini/README.JSBSim
+docs-mini/README.jsclient
+docs-mini/README.Linux
+docs-mini/README.logging
+docs-mini/README.multiplayer
+docs-mini/README.plib
+docs-mini/README.properties
+docs-mini/README.protocol
+docs-mini/README.running
+docs-mini/README.SimGear
+docs-mini/README.sound
+docs-mini/README.src
+docs-mini/README.submodels
+docs-mini/README.tutorial
+docs-mini/README.uiuc
+docs-mini/README.xmlhud
+docs-mini/README.xmlpanel
+docs-mini/README.xmlsound
+docs-mini/README.xmlsyntax
diff -u flightgear-1.0.0/debian/watch flightgear-1.0.0/debian/watch
--- flightgear-1.0.0/debian/watch
+++ flightgear-1.0.0/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
diff -u flightgear-1.0.0/debian/install flightgear-1.0.0/debian/install
--- flightgear-1.0.0/debian/install
+++ flightgear-1.0.0/debian/install
@@ -1 +1,2 @@
-debian/flightgear.desktop usr/share/applications
+debian/flightgear.desktop /usr/share/applications
+debian/flightgear.xpm /usr/share/pixmaps
diff -u flightgear-1.0.0/debian/dirs flightgear-1.0.0/debian/dirs
--- flightgear-1.0.0/debian/dirs
+++ flightgear-1.0.0/debian/dirs
@@ -1,0 +2,2 @@
+usr/share/applications
+usr/share/pixmaps
only in patch2:
unchanged:
--- flightgear-1.0.0.orig/debian/flightgear.xpm
+++ flightgear-1.0.0/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",
+"{{{{{{......{{{{{{]]]]]]^^^^^^^^^^^^^^^^^^^^^^))",
+"{{{{{{......{{{{{{]]^]]]^^^^^^^^^^^^^]^^^^^^^^)>",
+"{{{{{{......{{{{{{]^^^^^^^^^^^^^^^^]^^]^^^^^^^'=",
+"{{{{{{......{{{{{{]]^^^^^^^^^^^^^^])]^^^^^^^)',=",
+"{{{{{{......{{{{{{]^^^^^^~]^]^^^^]!!]^~~~~]]!'==",
+"{{{{{{......{{{{{{^^^^^^~^^]^]^^)^]))^~^~~)!,,,=",
+"......{{{{{{......^^^^)>>>>>>>)>>>>>>>;>>>>>>''=",
+"......{{{{{{......^^^^-%##$#+#########%###@%%='=",
+"......{{{{{{......^)])-@++++++++++++++@@@++@@=!=",
+"......{{{{{{......^^]]-@++++$$$+$$$$$$$#$$$+%='=",
+"......{{{{{{......]]!]-@++$$$$&$$$$&$$$##$$$%''=",
+"......{{{{{{......]]])-@++$$&#**#*&&*******%%=>=",
+"{{{{{{......{{{{{{]]])-@+$$$&***-%%*-%-%%*%-=>>=",
+"{{{{{{......{{{{{{]^^~-++$$$&&-;>)>>>>>>>>>!=',=",
+"{{{{{{......{{{{{{^^^~-++$$&&**)))]]])^^)!!!!'>=",
+"{{{{{{......{{{{{{^^^~-@+$#$&**)]))))~^)))'''''=",
+"{{{{{{......{{{{{{^^~^;@$$$$&&*))~^)^~~!!!)'',==",
+"{{{{{{......{{{{{{]^^^-@$$$&&&*)~~~~)]!!!),~,,,=",
+"......{{{{{{......]]]^-@$$&$&&;)~~~)]]!]))~>,,,=",
+"......{{{{{{......]]^^-@+$**&*-))))!)))))>>>,,,=",
+"......{{{{{{......^^^^-@#$**&;->---%%%%%###%>'==",
+"......{{{{{{......^^~^-@+#*&&*;;*&*##+@+#@@@>',=",
+"......{{{{{{......^^^^-##$*&&&;;*&&&$$$++#@%->'=",
+"......{{{{{{......^^^)-@##&;;&;;;&&*&#&$$$*#>',=",
+"{{{{{{......{{{{{{]]]]-@$#*;;;;;;&&****&&&**>,-=",
+"{{{{{{......{{{{{{]!]]-@$$*;;;*;;***********>,,=",
+"{{{{{{......{{{{{{]]!)-#$#*;;;;>>;;>>->;;;,;,,'=",
+"{{{{{{......{{{{{{]]]^-@$#*;;;>)^))>))>~~~^^~,,=",
+"{{{{{{......{{{{{{]^^^-++#**;;>))^)))>))>^~~,'==",
+"{{{{{{......{{{{{{^^]^-@#$*;;;>))~~))~)])))~'~,=",
+"......{{{{{{......^^^^-+$#**&;))]~~))')!]!!!~,>=",
+"......{{{{{{......^^^^-@+#*;;;>)^^~))~)!!!!'~>~=",
+"......{{{{{{......]]]^-#$#**&;>)))^^~)))!))),'>=",
+"......{{{{{{......]]^^-@+#&;&;>))~))^^~'~~~~)''>",
+"......{{{{{{......]]]^-+$#*&;;-!!)~!!!^~~~'!~''=",
+"......{{{{{{......]^]^-@##*;*;>!]!'~'!~)~~~''''=",
+"{{{{{{......{{{{{{^^~^>@##**;*;)]!!~,~~)~~~'~''=",
+"{{{{{{......{{{{{{]^])-@$$&&;;-)!!)~)''~')~''''=",
+"{{{{{{......{{{{{{]^^^-+$$&*&;*>!!!~~~)~~!~'''==",
+"{{{{{{......{{{{{{]]^^-@$$&&&;;)'!'))!~')'~',',=",
+"{{{{{{......{{{{{{^]]^-@@#**;--)!!~~~)!~~)~','>=",
+"{{{{{{......{{{{{{]^]!'%%%=>->>)~~~>~~'~~!)'',,=",
+"......{{{{{{......^^]]!!)))))!!!',~),~''~'~''',=",
+"......{{{{{{......^^]]!)>''!'!'),,,''''~''~~',>=",
+"......{{{{{{......^^~]))>>,,''''~,,)'~',~'',',,-",
+"......{{{{{{......^^~,,>,,,=,''',,'=,=,''',',,,=",
+"......{{{{{{......]~~,='>,-,==,===,====,='='=,,,",
+"......{{{{{{......!,=====%======%==============="};

Message #10 received at 480502@bugs.debian.org (full text, mbox, reply):

From: Ove Kaaven <ovek@arcticnet.no>

To: Stefan Ebner <hellboy195@gmail.com>, 480502@bugs.debian.org

Subject: Re: Bug#480502: Fix include ubuntu changes

Date: Sat, 21 Jun 2008 14:01:52 +0200

Stefan Ebner skrev:
> It would be great if you can include some of our ubuntu changes so we
> can sync next time.
> At least please include some of them to reduce the delta between debian
> and ubuntu.

Seems to me most of the stuff in this diff is unnecessary anyway...

>       - add flightgear.xpm in debian/
>       - add icon copyright's information in debian/copyright

I'd consider it, but the copyright information seems bad. It speaks 
about flightgear.pgn, which is not a file extension I'm familiar with. 
Perhaps it's supposed to be .png? The download location for the "pgn" 
also seems invalid, I just get "unavailable", so I can't verify. So I'd 
need updated copyright information before I could add this icon.

>       - fix debian/flightgear.desktop:

Fix? What's wrong with the current .desktop?

>    + General clean-up:
>       - Add usr/share/pixmaps and usr/share/applications in debian/dirs

dh_install creates them anyway.

>       - Rework debian/copyright in compliance to present standards

And style changes and Ubuntuisms; can't use the patch as-is. And if I 
were to update the flightgear copyright, the simgear and fgfs-base 
copyrights should get a similar treatment. Besides, a new standard is in 
the works (http://wiki.debian.org/Proposals/CopyrightFormat), so if it's 
really necessary for me to rework the copyrights (which it is probably 
not yet), it seems wiser to prepare for that future standard.

>       - Update debian/watch

Or rather, comment out the European mirror and try to put extra load on 
the connection-restricted main site instead.

>       - Update debian/menu

"Update"? It just word-wraps it.

>       - Creating of debian/docs

Too much of a maintenance hassle, the file would have to be kept updated 
if upstream adds more docs. Easier to just install everything, and 
delete specific stuff from the installation directory afterwards. (Just 
been too lazy to make a list of docs for that yet...)

Message #15 received at 480502-done@bugs.debian.org (full text, mbox, reply):

From: Scott Kitterman <scott@kitterman.com>

To: 480502-done@bugs.debian.org

Subject: Bug OBE - Ubuntu changes dropped

Date: Fri, 22 Oct 2010 11:46:11 -0400

[Message part 1 (text/plain, inline)]

Based on the Debian reivew of the Ubuntu changes, they've been dropped from 
Ubuntu.

[signature.asc (application/pgp-signature, inline)]

Send a report that this bug log contains spam.