diff -Nru fgrun-3.0.0/CMakeLists.txt fgrun-3.1.0~704+gitb31c717/CMakeLists.txt --- fgrun-3.0.0/CMakeLists.txt 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/CMakeLists.txt 2014-06-22 14:11:36.000000000 +0000 @@ -48,6 +48,11 @@ include (CPack) option(ENABLE_NLS "Set to ON to build fgrun with NLS support" ON) +option(SIMGEAR_SHARED "Set to ON to dynamically link SimGear" OFF) +option(SHARED_FLTK "Set to ON to dynamically link FLTK (requires that SimGear also be dynamically linked)" OFF) +if (SHARED_FLTK AND NOT SIMGEAR_SHARED) + message(FATAL_ERROR "Please do not use SHARED_FLTK without SIMGEAR_SHARED, as it will probably fail to compile") +endif (SHARED_FLTK AND NOT SIMGEAR_SHARED) if (MSVC) GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH) @@ -128,9 +133,16 @@ find_package(Boost REQUIRED) find_package(ZLIB REQUIRED) -find_package(FLTK REQUIRED) +if (SHARED_FLTK) + #see http://sources.debian.net/src/fltk1.3/1.3.2-4/README.CMake.txt lines 200-240 + find_package(FLTK REQUIRED NO_MODULE) + include(${FLTK_USE_FILE}) + set(FLTK_LIBRARIES "fltk_forms_SHARED;fltk_gl_SHARED;fltk_images_SHARED;fltk_SHARED") +else (SHARED_FLTK) + find_package(FLTK REQUIRED) +endif (SHARED_FLTK) find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgDB osgParticle osgUtil osgViewer osgGA) -find_package(SimGear 2.8.0 REQUIRED) +find_package(SimGear ${FGRUN_VERSION} REQUIRED) if (ENABLE_NLS) find_package(Gettext) endif (ENABLE_NLS) diff -Nru fgrun-3.0.0/debian/changelog fgrun-3.1.0~704+gitb31c717/debian/changelog --- fgrun-3.0.0/debian/changelog 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/changelog 2014-06-22 14:11:58.000000000 +0000 @@ -1,45 +1,58 @@ -fgrun (3.0.0-1) unstable; urgency=medium +fgrun (3.1.0~704+gitb31c717-0ubuntu1~ppa1~trusty1) trusty; urgency=low - * Final upstream release. + [ Clément de l'Hamaide ] + * Version 3.1.0 + * Version 3.1.0 + * Version 3.1.0 + * Version 3.1.0 + * make FGRun #version dependant of SimGear #version + * Avoid --terrasync-dir=NOT SET after hitting OK button in Advanced windows + * Remove --game-mode and --disable-intro-music options + * Add tooltip info for TerraSync field + * Avoid duplicate --generic for FGCom + * Replace "Defaults" by "Restore default settings" for less confusion. + + [ Clement de l'Hamaide ] + * Add --terrasync-dir & --fg-aircraft options for Silent mode + + [ Gijs de Rooy ] + * Hide console from FGRun + * Add console option - -- Markus Wanner Wed, 19 Feb 2014 08:42:33 -0800 - -fgrun (3.0.0~git20140130+80f6df0-1) unstable; urgency=low + [ Clement de l'Hamaide ] + * Replace Skyblend option by Texture compression option [ Rebecca Palmer ] - * New upstream pre-release. - * Correct B-D: drop autotools-dev, add cmake and fluid. - * Tweak debian/rules, so we use proper build FLAGS. - * Update simgear dependency. Closes: #719402, #718378. - * Add patch to make cmake properly locate fltk-1.3. - * Fix an issue with setting the scenery directory - (fix-scenery-dir-bug.diff). - - [ Markus Wanner ] - * Bump Standards-Version; no changes needed. - * Adjust patche fix-cmake-dl. - * Drop fix-format-string-warning, it got applied upstream. - * Add patch to default to the Debian directories used during - installation for ease of use. - * Add myself as an uploader. - - -- Markus Wanner Mon, 10 Feb 2014 13:37:58 +0100 - -fgrun (1.7.0-1) unstable; urgency=low - - * New upstream release. - * Set compat and debhelper dependency to 9 - * Set fltk dependency to 1.3 (from 1.1) - * Set Standards-Version to 3.9.4 - * Remove some trailing whitespace from the description - * Update the rules for cmake - * Add Keywords to desktop file - * Patch upstream source to build without warning from format string - * Patch upstream source to link against libdl + * Add option to use shared FLTK libraries + * Require SIMGEAR_SHARED for SHARED_FLTK + + [ Clément de l'Hamaide ] + * Should fix missing libraries link + + [ Gijs de Rooy ] + * Remove unused --control option + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Sun, 22 Jun 2014 10:11:57 -0400 + +fgrun (1.7.0-0ubuntu1~ppa1~trusty1) trusty; urgency=low + + * New upstream release 1.7.0 + * Updated dependencies + * Updated for cmake + * Fix possible format string security hole. + * Fix FTBFS caused by incorrect searching of fltk libraries + + -- Saikrishna Arcot Thu, 16 Jan 2014 15:42:59 -0500 + +fgrun (1.6.0-1build1) trusty; urgency=low + + * No-change rebuild to drop simgear2.4.0 dependency. - -- Christopher Baines Sun, 11 Aug 2013 15:12:59 +0200 + -- Ilya Barygin Sat, 08 Sep 2012 12:55:37 +0400 -fgrun (1.6.0-1) unstable; urgency=low +fgrun (1.6.0-1) trusty; urgency=low * New upstream release (closes: 642661). * Added patch to fix #636366 Closes: #636366. @@ -49,7 +62,7 @@ -- Christopher Baines Wed, 09 Nov 2011 11:18:56 +0000 -fgrun (1.5.2-1) unstable; urgency=low +fgrun (1.5.2-1) trusty; urgency=low * Initial release (closes: #590182). diff -Nru fgrun-3.0.0/debian/control fgrun-3.1.0~704+gitb31c717/debian/control --- fgrun-3.0.0/debian/control 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/control 2014-06-22 14:04:20.000000000 +0000 @@ -1,16 +1,11 @@ Source: fgrun Section: games Priority: optional -Maintainer: Debian FlightGear Crew -Uploaders: Christopher Baines , - Markus Wanner -Build-Depends: debhelper (>= 9), cmake, libfltk1.3-dev, fluid, - libsimgear-dev (>= 2.10.0), libboost-dev, - zlib1g-dev (>= 1:1.2.3.4.dfsg-3) -Standards-Version: 3.9.5 +Maintainer: Saikrishna Arcot +XSBC-Original-Maintainer: Debian FlightGear Crew +Build-Depends: debhelper (>= 9), cmake, libfltk1.3-dev, fluid, libsimgear-dev (>= 3.1.0~), libsimgear-dev (<< 3.2.0~), libboost-dev, zlib1g-dev (>= 1:1.2.3.4.dfsg-3) +Standards-Version: 3.9.4 Homepage: http://fgrun.sourceforge.net/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/fgrun.git -Vcs-Git: git://anonscm.debian.org/collab-maint/fgrun.git Package: fgrun Architecture: any @@ -18,20 +13,50 @@ Recommends: flightgear Description: graphical frontend for running FlightGear FlightGear Launch Control (FGRun) is a graphical frontend for running the - FlightGear Flight Simulator (fgfs). + FlightGear Flight Simulator (fgfs). . - It includes the ability to configure your scenery paths FlightGear setup. + It includes the ability to configure your scenery paths FlightGear setup. When selecting an aircraft you are able to view a complete 3d model and see - its development status and author. When selecting an airport or carrier to - launch from you can chose either by the ICAO ID (International Civilian - Aviation Organisation Identifier) or the airport id, with the flexibility of - selecting a runway and parking position also. + its development status and author. When selecting an airport or carrier to + launch from you can chose either by the ICAO ID (International Civilian + Aviation Organisation Identifier) or the airport id, with the flexibility of + selecting a runway and parking position also. . - When launching the simulation FGRun includes a comprehensive configuration + When launching the simulation FGRun includes a comprehensive configuration system, allowing you to directly configure settings such as screen resolution - and multiplayer settings. + and multiplayer settings. . - FGRun also includes support for TerraSync, a tool included with FlightGear + FGRun also includes support for TerraSync, a tool included with FlightGear that allows you to download and use scenery while in the simulation, it can also preload the scenery for your selected location as the airport selection - screen. + screen. + +Package: fgrun-dbg +Architecture: any +Section: debug +Depends: ${misc:Depends}, fgrun (= ${binary:Version}) +Description: Debug symbols for FGRun + FlightGear Launch Control (FGRun) is a graphical frontend for running the + FlightGear Flight Simulator (fgfs). + . + It includes the ability to configure your scenery paths FlightGear setup. + When selecting an aircraft you are able to view a complete 3d model and see + its development status and author. When selecting an airport or carrier to + launch from you can chose either by the ICAO ID (International Civilian + Aviation Organisation Identifier) or the airport id, with the flexibility of + selecting a runway and parking position also. + . + When launching the simulation FGRun includes a comprehensive configuration + system, allowing you to directly configure settings such as screen resolution + and multiplayer settings. + . + FGRun also includes support for TerraSync, a tool included with FlightGear + that allows you to download and use scenery while in the simulation, it can + also preload the scenery for your selected location as the airport selection + screen. + . + This is the debug version of FGRun. This should be used if you experience + problems when running FGRun and you want to report more information to + FGRun. + + diff -Nru fgrun-3.0.0/debian/fgrun.desktop fgrun-3.1.0~704+gitb31c717/debian/fgrun.desktop --- fgrun-3.0.0/debian/fgrun.desktop 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/fgrun.desktop 2014-06-22 14:04:20.000000000 +0000 @@ -2,7 +2,6 @@ Type=Application Version=1.4 Name=FlightGear Launch Control -Keywords=fgrun;fgfs;flight;flightgear;launch;control Icon=/usr/share/pixmaps/flightgear.ico Exec=fgrun Terminal=false diff -Nru fgrun-3.0.0/debian/patches/add-debian-defaults.diff fgrun-3.1.0~704+gitb31c717/debian/patches/add-debian-defaults.diff --- fgrun-3.0.0/debian/patches/add-debian-defaults.diff 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/patches/add-debian-defaults.diff 2014-06-22 14:04:20.000000000 +0000 @@ -3,8 +3,10 @@ ease this process by defaulting to the install locations used by Debian. Author: Markus Wanner ---- a/src/main.cxx -+++ b/src/main.cxx +Index: fgrun/src/main.cxx +=================================================================== +--- fgrun.orig/src/main.cxx 2014-06-22 10:03:57.169435009 -0400 ++++ fgrun/src/main.cxx 2014-06-22 10:03:57.166435009 -0400 @@ -37,10 +37,10 @@ #include "wizard.h" #include "i18n.h" @@ -18,5 +20,5 @@ +std::string def_fg_scenery = "/usr/share/games/flightgear/Scenery"; +std::string def_ts_exe = "/usr/games/terrasync"; std::string version = ""; - int def_ts_dir = -1; - static bool silent = false; + std::string def_ts_dir = ""; + std::string def_acft_dir = ""; diff -Nru fgrun-3.0.0/debian/patches/fix-cmake-dl fgrun-3.1.0~704+gitb31c717/debian/patches/fix-cmake-dl --- fgrun-3.0.0/debian/patches/fix-cmake-dl 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/patches/fix-cmake-dl 2014-06-22 14:04:20.000000000 +0000 @@ -1,27 +1,14 @@ Description: tell cmake to link against libdl Author: Christopher Baines ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -212,9 +212,11 @@ - endif() - - if ( CMAKE_DL_LIBS ) -- list(APPEND FLTK_LIBRARIES ${CMAKE_DL_LIBS}) -+ list(APPEND FLTK_LIBRARIES ${CMAKE_DL_LIBS}) - endif() - -+ list(APPEND FLTK_LIBRARIES ${CMAKE_DL_LIBS}) -+ - set( CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR} ) - set( CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES} ) - message(STATUS "Using FLTK_LIBRARIES for fgrun: ${FLTK_LIBRARIES}") ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -72,6 +72,7 @@ - ${INTL_LIBRARY} +Index: fgrun/src/CMakeLists.txt +=================================================================== +--- fgrun.orig/src/CMakeLists.txt 2014-06-22 10:03:59.416435006 -0400 ++++ fgrun/src/CMakeLists.txt 2014-06-22 10:03:59.413435006 -0400 +@@ -73,6 +73,7 @@ ${OPENPTY_LIBRARY} ${PLATFORM_LIBS} + ${OPENGL_LIBRARIES} + ${CMAKE_DL_LIBS} ) diff -Nru fgrun-3.0.0/debian/patches/fix-scenery-dir-bug.diff fgrun-3.1.0~704+gitb31c717/debian/patches/fix-scenery-dir-bug.diff --- fgrun-3.0.0/debian/patches/fix-scenery-dir-bug.diff 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/patches/fix-scenery-dir-bug.diff 2014-06-22 14:04:20.000000000 +0000 @@ -1,9 +1,11 @@ Description: Fix a bug in case FG_SCENERY is not set. Author: Rebecca Palmer ---- a/src/wizard_funcs.cxx -+++ b/src/wizard_funcs.cxx -@@ -317,6 +317,7 @@ +Index: fgrun/src/wizard_funcs.cxx +=================================================================== +--- fgrun.orig/src/wizard_funcs.cxx 2014-06-22 10:03:58.028435008 -0400 ++++ fgrun/src/wizard_funcs.cxx 2014-06-22 10:03:58.025435008 -0400 +@@ -335,6 +335,7 @@ else if (!def_fg_scenery.empty()) { fg_scenery = def_fg_scenery; diff -Nru fgrun-3.0.0/debian/patches/fltk1-3cmake.diff fgrun-3.1.0~704+gitb31c717/debian/patches/fltk1-3cmake.diff --- fgrun-3.0.0/debian/patches/fltk1-3cmake.diff 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/patches/fltk1-3cmake.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Description: Don't use FindFLTK 1.1 to find FLTK 1.3 - CMake's FindFLTK is for FLTK 1.1, and is not recommended for FLTK1.3 - (see fltk1.3's README.CMake.txt): it links FLTK statically, - and links against several things libfltk1.3-dev doesn't depend on - (libxft-dev,libxinerama-dev,libfontconfig1-dev,libjpeg-dev,libpng-dev) -Author: Rebecca Palmer -Forwarded: https://gitorious.org/fg/fgrun/merge_requests/8 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -128,7 +128,10 @@ - - find_package(Boost REQUIRED) - find_package(ZLIB REQUIRED) --find_package(FLTK REQUIRED) -+find_package(FLTK REQUIRED NO_MODULE) -+include(${FLTK_USE_FILE}) -+#Not sure if we actually need them all -+set(FLTK_LIBRARIES "fltk_forms_SHARED;fltk_gl_SHARED;fltk_images_SHARED;fltk_SHARED") - find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgDB osgParticle osgUtil osgViewer osgGA) - find_package(SimGear 2.8.0 REQUIRED) - if (ENABLE_NLS) diff -Nru fgrun-3.0.0/debian/patches/kfreebsd.patch fgrun-3.1.0~704+gitb31c717/debian/patches/kfreebsd.patch --- fgrun-3.0.0/debian/patches/kfreebsd.patch 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/patches/kfreebsd.patch 2014-06-22 14:04:20.000000000 +0000 @@ -1,6 +1,8 @@ Fixes bug #636366, OLCUC is a linux-specific extention to termios ---- a/src/run_posix.cxx -+++ b/src/run_posix.cxx +Index: fgrun/src/run_posix.cxx +=================================================================== +--- fgrun.orig/src/run_posix.cxx 2014-06-22 10:03:58.729435007 -0400 ++++ fgrun/src/run_posix.cxx 2014-06-22 10:03:58.727435007 -0400 @@ -60,7 +60,11 @@ #if defined(HAVE_TERMIOS_H) struct termios term; diff -Nru fgrun-3.0.0/debian/patches/series fgrun-3.1.0~704+gitb31c717/debian/patches/series --- fgrun-3.0.0/debian/patches/series 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/patches/series 2014-06-22 14:04:20.000000000 +0000 @@ -2,4 +2,3 @@ fix-scenery-dir-bug.diff kfreebsd.patch fix-cmake-dl -fltk1-3cmake.diff diff -Nru fgrun-3.0.0/debian/rules fgrun-3.1.0~704+gitb31c717/debian/rules --- fgrun-3.0.0/debian/rules 2014-02-19 17:38:03.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/debian/rules 2014-06-22 14:04:20.000000000 +0000 @@ -18,7 +18,7 @@ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_INSTALL_BINDIR:PATH=games \ - -DSIMGEAR_SHARED:BOOL=ON + -DSIMGEAR_SHARED:BOOL=ON \ %: dh $@ --buildsystem=cmake --builddirectory=build --parallel @@ -31,8 +31,12 @@ dh_auto_install # The CMAKE_INSTALL_BINDIR might be ignored - if [ -d debian/fgrun/usr/bin ]; then \ - dh_installdirs --package=fgrun usr/games; \ - mv debian/fgrun/usr/bin/* -t debian/fgrun/usr/games; \ - rmdir debian/fgrun/usr/bin; \ + if [ -d debian/tmp/usr/bin ]; then \ + dh_installdirs --package=fgrun usr/games; \ + mv debian/tmp/usr/bin/* -t debian/fgrun/usr/games; \ fi + + mv debian/tmp/usr/share debian/fgrun/usr + +override_dh_strip: + dh_strip --dbg-package=fgrun-dbg diff -Nru fgrun-3.0.0/po/de.po fgrun-3.1.0~704+gitb31c717/po/de.po --- fgrun-3.0.0/po/de.po 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/de.po 2014-06-22 14:11:36.000000000 +0000 @@ -13,10 +13,10 @@ "PO-Revision-Date: 2008-01-30 16:00+0100\n" "Last-Translator: Adrian \n" "Language-Team: German\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/logwin.cxx:34 @@ -264,10 +264,6 @@ msgid "Config:" msgstr "Konfiguration:" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "Steuerung:" - #: src/advanced.cxx:892 msgid "Core Flight Dynamics Model" msgstr "Flugdynamikmodell" @@ -997,10 +993,6 @@ msgid "Preview" msgstr "Vorschau" -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "Hauptsteuermethode" - #: src/advanced.cxx:1612 src/advanced_funcs.cxx:224 msgid "Properties" msgstr "Einstellungen" diff -Nru fgrun-3.0.0/po/es.po fgrun-3.1.0~704+gitb31c717/po/es.po --- fgrun-3.0.0/po/es.po 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/es.po 2014-06-22 14:11:36.000000000 +0000 @@ -13,10 +13,10 @@ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: src/logwin.cxx:34 msgid "&Close" @@ -266,10 +266,6 @@ msgid "Config:" msgstr "Configuracin:" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "Controles:" - #: src/advanced.cxx:892 msgid "Core Flight Dynamics Model" msgstr "Core Flight Dynamics Model" @@ -1009,10 +1005,6 @@ msgid "Preview" msgstr "Vista previa" -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "Modo de control primario" - #: src/advanced.cxx:1612 src/advanced_funcs.cxx:224 msgid "Properties" msgstr "Propiedades" diff -Nru fgrun-3.0.0/po/fgrun.pot fgrun-3.1.0~704+gitb31c717/po/fgrun.pot --- fgrun-3.0.0/po/fgrun.pot 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/fgrun.pot 2014-06-22 14:11:36.000000000 +0000 @@ -32,14 +32,6 @@ msgid "General" msgstr "" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "" - -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "" - #: src/advanced.cxx:707 msgid "Language:" msgstr "" diff -Nru fgrun-3.0.0/po/fr.po fgrun-3.1.0~704+gitb31c717/po/fr.po --- fgrun-3.0.0/po/fr.po 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/fr.po 2014-06-22 14:11:36.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2008-01-05 19:05+0100\n" "Last-Translator: \n" "Language-Team: French\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: src/logwin.cxx:34 @@ -264,10 +264,6 @@ msgid "Config:" msgstr "Configuration:" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "Contrle:" - #: src/advanced.cxx:892 msgid "Core Flight Dynamics Model" msgstr "Modle de vol central" @@ -1002,10 +998,6 @@ msgid "Preview" msgstr "Aperu" -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "Mode de contrle primaire" - #: src/advanced.cxx:1612 src/advanced_funcs.cxx:224 msgid "Properties" msgstr "Proprits" diff -Nru fgrun-3.0.0/po/.gitignore fgrun-3.1.0~704+gitb31c717/po/.gitignore --- fgrun-3.0.0/po/.gitignore 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -*~ diff -Nru fgrun-3.0.0/po/it.po fgrun-3.1.0~704+gitb31c717/po/it.po --- fgrun-3.0.0/po/it.po 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/it.po 2014-06-22 14:11:36.000000000 +0000 @@ -11,10 +11,10 @@ "PO-Revision-Date: 2008-02-05 00:02+0100\n" "Last-Translator: Andrea Vezzali \n" "Language-Team: Italian\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/logwin.cxx:34 @@ -265,10 +265,6 @@ msgid "Config:" msgstr "Config:" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "Control:" - #: src/advanced.cxx:892 msgid "Core Flight Dynamics Model" msgstr "Dinamica di volo del modello (FDM)" @@ -1013,10 +1009,6 @@ msgid "Preview" msgstr "Anteprima" -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "Modalit primaria di controllo" - #: src/advanced.cxx:1612 src/advanced_funcs.cxx:224 msgid "Properties" msgstr "Propriet" diff -Nru fgrun-3.0.0/po/ja.po fgrun-3.1.0~704+gitb31c717/po/ja.po --- fgrun-3.0.0/po/ja.po 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/ja.po 2014-06-22 14:11:36.000000000 +0000 @@ -10,10 +10,10 @@ "PO-Revision-Date: 2013-05-27 22:25+0900\n" "Last-Translator: AOKI kiyohito \n" "Language-Team: FlightGear.jpn.org\n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Virtaal 0.7.1\n" @@ -261,10 +261,6 @@ msgid "Config:" msgstr "設定:" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "コントロール :" - #: src/advanced.cxx:892 msgid "Core Flight Dynamics Model" msgstr "飛行力学モデルのコアを選択してください" @@ -988,10 +984,6 @@ msgid "Preview" msgstr "プレビュー" -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "主な操縦モード" - #: src/advanced.cxx:1612 src/advanced_funcs.cxx:224 msgid "Properties" msgstr "プロパティ" diff -Nru fgrun-3.0.0/po/nl.po fgrun-3.1.0~704+gitb31c717/po/nl.po --- fgrun-3.0.0/po/nl.po 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/nl.po 2014-06-22 14:11:36.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2010-05-23 18:36+0200\n" "Last-Translator: Gijs de Rooy \n" "Language-Team: Dutch\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/logwin.cxx:34 @@ -277,10 +277,6 @@ msgid "Config:" msgstr "Configuratie:" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "Besturing:" - #: src/advanced.cxx:892 msgid "Core Flight Dynamics Model" msgstr "Kern FDM" @@ -1039,10 +1035,6 @@ msgid "Preview" msgstr "Voorbeeld" -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "Hoofdbesturingsmethode" - # geen vertaling nodig -- zelfde in NL #: src/advanced.cxx:1612 src/advanced_funcs.cxx:224 msgid "Properties" diff -Nru fgrun-3.0.0/po/pl.po fgrun-3.1.0~704+gitb31c717/po/pl.po --- fgrun-3.0.0/po/pl.po 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/pl.po 2014-06-22 14:11:36.000000000 +0000 @@ -11,10 +11,10 @@ "PO-Revision-Date: 2008-12-15 22:12+0100\n" "Last-Translator: \n" "Language-Team: Polish\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ASCII\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -273,10 +273,6 @@ msgid "Config:" msgstr "Plik konf:" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "Kontroler:" - # nie wiem czy dobrym pomyslem jest wprowadzenie skrotu MDL, choc juz pojawial sie on w tlumaczeniu dokumentacji dokonanym chyba przez Michala Maciejewskiego #: src/advanced.cxx:892 msgid "Core Flight Dynamics Model" @@ -1035,10 +1031,6 @@ msgid "Preview" msgstr "Podglad" -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "Podstawowy kontroler" - #: src/advanced.cxx:1612 src/advanced_funcs.cxx:224 msgid "Properties" msgstr "Wlasnosci" diff -Nru fgrun-3.0.0/po/pt.po fgrun-3.1.0~704+gitb31c717/po/pt.po --- fgrun-3.0.0/po/pt.po 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/po/pt.po 2014-06-22 14:11:36.000000000 +0000 @@ -12,10 +12,10 @@ "PO-Revision-Date: 2012-02-27 14:27-0300\n" "Last-Translator: Lizandro \n" "Language-Team: Portuguese \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" @@ -272,10 +272,6 @@ msgid "Config:" msgstr "Configuração:" -#: src/advanced.cxx:701 -msgid "Control:" -msgstr "Controle:" - #: src/advanced.cxx:892 msgid "Core Flight Dynamics Model" msgstr "Modelo de Dinâmica de Vôo Principal" @@ -1011,10 +1007,6 @@ msgid "Preview" msgstr "Previsualizar" -#: src/advanced.cxx:702 -msgid "Primary control mode" -msgstr "Modo de controle primario" - #: src/advanced.cxx:1612 src/advanced_funcs.cxx:224 msgid "Properties" msgstr "Propriedades" diff -Nru fgrun-3.0.0/src/advanced.fl fgrun-3.1.0~704+gitb31c717/src/advanced.fl --- fgrun-3.0.0/src/advanced.fl 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/src/advanced.fl 2014-06-22 14:11:36.000000000 +0000 @@ -63,10 +63,6 @@ label General private xywh {150 0 490 430} labelfont 1 labelsize 16 align 21 hide } { - Fl_Choice control { - label {Control:} open - private tooltip {Primary control mode} xywh {250 205 150 25} down_box BORDER_BOX labelsize 12 textsize 12 - } {} Fl_Input lang { label {Language:} private xywh {250 250 80 25} labelsize 12 textsize 12 @@ -1385,8 +1381,6 @@ } decl {static Fl_Menu_Item menu_cloud_coverage_[];} {private local } - decl {static Fl_Menu_Item menu_control[];} {private local - } decl {static Fl_Menu_Item menu_texture_filtering[];} {private local } decl {static Fl_Menu_Item menu_anti_aliasing[];} {private local diff -Nru fgrun-3.0.0/src/advanced_funcs.cxx fgrun-3.1.0~704+gitb31c717/src/advanced_funcs.cxx --- fgrun-3.0.0/src/advanced_funcs.cxx 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/src/advanced_funcs.cxx 2014-06-22 14:11:36.000000000 +0000 @@ -133,13 +133,6 @@ {0,0,0,0,0,0,0,0,0} }; -Fl_Menu_Item Advanced::menu_control[] = { - {N_("joystick"), 0, 0, (void*)"joystick", 0, FL_NORMAL_LABEL, 0, 12, 0}, - {N_("keyboard"), 0, 0, (void*)"keyboard", 0, FL_NORMAL_LABEL, 0, 12, 0}, - {N_("mouse"), 0, 0, (void*)"mouse", 0, FL_NORMAL_LABEL, 0, 12, 0}, - {0,0,0,0,0,0,0,0,0} -}; - Fl_Menu_Item Advanced::menu_texture_filtering[] = { {_("no filtering"), 0, 0, (void*)"1", 0, FL_NORMAL_LABEL, 0, 12, 0}, {_("2.0"), 0, 0, (void*)"2", 0, FL_NORMAL_LABEL, 0, 12, 0}, @@ -186,12 +179,6 @@ } cloud_coverage_->menu(menu_cloud_coverage_); - for ( int i = 0; menu_control[i].text != 0; ++i ) - { - menu_control[i].text = _( menu_control[i].text ); - } - control->menu(menu_control); - for ( int i = 0; menu_texture_filtering[i].text != 0; ++i ) { menu_texture_filtering[i].text = _( menu_texture_filtering[i].text ); diff -Nru fgrun-3.0.0/src/CMakeLists.txt fgrun-3.1.0~704+gitb31c717/src/CMakeLists.txt --- fgrun-3.0.0/src/CMakeLists.txt 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/src/CMakeLists.txt 2014-06-22 14:11:36.000000000 +0000 @@ -72,6 +72,7 @@ ${INTL_LIBRARY} ${OPENPTY_LIBRARY} ${PLATFORM_LIBS} + ${OPENGL_LIBRARIES} ) install(TARGETS fgrun RUNTIME DESTINATION bin) diff -Nru fgrun-3.0.0/src/fgfsrc.cxx fgrun-3.1.0~704+gitb31c717/src/fgfsrc.cxx --- fgrun-3.0.0/src/fgfsrc.cxx 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/src/fgfsrc.cxx 2014-06-22 14:11:36.000000000 +0000 @@ -110,8 +110,6 @@ if (prefs.get( "parkpos", buf, "", buflen-1 ) && buf[0] != 0) os << pfx << "--parkpos=" << buf; - if (prefs.get( "control", buf, "", buflen-1 )) - os << pfx << "--control=" << buf; if (prefs.get( "lang", buf, "", buflen-1 ) && buf[0] != 0) os << pfx << "--language=" << buf; if (prefs.get( "browser", buf, "", buflen-1 ) && buf[0] != 0) diff -Nru fgrun-3.0.0/src/main.cxx fgrun-3.1.0~704+gitb31c717/src/main.cxx --- fgrun-3.0.0/src/main.cxx 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/src/main.cxx 2014-06-22 14:11:36.000000000 +0000 @@ -42,7 +42,8 @@ std::string def_fg_scenery = ""; std::string def_ts_exe = ""; std::string version = ""; -int def_ts_dir = -1; +std::string def_ts_dir = ""; +std::string def_acft_dir = ""; static bool silent = false; static bool fullscreen = false; @@ -88,18 +89,18 @@ ++i; return 1; } - else if (strncmp( argv[i], "--ts-exe=", 9 ) == 0) + else if (strncmp( argv[i], "--terrasync-dir=", 16 ) == 0) { - def_ts_exe.assign( &argv[i][9] ); + def_ts_dir.assign( &argv[i][16] ); ++i; return 1; } - else if (strncmp( argv[i], "--ts-dir=", 9 ) == 0) + else if (strncmp( argv[i], "--fg-aircraft=", 14 ) == 0) { - def_ts_dir = atoi( &argv[i][9] ); + def_acft_dir.assign( &argv[i][14] ); ++i; return 1; - } + } else if (strncmp( argv[i], "--version=", 10 ) == 0) { version.assign( &argv[i][10] ); @@ -159,7 +160,7 @@ int i = 0; if (Fl::args( argc, argv, i, parse_args ) < argc) { - Fl::fatal(_("Options are:\n --silent\n --fg-exe=\n --fg-root=\n --fg-scenery=\n --ts-exe=\n --ts-dir=#\n --version=\n -f, --fullscreen\n%s"), Fl::help ); + Fl::fatal(_("Options are:\n --silent\n --fg-exe=\n --fg-root=\n --fg-scenery=\n --terrasync-dir=\n --fg-aircraft=\n --version=\n -f, --fullscreen\n%s"), Fl::help ); } if ( silent ) @@ -186,20 +187,20 @@ fl_filename_absolute( abs_name, def_fg_scenery.c_str() ); prefs.set( "fg_scenery_init", abs_name ); prefs.set( "fg_scenery", abs_name ); - prefs.set( "ts_dir", 0 ); } - if ( !def_ts_exe.empty() ) + if ( !def_ts_dir.empty() ) { - fl_filename_absolute( abs_name, def_ts_exe.c_str() ); - prefs.set( "ts_exe_init", abs_name ); - prefs.set( "ts_exe", abs_name ); - } - - if ( def_ts_dir != -1 ) - { - prefs.set( "ts_dir_init", def_ts_dir ); - prefs.set( "ts_dir", def_ts_dir ); + fl_filename_absolute( abs_name, def_ts_dir.c_str() ); + prefs.set( "ts_dir_init", abs_name ); + prefs.set( "ts_dir", abs_name ); + } + + if ( !def_acft_dir.empty() ) + { + fl_filename_absolute( abs_name, def_acft_dir.c_str() ); + prefs.set( "fg_aircraft_init", abs_name ); + prefs.set( "fg_aircraft", abs_name ); } if ( !version.empty() ) @@ -212,7 +213,6 @@ prefs.set("version", major * 10000 + minor * 100 + patch); } } - return 0; } diff -Nru fgrun-3.0.0/src/settings.cxx fgrun-3.1.0~704+gitb31c717/src/settings.cxx --- fgrun-3.0.0/src/settings.cxx 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/src/settings.cxx 2014-06-22 14:11:36.000000000 +0000 @@ -73,7 +73,6 @@ { prefs.set( "ts_dir", ts_dir->value()); prefs.set( "browser", browser->value() ); - prefs.set( "control", (const char *)control->mvalue()->user_data() ); prefs.set( "lang", lang->value()); prefs.set( "config", config->value() ); @@ -293,9 +292,6 @@ prefs.get( "lang", buf, "", buflen-1 ); lang->value( buf ); - prefs.get( "control", buf, "joystick", buflen-1 ); - set_choice( control, buf ); - // #if defined(WIN32) // prefs.get("browser", buf, "webrun.bat", buflen-1); // #else @@ -654,7 +650,6 @@ { prefs.deleteEntry( "ts_dir" ); prefs.deleteEntry( "browser" ); - prefs.deleteEntry( "control" ); prefs.deleteEntry( "lang" ); prefs.deleteEntry( "config" ); diff -Nru fgrun-3.0.0/src/wizard_funcs.cxx fgrun-3.1.0~704+gitb31c717/src/wizard_funcs.cxx --- fgrun-3.0.0/src/wizard_funcs.cxx 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/src/wizard_funcs.cxx 2014-06-22 14:11:36.000000000 +0000 @@ -77,6 +77,8 @@ extern string def_fg_exe; extern string def_fg_root; extern string def_fg_scenery; +extern string def_acft_dir; +extern string def_ts_dir; Fl_Menu_Item Wizard::menu_time_of_day_value[] = { {N_("dawn"), 0, 0, (void*)"dawn", 0, FL_NORMAL_LABEL, 0, 14, 0}, @@ -268,6 +270,23 @@ } fg_exe_->value( buf ); + string fg_aircraft; + if (reloadPath || !prefs.get( "fg_aircraft", buf, def_acft_dir.c_str(), buflen-1)) + { + systemPrefs.get( "fg_aircraft_init", buf, def_acft_dir.c_str(), buflen-1); + prefs.set("fg_aircraft_init", buf); + systemPrefs.get( "fg_aircraft", buf, def_acft_dir.c_str(), buflen-1); + prefs.set("fg_aircraft", buf); + } + + if (reloadPath || !prefs.get( "ts_dir", buf, def_ts_dir.c_str(), buflen-1)) + { + systemPrefs.get( "ts_dir_init", buf, def_ts_dir.c_str(), buflen-1); + prefs.set("ts_dir_init", buf); + systemPrefs.get( "ts_dir", buf, def_ts_dir.c_str(), buflen-1); + prefs.set("ts_dir", buf); + } + if (reloadPath || !prefs.get( "fg_root", buf, def_fg_root.c_str(), buflen-1)) { systemPrefs.get( "fg_root_init", buf, def_fg_root.c_str(), buflen-1); @@ -290,7 +309,6 @@ simgear::ResourceManager::instance()->addBasePath(fgPath); - string fg_aircraft; if (prefs.get( "fg_aircraft", buf, "", buflen-1)) { fg_aircraft = buf; diff -Nru fgrun-3.0.0/version fgrun-3.1.0~704+gitb31c717/version --- fgrun-3.0.0/version 2014-02-05 21:50:13.000000000 +0000 +++ fgrun-3.1.0~704+gitb31c717/version 2014-06-22 14:11:36.000000000 +0000 @@ -1 +1 @@ -3.0.0 +3.1.0