On Sun, Dec 21, 2014 at 3:51 PM, Adam D. Barratt
<a...@adam-barratt.org.uk> wrote:
> [I just spotted that your mail didn't have the bug CCed; was that
> intentional?]
Argh, my mistake. Now Ccing the bug report.
> On Sun, 2014-12-21 at 15:29 +0100, Vincent Fourmond wrote:
>> No, that was private mail. What he said that made me think I should
>> build it with openjdk-7 was "We rebuilt newer OpenJDK releases for
>> stable since the security fixes are almost impossible to extract and
>> backport", but maybe I overinterpreted.
>
> Ah. Yeah, I think that's more "we backport the new upstream releases
> because we can't just pull the security fixes out".
>
>> I shall revert that specific bit, then ;-)...
>
> Thanks. It's up to you whether you want to include the S-V bump -
> nothing in tooling looks at it in stable anyway.
OK. Shall I upload the attached debdiff ? BTW, do I need to make a
full upload with the orig source to stable ?
Regards,
Vincent
diff -Nru freecol-0.10.5+dfsg/debian/changelog
freecol-0.10.5+dfsg/debian/changelog
--- freecol-0.10.5+dfsg/debian/changelog 2012-03-06 00:10:28.000000000
+0100
+++ freecol-0.10.5+dfsg/debian/changelog 2014-12-21 15:30:36.000000000
+0100
@@ -1,3 +1,9 @@
+freecol (0.10.5+dfsg-1+deb7u1) stable; urgency=low
+
+ * Disable intro video to avoid hanging at startup (closes: #771700)
+
+ -- Vincent Fourmond <fourm...@debian.org> Sat, 20 Dec 2014 23:57:15 +0100
+
freecol (0.10.5+dfsg-1) unstable; urgency=low
* New upstream release
diff -Nru freecol-0.10.5+dfsg/debian/wrapper/freecol
freecol-0.10.5+dfsg/debian/wrapper/freecol
--- freecol-0.10.5+dfsg/debian/wrapper/freecol 2012-01-31 00:42:22.000000000
+0100
+++ freecol-0.10.5+dfsg/debian/wrapper/freecol 2014-12-20 23:39:11.000000000
+0100
@@ -24,5 +24,5 @@
disablenet="-Djava.net.preferIPv4Stack=true"
fi
-run_java $disablenet -Xincgc -Xmx512M net.sf.freecol.FreeCol --freecol-data \
+run_java $disablenet -Xincgc -Xmx512M net.sf.freecol.FreeCol --no-intro
--freecol-data \
/usr/share/games/freecol $lang_argument "$@"
