Bug#773649: wheezy-pu: package freecol/0.10.5+dfsg-2

[Vincent Fourmond <fourmond@debian.org>]

Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu

  Dear release Team,

  I wish to update the freecol package in wheezy, where it is affected
by #771700 (hangs at startup). The patch, attached is minimal and has
been shown to work in unstable.

  Is that OK for you ?

  Cheers,

        Vincent

-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.14.0+p (SMP w/8 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

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-20 23:57:25.000000000 +0100
@@ -1,3 +1,11 @@
+freecol (0.10.5+dfsg-2) stable; urgency=low
+  
+  * Disable intro video to avoid hanging at startup (closes: #771700)
+  * Conforms to 3.9.5
+  * Build with openjdk-7 when available
+
+ -- Vincent Fourmond <fourmond@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/control freecol-0.10.5+dfsg/debian/control
--- freecol-0.10.5+dfsg/debian/control	2012-03-06 00:09:54.000000000 +0100
+++ freecol-0.10.5+dfsg/debian/control	2014-12-20 23:57:05.000000000 +0100
@@ -3,19 +3,19 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond@debian.org>
-Build-Depends: debhelper (>= 5), ant, openjdk-6-jdk, cdbs
+Build-Depends: debhelper (>= 5), ant, openjdk-7-jdk | openjdk-6-jdk, cdbs
 Build-Depends-Indep:
  tex4ht, texlive-binaries | texlive-base-bin, ant-optional,
  texlive-latex-recommended, libcommons-cli-java, libmiglayout-java,
  libcortado-java, javahelper
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://www.freecol.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/freecol
 
 Package: freecol
 Architecture: all
-Depends: openjdk-6-jre | java6-runtime,
+Depends: openjdk-7-jre | openjdk-6-jre | java6-runtime,
  java-wrappers (>= 0.1.13), ${misc:Depends}, ${java:Depends},
  fonts-liberation (>= 1.07.0-2~)
 Description: open source remake of the old Colonization
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 "$@"