[pkg-fgfs-crew] flightgear 3.4."1"
Rebecca N. Palmer
rebecca_palmer at zoho.com
Sat Apr 11 21:03:45 UTC 2015
Given the lack of a new time estimate from upstream, and our need to do
something before Ubuntu releases with an insecure version, here's a
forward-patched-from-.0 set that should be functionally identical to the
proposed .1, and appears to work in Ubuntu.
(simgear is numbered 3.4.0-1 rather than 3.4.0-0~exp2 because it needs
to sort after the 3.4.0ubuntu1 that was used for the last one)
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 302afeb..0d60f1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,16 @@
flightgear (3.4.0-0~exp2) UNRELEASED; urgency=high
+ [ Markus Wanner ]
* Drop the deprecated JPEG_FACTORY option for cmake.
* Rebase on 3.0.0-5, effectively adding patch 6a30e70.patch.
- * Set ENABLE_QT=ON and add a B-D on qtbase5-dev to build the
- flightgear launcher. Change flightgear.desktop to use that
- launcher, rather than starting fgfs with default settings.
* Tighten B-D on sqlite3 and htsengine. Versions before the given
ones are known to not work.
+ [ Rebecca N. Palmer ]
+ * Update 6a30e70.patch to also disallow /tmp/*.xml. Closes: #780867.
+ * Add crashfix.patch from upstream.
+ * Add spelling.patch.
+
-- Markus Wanner <markus at bluegap.ch> Wed, 18 Mar 2015 11:52:01 +0100
flightgear (3.4.0-0~exp1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 54ce716..4996548 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9.20120417), libx11-dev, libxext-dev,
libjpeg-dev,
libpng12-dev | libpng3-dev | libpng-dev,
libopenscenegraph-dev (>= 3.2.0~),
- libsimgear-dev (>= 3.4.0~), libsimgear-dev (<= 3.4.99),
+ libsimgear-dev (>> 3.4.0-0ubuntu1), libsimgear-dev (<= 3.4.99),
libsqlite3-dev (>= 3.7.14~),
libudev-dev [linux-any],
libusbhid-dev [kfreebsd-any],
@@ -23,8 +23,7 @@ Build-Depends: debhelper (>= 9.20120417), libx11-dev, libxext-dev,
libspeex-dev,
libspeexdsp-dev,
flite1-dev,
- libhtsengine-dev (>= 1.07~),
- qtbase5-dev
+ libhtsengine-dev (>= 1.07~)
Standards-Version: 3.9.6
Homepage: http://www.flightgear.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flightgear.git
diff --git a/debian/copyright b/debian/copyright
index 9a4eae4..86400bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -237,9 +237,15 @@ Files: 3rdparty/cjson/*
Copyright: 2009 Dave Gamble
License: MIT
-Files: 3rdparty/sqlite/*
+Files: 3rdparty/sqlite3/*
Copyright: *No copyright*
-License: Public-domain
+License: public-domain
+ The author disclaims copyright to this source code. In place of
+ a legal notice, here is a blessing:
+ .
+ May you do good and not evil.
+ May you find forgiveness for yourself and forgive others.
+ May you share freely, never taking more than you give.
Files: debian/*
Copyright: 1997-1999 Joey Hess
diff --git a/debian/flightgear.desktop b/debian/flightgear.desktop
index e2a5d1a..6b0862f 100644
--- a/debian/flightgear.desktop
+++ b/debian/flightgear.desktop
@@ -3,7 +3,7 @@ Type=Application
Version=1.4
Name=FlightGear
GenericName=Flight Simulator
-Exec=fgfs --launcher
+Exec=fgfs
Terminal=false
Categories=Game;Simulation
Comment=open-source flight simulator
diff --git a/debian/patches/6a30e7.patch b/debian/patches/6a30e7.patch
index 2ed968a..874d88f 100644
--- a/debian/patches/6a30e7.patch
+++ b/debian/patches/6a30e7.patch
@@ -1,11 +1,15 @@
Description: Restrict file access for Nasal scripts.
- Stop using property listener for fgValidatePath
- .
- This was insecure: while removelistener() won't remove it, there are
- other ways to remove a listener from Nasal
+
+Stop using property listener for fgValidatePath (#780712)
+
+This was insecure: while removelistener() won't remove it, there are
+other ways to remove a listener from Nasal
+
+Also, disallow FG_SCENERY (#780716) and /tmp (#780867)
+
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-Last-Update: 13-03-2015
-Origin: http://sourceforge.net/p/flightgear/flightgear/ci/6a30e7086ea2f1a060dd77dab6e7e8a15b43e82d
+Bug-Debian: https://bugs.debian.org/780712 https://bugs.debian.org/780716 https://bugs.debian.org/780867
+Origin: http://sourceforge.net/p/flightgear/flightgear/ci/6a30e7086ea2f1a060dd77dab6e7e8a15b43e82d http://sourceforge.net/p/flightgear/flightgear/ci/51bfdc21e0b4528797697d32664eacb15d297449
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -17,7 +21,7 @@ Origin: http://sourceforge.net/p/flightgear/flightgear/ci/6a30e7086ea2f1a060dd77
#include "fg_io.hxx"
#include "fg_props.hxx"
#include "globals.hxx"
-@@ -71,32 +72,142 @@
+@@ -71,32 +72,141 @@
return current;
}
@@ -71,7 +75,6 @@ Origin: http://sourceforge.net/p/flightgear/flightgear/ci/6a30e7086ea2f1a060dd77
+ exit(-1);
+ }
+ }
-+ write_allowed_paths.push_back("/tmp/*.xml");
+ write_allowed_paths.push_back(globals->get_fg_home() + "/*.sav");
+ write_allowed_paths.push_back(globals->get_fg_home() + "/*.log");
+ write_allowed_paths.push_back(globals->get_fg_home() + "/cache/*");
diff --git a/debian/patches/crashfix.patch b/debian/patches/crashfix.patch
new file mode 100644
index 0000000..0e88717
--- /dev/null
+++ b/debian/patches/crashfix.patch
@@ -0,0 +1,18 @@
+Description: Guard against a crash Torsten encountered once.
+
+Origin: upstream 8c867d2472d2a2f7ee042ca4b7cd8db26eb73176
+Author: James Turner
+
+diff --git a/src/GUI/QtLauncher.cxx b/src/GUI/QtLauncher.cxx
+index 8159391..e17577e 100644
+--- a/src/GUI/QtLauncher.cxx
++++ b/src/GUI/QtLauncher.cxx
+@@ -827,7 +827,7 @@ void QtLauncher::onRun()
+
+ if (m_ui->runwayRadio->isChecked()) {
+ int index = m_ui->runwayCombo->currentData().toInt();
+- if (index >= 0) {
++ if ((index >= 0) && m_selectedAirport) {
+ // explicit runway choice
+ opt->addOption("runway", m_selectedAirport->getRunwayByIndex(index)->ident());
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 9208392..0e1ff69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
6a30e7.patch
+crashfix.patch
+spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..166a188
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,68 @@
+Description: Fix spelling
+
+Author: Rebecca Palmer <rebecca_palmer at zoho.com>
+Origin: lintian
+Forwarded: http://sourceforge.net/p/flightgear/flightgear/ci/659c5b9676a0c11b169926c09014bea547a6ee93/
+
+--- flightgear-3.4.1.orig/src/Instrumentation/KLN89/kln89.hxx
++++ flightgear-3.4.1/src/Instrumentation/KLN89/kln89.hxx
+@@ -226,7 +226,7 @@ private:
+ // Apt, VOR and SUA drawing can be suspended by setting draw_avs to false, without affecting the stored drawing preference state.
+ void DrawMap(bool draw_avs = true);
+
+- // Set whether the display should be draw pixelated (more primatives, but might be closer to real-life)
++ // Set whether the display should be drawn pixelated (more primitives, but might be closer to real-life)
+ // or not (in which case it is assumed that pixels are square and can be merged into quads).
+ bool _pixelated;
+
+@@ -251,7 +251,7 @@ private:
+
+ // The currently active page
+ KLN89Page* _activePage;
+- // And a facility to save the immediately preceeding active page
++ // And a facility to save the immediately preceding active page
+ KLN89Page* _lastActivePage;
+
+ // Ugly hack. Housekeeping to allow us to temporarily display one page, while remembering which
+--- flightgear-3.4.1.orig/src/Main/options.cxx
++++ flightgear-3.4.1/src/Main/options.cxx
+@@ -1821,7 +1821,7 @@ public:
+ }
+
+ /**
+- * given a current iterator into the values, find the preceeding group marker,
++ * given a current iterator into the values, find the preceding group marker,
+ * or return the beginning of the value vector.
+ */
+ OptionValueVec::const_iterator rfindGroup(OptionValueVec::const_iterator pos) const
+--- flightgear-3.4.1.orig/src/Navaids/routePath.cxx
++++ flightgear-3.4.1/src/Navaids/routePath.cxx
+@@ -701,7 +701,7 @@ public:
+ }
+
+ if (index == 0) {
+- SG_LOG(SG_NAVAID, SG_WARN, "findPreceedingKnownAltitude: no preceeding altitude value found");
++ SG_LOG(SG_NAVAID, SG_WARN, "findPreceedingKnownAltitude: no preceding altitude value found");
+ return -1;
+ }
+
+--- flightgear-3.4.1.orig/utils/fgcom/fgcom.cxx
++++ flightgear-3.4.1/utils/fgcom/fgcom.cxx
+@@ -288,7 +288,7 @@ std::multimap<int, Airport> getAirportsD
+ {
+ std::vector<std::string> lines;
+ std::multimap<int, Airport> aptData;
+- SG_LOG(SG_GENERAL, SG_INFO, "Loading aiports informations...");
++ SG_LOG(SG_GENERAL, SG_INFO, "Loading airports information...");
+
+ for(size_t i=0; i < sizeof(_positionsData)/sizeof(*_positionsData); i++) { // _positionsData is provided by positions.hxx
+ std::vector<std::string> entries = simgear::strutils::split(_positionsData[i], ",");
+@@ -425,7 +425,7 @@ int usage()
+ std::cout << " --version - Show version" << std::endl;
+ std::cout << "" << std::endl;
+ std::cout << " None of these options are required, you can simply start FGCom without option at all: it works" << std::endl;
+- std::cout << " For further informations, please visit: http://wiki.flightgear.org/FGCom_3.0" << std::endl;
++ std::cout << " For further information, please visit: http://wiki.flightgear.org/FGCom_3.0" << std::endl;
+ std::cout << "" << std::endl;
+ std::cout << " About silence-threshold:" << std::endl;
+ std::cout << " This is the limit, in dB, when FGCom consider no voice in your microphone." << std::endl;
diff --git a/debian/rules b/debian/rules
index 9e974fc..1f6684e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,6 @@ CMAKE_FLAGS = \
-DENABLE_FGADMIN=OFF \
-DENABLE_LARCSIM=ON \
-DENABLE_UIUC_MODEL=ON \
- -DENABLE_QT=ON \
-DSP_FDMS=ON \
-DSYSTEM_SQLITE=ON
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 902f410..05e1306 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+flightgear-data (3.4.0+dfsg-0~exp2) UNRELEASED; urgency=medium
+
+ [ Rebecca N. Palmer ]
+ * Add f14fix.diff from upstream.
+ * Remove FG_SCENERY/* and /tmp/*.xml from allowed Nasal paths.
+ Closes: #780716.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 18 Feb 2015 22:59:19 +0100
+
flightgear-data (3.4.0+dfsg-0~exp1) experimental; urgency=medium
[ Florent Rougon ]
diff --git a/debian/patches/f14fix.diff b/debian/patches/f14fix.diff
new file mode 100644
index 0000000..2f3a5e2
--- /dev/null
+++ b/debian/patches/f14fix.diff
@@ -0,0 +1,166 @@
+Description: F14-B : Use correct property for scene illumination
+
+otherwise we get black contrails for MP aircraft.
+
+Origin: upstream d23c88c76151243141223f01f88adf8479582ae7
+Author: Richard Harrison
+
+diff --git a/Aircraft/f-14b/Models/Fx/contrail1.xml b/Aircraft/f-14b/Models/Fx/contrail1.xml
+index d6bae46..3bc4ad8 100644
+--- a/Aircraft/f-14b/Models/Fx/contrail1.xml
++++ b/Aircraft/f-14b/Models/Fx/contrail1.xml
+@@ -62,9 +62,9 @@
+ <particle>
+ <start>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.2 </value></alpha>
+ </color>
+ <size>
+@@ -74,9 +74,9 @@
+
+ <end>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.6 </value></alpha>
+ </color>
+ <size>
+diff --git a/Aircraft/f-14b/Models/Fx/contrail2.xml b/Aircraft/f-14b/Models/Fx/contrail2.xml
+index 8a4665b..f8f39cf 100644
+--- a/Aircraft/f-14b/Models/Fx/contrail2.xml
++++ b/Aircraft/f-14b/Models/Fx/contrail2.xml
+@@ -62,9 +62,9 @@
+ <particle>
+ <start>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.2 </value></alpha>
+ </color>
+ <size>
+@@ -74,9 +74,9 @@
+
+ <end>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.6 </value></alpha>
+ </color>
+ <size>
+diff --git a/Aircraft/f-14b/Models/Fx/smoke-generator.xml b/Aircraft/f-14b/Models/Fx/smoke-generator.xml
+index d5077b2..7674993 100644
+--- a/Aircraft/f-14b/Models/Fx/smoke-generator.xml
++++ b/Aircraft/f-14b/Models/Fx/smoke-generator.xml
+@@ -50,9 +50,9 @@ based on standard my wingtip contrail: rjh at zaretto.com
+ <particle>
+ <start>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.6 </value></alpha>
+ </color>
+ <size>
+@@ -62,9 +62,9 @@ based on standard my wingtip contrail: rjh at zaretto.com
+
+ <end>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.00000001</value></alpha>
+ </color>
+ <size>
+diff --git a/Aircraft/f-14b/Models/Fx/smoke-trail.xml b/Aircraft/f-14b/Models/Fx/smoke-trail.xml
+index 4fff354..ded9b83 100644
+--- a/Aircraft/f-14b/Models/Fx/smoke-trail.xml
++++ b/Aircraft/f-14b/Models/Fx/smoke-trail.xml
+@@ -3,7 +3,7 @@ based on standard my wingtip contrail: rjh at zaretto.com
+ -->
+ <PropertyList>
+ <particlesystem>
+- <name>wingroot-smoke</name>
++ <name>Smoke Generator</name>
+ <texture>vapour.png</texture>
+
+ <emissive type="bool">false</emissive>
+@@ -50,9 +50,9 @@ based on standard my wingtip contrail: rjh at zaretto.com
+ <particle>
+ <start>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.6 </value></alpha>
+ </color>
+ <size>
+@@ -62,9 +62,9 @@ based on standard my wingtip contrail: rjh at zaretto.com
+
+ <end>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.00000001</value></alpha>
+ </color>
+ <size>
+diff --git a/Aircraft/f-14b/Models/Fx/vapour.xml b/Aircraft/f-14b/Models/Fx/vapour.xml
+index cfde110..243a91a 100644
+--- a/Aircraft/f-14b/Models/Fx/vapour.xml
++++ b/Aircraft/f-14b/Models/Fx/vapour.xml
+@@ -79,9 +79,9 @@ based on standard FG wingtip contrail example; but modified condition params
+ <particle>
+ <start>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.5 </value></alpha>
+ </color>
+ <size>
+@@ -91,9 +91,9 @@ based on standard FG wingtip contrail example; but modified condition params
+
+ <end>
+ <color>
+- <red><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></red>
+- <green><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></green>
+- <blue><expression><product><value>1.0</value><property>rendering/scene/diffuse/red</property></product></expression></blue>
++ <red><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></red>
++ <green><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></green>
++ <blue><expression><product><value>1.0</value><property>/rendering/scene/diffuse/red</property></product></expression></blue>
+ <alpha><value> 0.1 </value></alpha>
+ </color>
+ <size>
diff --git a/debian/patches/restrict-nasal-paths.diff b/debian/patches/restrict-nasal-paths.diff
new file mode 100644
index 0000000..05770fa
--- /dev/null
+++ b/debian/patches/restrict-nasal-paths.diff
@@ -0,0 +1,18 @@
+Description: Remove FG_SCENERY/* and /tmp/*.xml from allowed paths list
+
+Author: Rebecca Palmer <rebecca_palmer at zoho.com>
+Bug-Debian: https://bugs.debian.org/780716 https://bugs.debian.org/780867
+Forwarded: not-needed
+
+--- a/Nasal/IOrules
++++ b/Nasal/IOrules
+@@ -28,9 +28,7 @@
+ READ ALLOW $FG_ROOT/*
+ READ ALLOW $FG_HOME/*
+ READ ALLOW $FG_AIRCRAFT/*
+-READ ALLOW $FG_SCENERY/*
+
+-WRITE ALLOW /tmp/*.xml
+ WRITE ALLOW $FG_HOME/*.sav
+ WRITE ALLOW $FG_HOME/*.log
+ WRITE ALLOW $FG_HOME/cache/*
diff --git a/debian/patches/series b/debian/patches/series
index b6b3e18..7f993e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
use-system-jslibs.diff
+f14fix.diff
+restrict-nasal-paths.diff
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index c8c03ce..056931e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
+simgear (3.4.0-1) UNRELEASED; urgency=medium
+
+ [ Markus Wanner ]
+ * Drop the deprecated JPEG_FACTORY cmake option and correctly
+ provide SIMGEAR_SHARED (w/o the CMAKE_ prefix).
+
+ [ Rebecca N. Palmer ]
+ * Add vasi.patch from upstream.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 18 Feb 2015 20:11:41 +0100
+
simgear (3.4.0-0~exp1) UNRELEASED; urgency=medium
+ [ Markus Wanner ]
* New upstream release 3.4.0.
* Update debian/watch.
- * Drop the deprecated JPEG_FACTORY cmake option and correctly
- provide SIMGEAR_SHARED (w/o the CMAKE_ prefix).
-- Markus Wanner <markus at bluegap.ch> Wed, 18 Feb 2015 20:11:41 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 99ba430..55fd7e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ md5_endianness.patch
naref_endianness.patch
kfreebsd.patch
use_debian_utfcpp.patch
+vasi.patch
diff --git a/debian/patches/vasi.patch b/debian/patches/vasi.patch
new file mode 100644
index 0000000..1d81d47
--- /dev/null
+++ b/debian/patches/vasi.patch
@@ -0,0 +1,25 @@
+Description: Fix VASI/PAPI so they are generated.
+
+Origin: upstream 39e22c116b127645cd5c182d36f8abaa4a4d1dfd
+Author: Stuart Buchanan
+
+diff --git a/simgear/scene/tgdb/SGTileDetailsCallback.hxx b/simgear/scene/tgdb/SGTileDetailsCallback.hxx
+index d7ffb5b..44c7f86 100644
+--- a/simgear/scene/tgdb/SGTileDetailsCallback.hxx
++++ b/simgear/scene/tgdb/SGTileDetailsCallback.hxx
+@@ -871,7 +871,7 @@ public:
+ lightGroup->addChild(groundLights2);
+ }
+
+- if (vasiLights.empty()) {
++ if (! vasiLights.empty()) {
+ EffectGeode* vasiGeode = new EffectGeode;
+ Effect* vasiEffect = getLightEffect(24, osg::Vec3(1, 0.0001, 0.000001), 1, 24, true, _options);
+ vasiGeode->setEffect(vasiEffect);
+@@ -1137,4 +1137,4 @@ public:
+ SGDirectionalLightListBin holdshortLights;
+ SGDirectionalLightListBin guardLights;
+ SGDirectionalLightListBin reilLights;
+-};
+\ No newline at end of file
++};
More information about the pkg-fgfs-crew
mailing list