[freecol] 49/125: [freecol] Patch to remove the building problem, while undoubtedly disabling some functionality

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit 6217ddee8f79a775f7352bbb4ca05b20e69b319c
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sun Mar 7 19:21:33 2010 +0000

    [freecol] Patch to remove the building problem, while undoubtedly disabling some functionality
---
 debian/changelog                     |  6 +++--
 debian/control                       |  2 +-
 debian/patches/disable-listener.diff | 43 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/wrapper/freecol               |  2 +-
 5 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4a400b..49c7979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 @@ freecol (0.9.2+dfsg-1) UNREADYYET; urgency=low
     - 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
 
diff --git a/debian/control b/debian/control
index 00222de..e5b6c19 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Package: freecol
 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
diff --git a/debian/patches/disable-listener.diff b/debian/patches/disable-listener.diff
new file mode 100644
index 0000000..bbd0f80
--- /dev/null
+++ b/debian/patches/disable-listener.diff
@@ -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);
diff --git a/debian/patches/series b/debian/patches/series
index 14a85c2..1e5174d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+disable-listener.diff
 10-fix-jar-path.diff
 40-manpage.diff
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
index ad91c12..505af0b 100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git