The debian/patches/series mechanism won't patch DOS-line-ending files
such as Effects/model-combined-transparent.eff, so the attached manually
applies the patch in debian/rules instead.
It also downgrades -ai, -aircrafts to Recommends as suggested earlier; I
have quickly tested that FlightGear works without these, but nothing
beyond that. (This is independent of the bug fix, but if we're going to
do it, we should probably do it when we're uploading it anyway.)
diff --git a/debian/changelog b/debian/changelog
index fe90b25..b856dbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flightgear-data (3.0.0-2) UNRELEASED; urgency=medium
+
+ * Fix type mismatch crash. Closes: #766251.
+ * Downgrade -ai, -aircrafts to Recommends.
+
+ -- Rebecca N. Palmer <rebecca_pal...@zoho.com> Wed, 22 Oct 2014 18:27:01
+0100
+
flightgear-data (3.0.0-1) unstable; urgency=low
[ Markus Wanner ]
diff --git a/debian/control b/debian/control
index 817ed1d..23e0e00 100644
--- a/debian/control
+++ b/debian/control
@@ -64,10 +64,10 @@ Package: flightgear-data-all
Architecture: all
Depends:
flightgear-data-base (>= 3.0.0~),
- flightgear-data-ai (>= 3.0.0~),
- flightgear-data-aircrafts (>= 3.0.0~),
flightgear-data-models (>= 3.0.0~),
${misc:Depends}
+Recommends: flightgear-data-ai (>= 3.0.0~),
+ flightgear-data-aircrafts (>= 3.0.0~)
Description: FlightGear Flight Simulator - virtual package
FlightGear is a free and highly sophisticated flight simulator.
.
diff --git a/debian/patches/766251.patch b/debian/patches/766251.patch
new file mode 100644
index 0000000..da2d905
--- /dev/null
+++ b/debian/patches/766251.patch
@@ -0,0 +1,19 @@
+Description: Fix type mismatch crash in SGExpression
+
+(This patch is applied in debian/rules rather than debian/patches/series,
+as the latter can't patch a DOS-line-ending file)
+
+Author: Rebecca N. Palmer <rebecca_pal...@zoho.com>
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/766251
+--- flightgear-data-3.0.0.orig/Effects/model-combined-transparent.eff
++++ flightgear-data-3.0.0/Effects/model-combined-transparent.eff
+@@ -12,7 +12,7 @@ and fallback to plain transparency when
+ <and>
+ <equal>
+
<float-property>/sim/rendering/shaders/model</float-property>
+- <value type="int">0</value>
++ <value type="float">0</value>
+ </equal>
+ <or>
+ <less-equal>
diff --git a/debian/rules b/debian/rules
index 0be03d6..f7f272f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ override_dh_auto_install:
dh_installdirs -pflightgear-data-ai usr/share/games/flightgear
dh_installdirs -pflightgear-data-aircrafts usr/share/games/flightgear
dh_installdirs -pflightgear-data-models usr/share/games/flightgear
+#apply patch (can't use debian/patches/series as it can't patch a
DOS-line-ending file)
+ patch -p1 --binary < debian/patches/766251.patch
# Contents of flightgear-data-base
cp -av \
@@ -96,6 +98,8 @@ override_dh_auto_install:
$(CURDIR)/debian/flightgear-data-ai/usr/share/games/flightgear/AI/Aircraft/A330-MRTT/COPYING
\
$(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/ATC/Chatter/BR/LICENCE.txt
\
$(CURDIR)/debian/flightgear-data-base/usr/share/games/flightgear/Aircraft/Generic/Engines/LICENSE
+#clean up
+ patch -p1 -R --binary < debian/patches/766251.patch
