[pkg-fgfs-crew] [flightgear] 01/01: Adapt to the 3.0.0 pre-release.

Markus Wanner markus_wanner-guest at moszumanska.debian.org
Wed Jan 22 22:26:25 UTC 2014


This is an automated email from the git hooks/post-receive script.

markus_wanner-guest pushed a commit to branch master
in repository flightgear.

commit 1752c5670d019b1590553439254e9d5467ffc4fc
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Jan 22 23:25:41 2014 +0100

    Adapt to the 3.0.0 pre-release.
    
    * Drop all patches, they all made it upstream.
    * Adjust simgear dependencies.
---
 debian/changelog                           |   7 +-
 debian/control                             |   4 +-
 debian/patches/screensaver-control.diff    | 217 -----------------------------
 debian/patches/series                      |   4 -
 debian/patches/terrasync-directory.diff    |  25 ----
 debian/patches/terrasync-fix-rounding.diff |  17 ---
 debian/patches/update-manpage.diff         |  52 -------
 7 files changed, 5 insertions(+), 321 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a5290d..e2f6cc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
-flightgear (2.12.1-1) UNRELEASED; urgency=low
+flightgear (3.0.0~git201401+2c6d4e-1) UNRELEASED; urgency=low
 
   [ Markus Wanner ]
   * Adjust B-D to allow building on kfreebsd-*. Closes: #724686.
-  * Add patch update-manpage.diff featuring some corrections for the fgfs
-    manpage. Closes: #556362.
+  * Upstream corrected the fgfs manpage. Closes: #556362.
   * Drop unnecessary man page for gl-info. Closes: #698308.
   * Drop README.Linux: it's outdated to the point of uselessness.
     Closes: #574173.
@@ -17,7 +16,7 @@ flightgear (2.12.1-1) UNRELEASED; urgency=low
     but better than nothing).
   * Disable screensaver while running. Closes: LP#793599.
   * Remove outdated README.Debian.
-  * Fix Terrasync rounding error.
+  * Terrasync now works after just ticking the box. Closes: #252899.
   * Always set Terrasync directory.
 
  -- Markus Wanner <markus at bluegap.ch>  Tue, 21 Jan 2014 22:31:02 +0100
diff --git a/debian/control b/debian/control
index a519f3b..bad11a0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9.20120417), libx11-dev, libxext-dev,
  libjpeg8-dev | libjpeg62-dev | libjpeg-dev,
  libpng12-dev | libpng3-dev | libpng-dev,
  libopenscenegraph-dev (>> 3.0.0),
- libsimgear-dev (>= 2.12.0~),
+ libsimgear-dev (>= 3.0.0~),
  libsqlite3-dev,
  libudev-dev [linux-any],
  libusbhid-dev [kfreebsd-any],
@@ -26,7 +26,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/flightgear.git
 
 Package: flightgear
 Architecture: any
-Depends: flightgear-data-all (>= 2.12.1~), ${shlibs:Depends},
+Depends: flightgear-data-all (>= 3.0.0~), ${shlibs:Depends},
  ${misc:Depends}
 Description: Flight Gear Flight Simulator
  FlightGear Flight Simulator (often shortened to FlightGear or FGFS)
