The following commit has been merged in the master branch:
commit e2ef2dc0337664aa326fd59b1583c996631cb240
Author: Scott Howard <[email protected]>
Date: Sun Jun 10 11:18:19 2012 -0400
refreshed patches
diff --git a/debian/control b/debian/control
index 80aa928..eadcab3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Java Maintainers
<[email protected]
Uploaders: Scott Howard <[email protected]>
Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper (>= 0.37),
ant, libcommons-httpclient-java, libcommons-logging-java,
- libcommons-codec-java, junit, imagemagick
-Standards-Version: 3.9.2
+ libcommons-codec-java, junit, libgnumail-java, imagemagick
+Standards-Version: 3.9.3
Homepage: http://triplea.sourceforge.net
Vcs-Git: git://anonscm.debian.org/pkg-java/triplea.git
Vcs-browser: http://anonscm.debian.org/gitweb/?p=pkg-java/triplea.git
diff --git a/debian/patches/compile_jar.patch b/debian/patches/compile_jar.patch
index 9f52aaa..ad2fa3e 100644
--- a/debian/patches/compile_jar.patch
+++ b/debian/patches/compile_jar.patch
@@ -1,33 +1,42 @@
Description: Fixes build so it outputs a usable jar.
Author: Scott Howard <[email protected]>
-Index: triplea-1.3.2.2/build.xml
+Index: triplea/build.xml
===================================================================
---- triplea-1.3.2.2.orig/build.xml 2011-11-10 22:12:24.806045766 -0500
-+++ triplea-1.3.2.2/build.xml 2011-11-10 22:13:01.450045014 -0500
-@@ -45,7 +45,7 @@
+--- triplea.orig/build.xml 2012-06-10 11:09:26.827684953 -0400
++++ triplea/build.xml 2012-06-10 11:10:17.615686160 -0400
+@@ -15,6 +15,7 @@
+
+ <!-- this path does not have junit on it -->
+ <path id="src.classpath">
++ <pathelement path="lib\gnumail.jar"/>
+ <pathelement path="lib\mailapi.jar"/>
+ <pathelement path="lib\smtp.jar"/>
+ <pathelement path="lib\activation.jar"/>
+@@ -50,7 +51,7 @@
</target>
<!-- Compile -->
-- <target name="compile" depends="init" description="Compile the source
files and copy over the resource files">
-+ <target name="compile_orig" depends="init" description="Compile the
source files and copy over the resource files">
+- <target name="compile" description="Compile the source files and copy
over the resource files">
++ <target name="compile_orig" description="Compile the source files and
copy over the resource files">
<!-- we require jdk 1.5 or greater -->
<fail message="jdk 1.5 or greater required, you are currently
using: ${ant.java.version}">
-@@ -284,6 +284,9 @@
-
+@@ -295,6 +296,10 @@
<!-- zip -->
- <target name="zip" depends="init,compile" description="create a zip
file for end users">
+ <target name="zip" depends="compile" description="create a zip file for
all end users">
+ <mkdir dir="release" />
+ </target>
+ <!-- Debian compile -->
-+ <target name="compile" depends="init,compile_orig" description="compile
classes into .jar">
- <mkdir dir="release" />
++ <target name="compile" depends="compile_orig" description="compile
classes into .jar">
++ <mkdir dir="release" />
<mkdir dir="bin"/>
-@@ -308,16 +311,16 @@
+ <delete file="bin/triplea.jar" />
+@@ -318,16 +323,16 @@
</manifest>
</jar>
- <delete dir="deleteme"></delete>
+ <delete dir="deleteme"/>
-
+<!--
<zip
zipfile="release/triplea_${triplea.version}_all_platforms.zip" compress="true">
@@ -42,14 +51,13 @@ Index: triplea-1.3.2.2/build.xml
-
+<!--
<zipfileset dir="doc/"
prefix="triplea_${triplea.version}/doc/">
- <include name="**/*.html" />
- <include name="**/*.png" />
-@@ -365,7 +368,7 @@
+ <include name="**/*.*" />
</zipfileset>
+@@ -378,6 +383,7 @@
-
-- </zip>
-+ </zip> -->
+
+ </zip>
++-->
</target>
-
+
<!-- zip -->
diff --git a/debian/patches/launcher_scripts.patch
b/debian/patches/launcher_scripts.patch
index b3dc422..d8b8438 100644
--- a/debian/patches/launcher_scripts.patch
+++ b/debian/patches/launcher_scripts.patch
@@ -1,31 +1,26 @@
Description: Points to Debian installed location, and calls #!/bin/sh
Author: Scott Howard <[email protected]>
-Index: triplea-1.3.2.2/run-server.sh
+Index: triplea/run-server.sh
===================================================================
---- triplea-1.3.2.2.orig/run-server.sh 2011-11-10 18:04:13.470351361 -0500
-+++ triplea-1.3.2.2/run-server.sh 2011-11-10 22:11:11.234047276 -0500
+--- triplea.orig/run-server.sh 2012-06-10 11:09:26.807684953 -0400
++++ triplea/run-server.sh 2012-06-10 11:12:49.107689761 -0400
@@ -1,2 +1,3 @@
-cd $(dirname $0)
+#!/bin/sh
+cd /usr/share/triplea
java -server -Xmx192m -classpath bin/triplea.jar:lib/derby_10_1_2.jar
-Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true
games.strategy.engine.lobby.server.LobbyServer
-Index: triplea-1.3.2.2/triplea_unix.sh
+Index: triplea/triplea_unix.sh
===================================================================
---- triplea-1.3.2.2.orig/triplea_unix.sh 2011-11-10 18:04:13.446351362
-0500
-+++ triplea-1.3.2.2/triplea_unix.sh 2011-11-10 22:11:11.234047276 -0500
-@@ -1,3 +1,5 @@
-+#!/bin/sh
-+
- if ! java -version > /dev/null 2>&1
- then
- echo "Could not find Java."
-@@ -5,7 +7,7 @@
+--- triplea.orig/triplea_unix.sh 2012-06-10 11:09:26.787684952 -0400
++++ triplea/triplea_unix.sh 2012-06-10 11:15:47.811694008 -0400
+@@ -7,8 +7,7 @@
exit
fi
-relativePathToGame=`dirname $0`
-+relativePathToGame=/usr/share/triplea
- cd $relativePathToGame
+-cd "$relativePathToGame"
++cd /usr/share/triplea
+ java -Xmx512m -cp bin/patch.jar:bin/triplea.jar
games.strategy.engine.framework.GameRunner
diff --git a/debian/patches/macwrappers.patch b/debian/patches/macwrappers.patch
index 080b22d..901eb1a 100644
--- a/debian/patches/macwrappers.patch
+++ b/debian/patches/macwrappers.patch
@@ -1,74 +1,65 @@
Description: Dumb down unneeded wrappers for compatibillity on macs
Author: Scott Howard <[email protected]>
-Index: triplea-1.3.2.2/src/games/strategy/common/ui/BasicGameMenuBar.java
+Index: triplea/src/games/strategy/common/ui/BasicGameMenuBar.java
===================================================================
---- triplea-1.3.2.2.orig/src/games/strategy/common/ui/BasicGameMenuBar.java
2011-11-10 22:14:14.114043523 -0500
-+++ triplea-1.3.2.2/src/games/strategy/common/ui/BasicGameMenuBar.java
2011-11-10 22:15:07.330042431 -0500
-@@ -280,7 +280,7 @@
- });
-
- }
-- else // On Mac OS X, put the About menu where Mac users expect it to be
-+/* else // On Mac OS X, put the About menu where Mac users expect
it to be
- {
- Application.getApplication().addApplicationListener(new
ApplicationAdapter()
- {
-@@ -292,7 +292,7 @@
- }
- });
- }
--
-+*/
- }
-
-
-Index: triplea-1.3.2.2/src/games/strategy/common/ui/MacWrapper.java
+--- triplea.orig/src/games/strategy/common/ui/BasicGameMenuBar.java
2012-06-10 10:16:33.503609535 -0400
++++ triplea/src/games/strategy/common/ui/BasicGameMenuBar.java 2012-06-10
10:17:43.603611201 -0400
+@@ -390,6 +390,7 @@
+ else
+ // On Mac OS X, put the About menu where Mac users expect it to
be
+ {
++/*
+ Application.getApplication().addApplicationListener(new
ApplicationAdapter()
+ {
+ @Override
+@@ -399,6 +400,7 @@
+ JOptionPane.showMessageDialog(m_frame,
editorPane, "About " + m_frame.getGame().getData().getGameName(),
JOptionPane.PLAIN_MESSAGE);
+ }
+ });
++*/
+ }
+ }
+
+Index: triplea/src/games/strategy/common/ui/MacWrapper.java
===================================================================
---- triplea-1.3.2.2.orig/src/games/strategy/common/ui/MacWrapper.java
2011-11-10 22:14:14.150043522 -0500
-+++ triplea-1.3.2.2/src/games/strategy/common/ui/MacWrapper.java
2011-11-10 22:15:07.330042431 -0500
-@@ -34,7 +34,7 @@
- private static MainGameFrame s_shutdownFrame;
- private static Application application = new Application();
-
-- static
-+/* static
- {
- application.addApplicationListener(
- new ApplicationAdapter() {
-@@ -46,7 +46,7 @@
- System.exit(0);
- }});
- }
--
-+*/
- //keep this in its own class, otherwise we get a no class def error when
- //we try to load the game and the stubs arent in the classpath
- //i think the java validator triggers this
-Index:
triplea-1.3.2.2/src/games/strategy/engine/lobby/client/ui/MacLobbyWrapper.java
+--- triplea.orig/src/games/strategy/common/ui/MacWrapper.java 2012-06-10
10:16:33.519609535 -0400
++++ triplea/src/games/strategy/common/ui/MacWrapper.java 2012-06-10
10:16:38.231609647 -0400
+@@ -33,6 +33,7 @@
+ {
+ private static MainGameFrame s_shutdownFrame;
+ private static Application application = new Application();
++/*
+ static
+ {
+ application.addApplicationListener(new ApplicationAdapter()
+@@ -47,6 +48,7 @@
+ }
+ });
+ }
++*/
+
+ // keep this in its own class, otherwise we get a no class def error
when
+ // we try to load the game and the stubs arent in the classpath
+Index: triplea/src/games/strategy/engine/lobby/client/ui/MacLobbyWrapper.java
===================================================================
----
triplea-1.3.2.2.orig/src/games/strategy/engine/lobby/client/ui/MacLobbyWrapper.java
2011-11-10 22:14:14.090043525 -0500
-+++
triplea-1.3.2.2/src/games/strategy/engine/lobby/client/ui/MacLobbyWrapper.java
2011-11-10 22:16:18.238040976 -0500
-@@ -29,21 +29,6 @@
- //we try to load the game and the stubs arent in the classpath
- //i think the java validator triggers this
-
-- public static void registerMacShutdownHandler(final LobbyFrame frame)
-- {
-- Application application = new Application();
--
-- application.addApplicationListener(
-- new ApplicationAdapter() {
-- public void handleQuit(ApplicationEvent event)
-- {
-- if(frame != null)
-- frame.shutdown();
-- else
-- System.exit(0);
-- }});
--
-- }
--
-+ public static void registerMacShutdownHandler(final LobbyFrame frame){}
-
+---
triplea.orig/src/games/strategy/engine/lobby/client/ui/MacLobbyWrapper.java
2012-06-10 10:16:33.499609535 -0400
++++ triplea/src/games/strategy/engine/lobby/client/ui/MacLobbyWrapper.java
2012-06-10 10:16:38.231609647 -0400
+@@ -28,17 +28,5 @@
+ // i think the java validator triggers this
+ public static void registerMacShutdownHandler(final LobbyFrame frame)
+ {
+- final Application application = new Application();
+- application.addApplicationListener(new ApplicationAdapter()
+- {
+- @Override
+- public void handleQuit(final ApplicationEvent event)
+- {
+- if (frame != null)
+- frame.shutdown();
+- else
+- System.exit(0);
+- }
+- });
+ }
}
--
triplea packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
