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

2014-12-21 Thread Vincent Fourmond 
Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian@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.0 +0100
+++ freecol-0.10.5+dfsg/debian/changelog	2014-12-20 23:57:25.0 +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 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/control freecol-0.10.5+dfsg/debian/control
--- freecol-0.10.5+dfsg/debian/control	2012-03-06 00:09:54.0 +0100
+++ freecol-0.10.5+dfsg/debian/control	2014-12-20 23:57:05.0 +0100
@@ -3,19 +3,19 @@
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Vincent Fourmond fourm...@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.0 +0100
+++ freecol-0.10.5+dfsg/debian/wrapper/freecol	2014-12-20 23:39:11.0 +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 $@

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

2014-12-21 Thread Adam D. Barratt 
Control: tags -1 + moreinfo

On Sun, 2014-12-21 at 14:41 +0100, Vincent Fourmond wrote:
   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.

The patch for the bug itself does appear to be minimal and fine, but
looking at the changelog:

+freecol (0.10.5+dfsg-2) stable; urgency=low

We'd tend to suggest 0.10.5+dfsg-1+deb7u1, but as long as 0.10.5+dfsg-2
has never been used before then it'll be okay.

+  * Disable intro video to avoid hanging at startup (closes: #771700)

Fine.

+  * Conforms to 3.9.5
+  * Build with openjdk-7 when available

Neither of these two changes appears to be related to the fix for
#771700?

Regards,

Adam


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

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

2014-12-21 Thread Vincent Fourmond 
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/changelog2012-03-06 00:10:28.0 
+0100
+++ freecol-0.10.5+dfsg/debian/changelog2014-12-21 15:30:36.0 
+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.0 
+0100
+++ freecol-0.10.5+dfsg/debian/wrapper/freecol  2014-12-20 23:39:11.0 
+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 $@

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

2014-12-21 Thread Adam D. Barratt 
Control: tags -1 + pending

[I also managed to drop the bug CC; re-added]

On Sun, 2014-12-21 at 16:35 +0100, Vincent Fourmond wrote:
 On Sun, Dec 21, 2014 at 4:14 PM, Adam D. Barratt
 a...@adam-barratt.org.uk wrote:
  Control: tags -1 +confirmed -moreinfo
 
  On Sun, 2014-12-21 at 16:11 +0100, Vincent Fourmond wrote:
OK. Shall I upload the attached debdiff ?
 
  That looks fine; thanks.
 
  BTW, do I need to make a
  full upload with the orig source to stable ?
 
  No, it's just a normal upload to ftp-master (other than the target
  suite).
 
   On its way.

Flagged for acceptance, thanks.

Regards,

Adam


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org