diff --git a/debian/patches/screensaver-control.diff b/debian/patches/screensaver-control.diff
deleted file mode 100644
index 646d554..0000000
--- a/debian/patches/screensaver-control.diff
+++ /dev/null
@@ -1,217 +0,0 @@
-Description: Disable idle detection while running
-Bug-Ubuntu: https://launchpad.net/bugs/793599
-Author: Rebecca Palmer
-Forwarded: https://gitorious.org/fg/flightgear/merge_requests/1576
-
-As neither GNOME's nor KDE's screen locker monitors the joystick,
-they may blank/lock the screen while FlightGear is in use.
-This uses their DBus interface to turn them off.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3806ea0..f3540fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,6 +110,7 @@ IF(APPLE)
-     list(APPEND PLATFORM_LIBS ${COCOA_LIBRARY} ${CORESERVICES_LIBRARY})
- 
- elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-+    set(USE_DBUS_DEFAULT 1)
-     find_package(UDev)
- 
-     if(UDEV_FOUND)
-@@ -141,6 +142,7 @@ option(ENABLE_RTI
- option(ENABLE_PROFILE    "Set to ON to build FlightGear with gperftools profiling support" OFF)
- option(JPEG_FACTORY      "Set to ON to build FlightGear with JPEG-factory support" OFF)
- option(SYSTEM_SQLITE     "Set to ON to build FlightGear with the system's SQLite3 library" OFF)
-+option(USE_DBUS          "Set to ON to build FlightGear with DBus screensaver interaction (default on Linux)" ${USE_DBUS_DEFAULT})
- 
- # additional utilities
- option(ENABLE_FGADMIN    "Set to ON to build the FGADMIN application (default)" ON)
-@@ -242,6 +244,23 @@ endif (SYSTEM_SQLITE)
- # Sqlite always depends on the threading lib
- list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
- 
-+## DBus setup
-+
-+if (USE_DBUS)
-+    include(FindPkgConfig)
-+    if (PKG_CONFIG_FOUND)
-+        pkg_check_modules(DBUS dbus-1)
-+    endif (PKG_CONFIG_FOUND) #if we don't have pkg-config, assume we don't have libdbus-1-dev either http://packages.debian.org/sid/libdbus-1-dev
-+    if (DBUS_FOUND)
-+        set(HAVE_DBUS 1)
-+        message(STATUS "Using DBus")
-+        include_directories( ${DBUS_INCLUDE_DIRS})
-+    else()
-+        message(STATUS "DBus not found, screensaver control disabled")
-+    endif (DBUS_FOUND)
-+else()
-+endif (USE_DBUS)
-+
- find_package(PLIB REQUIRED puaux pu js fnt)
- 
- if (EMBEDDED_SIMGEAR)
-diff --git a/src/Include/config_cmake.h.in b/src/Include/config_cmake.h.in
-index 7f3ee6a..1485016 100644
---- a/src/Include/config_cmake.h.in
-+++ b/src/Include/config_cmake.h.in
-@@ -40,3 +40,5 @@
- #cmakedefine FG_JPEG_SERVER
- 
- #cmakedefine SYSTEM_SQLITE
-+
-+#cmakedefine HAVE_DBUS
-diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
-index aeade6a..9167ec9 100644
---- a/src/Main/CMakeLists.txt
-+++ b/src/Main/CMakeLists.txt
-@@ -23,6 +23,7 @@ set(SOURCES
- 	util.cxx
-     positioninit.cxx
-     subsystemFactory.cxx
-+    screensaver_control.cxx
- 	${RESOURCE_FILE}
- 	)
- 
-@@ -40,6 +41,7 @@ set(HEADERS
- 	util.hxx
-     positioninit.hxx
-     subsystemFactory.hxx
-+    screensaver_control.hxx
- 	)
- 
- get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
-@@ -92,6 +94,9 @@ endif()
-     target_link_libraries(fgfs JSBSim)
- endif()
- 
-+if(USE_DBUS)
-+    target_link_libraries(fgfs ${DBUS_LIBRARIES})
-+endif()
- if(FG_HAVE_GPERFTOOLS)
-     include_directories(${GooglePerfTools_INCLUDE_DIR})
-     target_link_libraries(fgfs ${GooglePerfTools_LIBRARIES})
-diff --git a/src/Main/main.cxx b/src/Main/main.cxx
-index f64e0d3..40af6e2 100644
---- a/src/Main/main.cxx
-+++ b/src/Main/main.cxx
-@@ -65,6 +65,7 @@
- #include "fg_os.hxx"
- #include "fg_props.hxx"
- #include "positioninit.hxx"
-+#include "screensaver_control.hxx"
- #include "subsystemFactory.hxx"
- 
- using namespace flightgear;
-@@ -365,6 +366,9 @@ int fgMainInit( int argc, char **argv ) {
-     
-     fgOutputSettings();
-     
-+    //try to disable the screensaver
-+    fgOSDisableScreensaver();
-+    
-     // pass control off to the master event handler
-     int result = fgOSMainLoop();
-     
-diff --git a/src/Main/screensaver_control.cxx b/src/Main/screensaver_control.cxx
-new file mode 100644
-index 0000000..0af20eb
---- /dev/null
-+++ b/src/Main/screensaver_control.cxx
-@@ -0,0 +1,66 @@
-+// screensaver_control.cxx -- disable the screensaver
-+//
-+// Written by Rebecca Palmer, December 2013.
-+//
-+// Copyright (C) 2013 Rebecca Palmer
-+//
-+// 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, or (at your option) any later version.
-+//
-+// 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
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+//
-+// $Id$
-+
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+#ifdef HAVE_DBUS
-+#include <dbus/dbus.h>//Uses the low-level libdbus rather than GDBus/QtDBus to avoid adding more dependencies than necessary.  http://dbus.freedesktop.org/doc/api/html/index.html
-+#endif
-+/** Attempt to disable the screensaver.
-+* 
-+* Screensavers/powersavers often do not monitor the joystick, and it is hence advisable to disable them while FlightGear is running.
-+* This function always exists, but currently only actually does anything on Linux, where it will disable gnome-screensaver/kscreensaver until FlightGear exits.
-+*
-+* The following might be useful to anyone wishing to add Windows support:
-+* http://msdn.microsoft.com/en-us/library/windows/desktop/aa373233%28v=vs.85%29.aspx
-+* http://msdn.microsoft.com/en-us/library/windows/desktop/aa373208%28v=vs.85%29.aspx (While this documentation says it only disables powersave, it is elsewhere reported to also disable screensaver)
-+* http://msdn.microsoft.com/en-us/library/windows/desktop/dd405534%28v=vs.85%29.aspx
-+*/
-+void fgOSDisableScreensaver()
-+{
-+#ifdef HAVE_DBUS
-+    DBusConnection *dbus_connection;
-+    DBusMessage *dbus_inhibit_screenlock;
-+    unsigned int window_id=1000;//fake-it doesn't seem to care
-+    unsigned int inhibit_idle=8;//8=idle inhibit flag
-+    const char *app_name="org.flightgear";
-+    const char *inhibit_reason="Uses joystick input";
-+    
-+    dbus_connection=dbus_bus_get(DBUS_BUS_SESSION,NULL);
-+    dbus_connection_set_exit_on_disconnect(dbus_connection,FALSE);//Don't close us if we lose the DBus connection
-+    
-+    //Two possible interfaces; we send on both, as that is easier than trying to determine which will work
-+    //GNOME: https://people.gnome.org/~mccann/gnome-session/docs/gnome-session.html
-+    dbus_inhibit_screenlock=dbus_message_new_method_call("org.gnome.SessionManager","/org/gnome/SessionManager","org.gnome.SessionManager","Inhibit");
-+    dbus_message_append_args(dbus_inhibit_screenlock,DBUS_TYPE_STRING,&app_name,DBUS_TYPE_UINT32,&window_id,DBUS_TYPE_STRING,&inhibit_reason,DBUS_TYPE_UINT32,&inhibit_idle,DBUS_TYPE_INVALID);
-+    dbus_connection_send(dbus_connection,dbus_inhibit_screenlock,NULL);
-+    
-+    //KDE, GNOME 3.6+: http://standards.freedesktop.org/idle-inhibit-spec/0.1/re01.html
-+    dbus_inhibit_screenlock=dbus_message_new_method_call("org.freedesktop.ScreenSaver","/ScreenSaver","org.freedesktop.ScreenSaver","Inhibit");
-+    dbus_message_append_args(dbus_inhibit_screenlock,DBUS_TYPE_STRING,&app_name,DBUS_TYPE_STRING,&inhibit_reason,DBUS_TYPE_INVALID);
-+    dbus_connection_send(dbus_connection,dbus_inhibit_screenlock,NULL);
-+    dbus_connection_flush(dbus_connection);
-+    //Currently ignores the reply; it would need to read it if we wanted to determine whether we've succeeded and/or allow explicitly re-enabling the screensaver
-+    //Don't disconnect, that ends the inhibition
-+#endif
-+}
-diff --git a/src/Main/screensaver_control.hxx b/src/Main/screensaver_control.hxx
-new file mode 100644
-index 0000000..5f68145
---- /dev/null
-+++ b/src/Main/screensaver_control.hxx
-@@ -0,0 +1,24 @@
-+// screensaver_control.hxx -- disable the screensaver
-+//
-+// Written by Rebecca Palmer, December 2013.
-+//
-+// Copyright (C) 2013 Rebecca Palmer
-+//
-+// 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, or (at your option) any later version.
-+//
-+// 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
-+// along with this program; if not, write to the Free Software
-+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+//
-+// $Id$
-+
-+
-+void fgOSDisableScreensaver();
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f561d4e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-update-manpage.diff
-screensaver-control.diff
-terrasync-directory.diff
-terrasync-fix-rounding.diff
diff --git a/debian/patches/terrasync-directory.diff b/debian/patches/terrasync-directory.diff
deleted file mode 100644
index 7815fdb..0000000
--- a/debian/patches/terrasync-directory.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Always set Terrasync directory
-Author: Rebecca Palmer
-Bug-Debian: http://bugs.debian.org/252899
-Forwarded: https://gitorious.org/fg/flightgear/merge_requests/52
-
-This was previously done only if Terrasync was on, but this made it impossible
-to use the GUI dialog to turn it on for the first time in a fresh install
---- flightgear-2.12.1.orig/src/Main/options.cxx
-+++ flightgear-2.12.1/src/Main/options.cxx
-@@ -2041,7 +2041,6 @@ void Options::processOptions()
-   }
-     
- // terrasync directory fixup
--  if (fgGetBool("/sim/terrasync/enabled")) {
-     string terrasyncDir = fgGetString("/sim/terrasync/scenery-dir");
-     if (terrasyncDir.empty()) {
-       SGPath p(globals->get_fg_home());
-@@ -2058,6 +2057,7 @@ void Options::processOptions()
-           dd.create(0700);
-       }
-     
-+  if (fgGetBool("/sim/terrasync/enabled")) {
-     const string_list& scenery_paths(globals->get_fg_scenery());
-     if (std::find(scenery_paths.begin(), scenery_paths.end(), terrasyncDir) == scenery_paths.end()) {
-       // terrasync dir is not in the scenery paths, add it
diff --git a/debian/patches/terrasync-fix-rounding.diff b/debian/patches/terrasync-fix-rounding.diff
deleted file mode 100644
index e7236da..0000000
--- a/debian/patches/terrasync-fix-rounding.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix Terrasync rounding error
-Author: Rebecca Palmer
-Bug-Debian: http://bugs.debian.org/252899
-Forwarded: not-needed
-
-Pass the lat/long rounded down (as used in tile names and expected by terrasync, e.g. 40.7,-90.4 -> w091n40), instead of the default rounded-towards-0 (40.7,-90.4 -> w090n40).
---- flightgear-2.12.1.orig/src/Scenery/tilemgr.cxx
-+++ flightgear-2.12.1/src/Scenery/tilemgr.cxx
-@@ -382,7 +382,7 @@ void FGTileMgr::schedule_tiles_at(const
-             scheduled_visibility = range_m;
-             schedule_needed(current_bucket, range_m);
-             if (_terra_sync)
--                _terra_sync->schedulePosition(latitude,longitude);
-+                _terra_sync->schedulePosition(floor(latitude),floor(longitude));
-         }
-         // save bucket
-         previous_bucket = current_bucket;
diff --git a/debian/patches/update-manpage.diff b/debian/patches/update-manpage.diff
deleted file mode 100644
index fef89d3..0000000
--- a/debian/patches/update-manpage.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: man page fixes
- Correct --airport option, remove no-longer-existing net-id, net-hud,
- enable/disable-network-olk options.
-From: Rebecca Palmer
-Last-Update: 2013-09-25
-
-diff -up fg-flightgear/man/fgfs.1.in_orig fg-flightgear/man/fgfs.1.in
---- fg-flightgear/man/fgfs.1.in_orig	2013-09-25 21:44:16.824838645 +0100
-+++ fg-flightgear/man/fgfs.1.in	2013-09-25 21:44:03.435537041 +0100
-@@ -43,7 +43,7 @@ Specify aircraft to load.
- Specify the aircraft model directory relative to the path of the
- executable.  This is used for UIUC aircraft only.
- .TP
--.BI "--airport-id=" "id"
-+.BI "--airport=" "id"
- Specify starting postion by airport ID.
- .TP
- .BI "--altitude=" "value"
-@@ -130,9 +130,6 @@ Disable introduction music.
- .B "--disable-mouse-pointer"
- Disable extra mouse pointer.
- .TP
--.B "--disable-network-olk"
--Disable Multi-pilot mode.
--.TP
- .B "--disable-panel"
- Disable instrument panel.
- .TP
-@@ -203,9 +200,6 @@ Enable introduction music.
- Enable extra mouse pointer (i.e. for full screen voodoo/voodoo-II
- based cards.)
- .TP
--.B "--enable-network-olk"
--Enable Multi-pilot mode.
--.TP
- .B "--enable-panel"
- Enable instrument panel.
- .TP
-@@ -334,12 +328,6 @@ radial value.
- .BI "--ndb=" "ID"
- Specify starting position relative to an NDB.
- .TP
--.B "--net-hud"
--Enable network information in the HUD.
--.TP
--.BI "--net-id=" "name"
--Specify your callsign.
--.TP
- .BI "--nmea=" "medium" "," "direction" "," "hz" "," "options" "," "..."
- Open an IO connection using the NMEA protocol.
- .TP
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear.git



More information about the pkg-fgfs-crew mailing list