[pkg-fgfs-crew] r212 - in /flightgear/trunk: debian/changelog debian/patches/ debian/patches/browser.patch debian/patches/series debian/rules debian/source/ debian/source/format src/Main/options.cxx

[ovek at users.alioth.debian.org]

Author: ovek
Date: Mon Jul 16 07:21:58 2012
New Revision: 212

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=212
Log:
Switch to 3.0 (quilt) format.

Added:
    flightgear/trunk/debian/patches/
    flightgear/trunk/debian/patches/browser.patch
    flightgear/trunk/debian/patches/series
    flightgear/trunk/debian/source/
    flightgear/trunk/debian/source/format
Modified:
    flightgear/trunk/debian/changelog
    flightgear/trunk/debian/rules
    flightgear/trunk/src/Main/options.cxx

Modified: flightgear/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/changelog?rev=212&op=diff
==============================================================================
--- flightgear/trunk/debian/changelog (original)
+++ flightgear/trunk/debian/changelog Mon Jul 16 07:21:58 2012
@@ -3,7 +3,8 @@
   * New upstream release.
   * Depend on cmake. No longer depend on autotools-dev.
   * Updated debian/rules for the new cmake-based build
-    system used by upstream.
+    system used by upstream, and cleaned it up a bit.
+  * Switched source package format to 3.0 (quilt).
   * Added build-dependencies on libplib-dev and libudev-dev.
 
  -- Ove Kaaven <ovek at arcticnet.no>  Mon, 16 Jul 2012 06:01:36 +0200

Added: flightgear/trunk/debian/patches/browser.patch
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/patches/browser.patch?rev=212&op=file
==============================================================================
--- flightgear/trunk/debian/patches/browser.patch (added)
+++ flightgear/trunk/debian/patches/browser.patch Mon Jul 16 07:21:58 2012
@@ -1,0 +1,22 @@
+Description: Use "sensible-browser" as default browser
+ For launching the user's preferred Web browser to show online help.
+ (This patch is not strictly necessary since preferences.xml (in
+ fgfs-base) should be overriding this default anyway, and
+ preferences.xml is also patched to use sensible-browser, but
+ can't hurt to also set the default here.)
+Origin: vendor
+Author: Ove Kaaven <ovek at arcticnet.no>
+Forwarded: not-needed
+Last-Update: 2012-07-16
+
+--- flightgear-2.6.0.orig/src/Main/options.cxx
++++ flightgear-2.6.0/src/Main/options.cxx
+@@ -185,7 +185,7 @@ fgSetDefaults ()
+     fgSetString("/sim/startup/browser-app", "launchWebJumper");
+ #else
+     const char* browserEnv = ::getenv( "WEBBROWSER" );
+-    if (!browserEnv) browserEnv = "netscape";
++    if (!browserEnv) browserEnv = "sensible-browser";
+     fgSetString("/sim/startup/browser-app", browserEnv);
+ #endif
+     fgSetString("/sim/logging/priority", "alert");

Added: flightgear/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/patches/series?rev=212&op=file
==============================================================================
--- flightgear/trunk/debian/patches/series (added)
+++ flightgear/trunk/debian/patches/series Mon Jul 16 07:21:58 2012
@@ -1,0 +1,1 @@
+browser.patch

Modified: flightgear/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/rules?rev=212&op=diff
==============================================================================
--- flightgear/trunk/debian/rules (original)
+++ flightgear/trunk/debian/rules Mon Jul 16 07:21:58 2012
@@ -56,7 +56,6 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
-#	dh_installdirs
 
 	cd build && \
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/flightgear
@@ -77,7 +76,6 @@
 	cp utils/TerraSync/README.txt debian/flightgear/usr/share/doc/flightgear/README.TerraSync
 	dh_installmenu
 	dh_installchangelogs ChangeLog
-	dh_desktop
 	dh_strip
 	dh_compress
 	dh_fixperms

Added: flightgear/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/source/format?rev=212&op=file
==============================================================================
--- flightgear/trunk/debian/source/format (added)
+++ flightgear/trunk/debian/source/format Mon Jul 16 07:21:58 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: flightgear/trunk/src/Main/options.cxx
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/src/Main/options.cxx?rev=212&op=diff
==============================================================================
--- flightgear/trunk/src/Main/options.cxx (original)
+++ flightgear/trunk/src/Main/options.cxx Mon Jul 16 07:21:58 2012
@@ -185,7 +185,7 @@
     fgSetString("/sim/startup/browser-app", "launchWebJumper");
 #else
     const char* browserEnv = ::getenv( "WEBBROWSER" );
-    if (!browserEnv) browserEnv = "sensible-browser";
+    if (!browserEnv) browserEnv = "netscape";
     fgSetString("/sim/startup/browser-app", browserEnv);
 #endif
     fgSetString("/sim/logging/priority", "alert");