r10826 - in packages/trunk/freecol/debian: . patches wrapper

[Vincent Fourmond]

Author: fourmond
Date: 2010-03-07 19:21:33 +0000 (Sun, 07 Mar 2010)
New Revision: 10826

Added:
   packages/trunk/freecol/debian/patches/disable-listener.diff
Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/control
   packages/trunk/freecol/debian/patches/series
   packages/trunk/freecol/debian/wrapper/freecol
Log:
[freecol] Patch to remove the building problem, while undoubtedly disabling some functionality

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2010-03-07 16:14:38 UTC (rev 10825)
+++ packages/trunk/freecol/debian/changelog	2010-03-07 19:21:33 UTC (rev 10826)
@@ -1,6 +1,6 @@
 freecol (0.9.2+dfsg-1) UNREADYYET; urgency=low
 
-  * New upstream release
+  * New upstream release (closes: #567803)
   * Switch to 3.0 (quilt) format + bzip2 repackaged archive
   * Droping dependency on libhiglayout-java, apparently not needed anymore
   * New dependencies:
@@ -8,8 +8,10 @@
     - libmiglayout-java
     - libcortado-java
   * Dropped dependency on dpatch now that we use format 3.0 (quilt)
+  * disable-listener.diff to disabled what seems to be a custom feature
+    from cortado
 
- -- Vincent Fourmond <fourmond at debian.org>  Sun, 07 Mar 2010 17:01:49 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 07 Mar 2010 18:00:39 +0100
 
 freecol (0.8.4+dfsg-2) unstable; urgency=low
 

Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control	2010-03-07 16:14:38 UTC (rev 10825)
+++ packages/trunk/freecol/debian/control	2010-03-07 19:21:33 UTC (rev 10826)
@@ -17,7 +17,7 @@
 Architecture: all
 Depends: openjdk-6-jre | java6-runtime,
  libwoodstox-java, java-wrappers (>= 0.1.13), ${misc:Depends},
- libcommons-cli-java
+ libcommons-cli-java, libmiglayout-java, libcortado-java
 Description: an open version of Colonization
  freecol is a game in the spirit of Civilization but taking place in a
  colonial background. Colonize a new world, build towns, trade or fight

Added: packages/trunk/freecol/debian/patches/disable-listener.diff
===================================================================
--- packages/trunk/freecol/debian/patches/disable-listener.diff	                        (rev 0)
+++ packages/trunk/freecol/debian/patches/disable-listener.diff	2010-03-07 19:21:33 UTC (rev 10826)
@@ -0,0 +1,43 @@
+Index: freecol-0.9.2+dfsg/src/net/sf/freecol/client/gui/video/VideoComponent.java
+===================================================================
+--- freecol-0.9.2+dfsg.orig/src/net/sf/freecol/client/gui/video/VideoComponent.java	2010-03-07 17:50:13.011526706 +0100
++++ freecol-0.9.2+dfsg/src/net/sf/freecol/client/gui/video/VideoComponent.java	2010-03-07 17:50:54.619521752 +0100
+@@ -34,7 +34,8 @@
+ import net.sf.freecol.common.resources.ResourceManager;
+ 
+ import com.fluendo.player.Cortado;
+-import com.fluendo.player.StopListener;
++// Disable the feature that seems to be missing from the stock Cortado
++// import com.fluendo.player.StopListener;
+ 
+ /**
+  * A component for playing video.
+@@ -74,17 +75,17 @@
+         applet.setParam ("showStatus", "hide");
+         applet.init();
+ 
+-        applet.setStopListener(new StopListener() {
+-            public void stopped() {
+-                SwingUtilities.invokeLater(new Runnable() {
+-                    public void run() {
+-                        for (VideoListener sl : videoListeners) {
+-                            sl.stopped();
+-                        }
+-                    }
+-                });
+-            }
+-        });
++        // applet.setStopListener(new StopListener() {
++        //     public void stopped() {
++        //         SwingUtilities.invokeLater(new Runnable() {
++        //             public void run() {
++        //                 for (VideoListener sl : videoListeners) {
++        //                     sl.stopped();
++        //                 }
++        //             }
++        //         });
++        //     }
++        // });
+         
+         setLayout(null);
+         add(applet);

Modified: packages/trunk/freecol/debian/patches/series
===================================================================
--- packages/trunk/freecol/debian/patches/series	2010-03-07 16:14:38 UTC (rev 10825)
+++ packages/trunk/freecol/debian/patches/series	2010-03-07 19:21:33 UTC (rev 10826)
@@ -1,2 +1,3 @@
+disable-listener.diff
 10-fix-jar-path.diff
 40-manpage.diff

Modified: packages/trunk/freecol/debian/wrapper/freecol
===================================================================
--- packages/trunk/freecol/debian/wrapper/freecol	2010-03-07 16:14:38 UTC (rev 10825)
+++ packages/trunk/freecol/debian/wrapper/freecol	2010-03-07 19:21:33 UTC (rev 10826)
@@ -6,7 +6,7 @@
 # We need openjdk, icedtea  or Sun 6
 find_java_runtime openjdk java6
 
-find_jars higlayout wstx-lgpl freecol
+find_jars miglayout wstx-lgpl freecol cortado commons-cli
 
 # We test if LC_MESSAGES is different from LC_CTYPE, if that is the case,
 # we pass to freecol the --default-locale argument