[SCM] triplea packaging branch, master, updated. debian/1.5.2.1-1-4-gd547d70
Scott Howard
showard314 at gmail.com
Thu Dec 6 03:13:59 UTC 2012
The following commit has been merged in the master branch:
commit d547d70091646f94b495748b2aa08daba5713e12
Author: Scott Howard <showard314 at gmail.com>
Date: Wed Dec 5 21:50:48 2012 -0500
New upstream release. Refreshed patches, compile_jar.patch removed (accepted upstream)
diff --git a/debian/changelog b/debian/changelog
index 8616bf8..56f5af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
+triplea (1.6.1.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Refreshed patches, compile_jar.patch removed (accepted upstream)
+
+ -- Scott Howard <showard at debian.org> Wed, 05 Dec 2012 21:15:14 -0500
+
triplea (1.5.2.1-1) unstable; urgency=low
- * New upstream release
+ * New upstream release.
-- Scott Howard <showard at debian.org> Sun, 10 Jun 2012 09:29:40 -0400
diff --git a/debian/patches/compile_jar.patch b/debian/patches/compile_jar.patch
deleted file mode 100644
index ad2fa3e..0000000
--- a/debian/patches/compile_jar.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Fixes build so it outputs a usable jar.
-Author: Scott Howard <showard at debian.org>
-
-Index: triplea/build.xml
-===================================================================
---- 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" 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}">
-@@ -295,6 +296,10 @@
- <!-- zip -->
- <target name="zip" depends="compile" description="create a zip file for all end users">
- <mkdir dir="release" />
-+ </target>
-+ <!-- Debian compile -->
-+ <target name="compile" depends="compile_orig" description="compile classes into .jar">
-+ <mkdir dir="release" />
-
- <mkdir dir="bin"/>
- <delete file="bin/triplea.jar" />
-@@ -318,16 +323,16 @@
- </manifest>
- </jar>
- <delete dir="deleteme"/>
--
-+<!--
- <zip zipfile="release/triplea_${triplea.version}_all_platforms.zip" compress="true">
--
-+-->
- <!--zipfileset dir="lib/" prefix="triplea_${triplea.version}/lib/">
- <include name="**/*.jar" />
- <include name="**/*.zip" />
-
- <exclude name="**/junit.jar" />
- </zipfileset -->
--
-+<!--
- <zipfileset dir="doc/" prefix="triplea_${triplea.version}/doc/">
- <include name="**/*.*" />
- </zipfileset>
-@@ -378,6 +383,7 @@
-
-
- </zip>
-+-->
- </target>
-
- <!-- zip -->
diff --git a/debian/patches/launcher_scripts.patch b/debian/patches/launcher_scripts.patch
index d8b8438..627d875 100644
--- a/debian/patches/launcher_scripts.patch
+++ b/debian/patches/launcher_scripts.patch
@@ -3,8 +3,8 @@ Author: Scott Howard <showard at debian.org>
Index: triplea/run-server.sh
===================================================================
---- 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
+--- triplea.orig/run-server.sh 2012-06-10 15:09:39.000000000 -0400
++++ triplea/run-server.sh 2012-12-05 21:24:54.560929551 -0500
@@ -1,2 +1,3 @@
-cd $(dirname $0)
+#!/bin/sh
@@ -12,8 +12,8 @@ Index: triplea/run-server.sh
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/triplea_unix.sh
===================================================================
---- 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
+--- triplea.orig/triplea_unix.sh 2012-12-05 21:03:27.164935807 -0500
++++ triplea/triplea_unix.sh 2012-12-05 21:24:54.560929551 -0500
@@ -7,8 +7,7 @@
exit
fi
@@ -23,4 +23,4 @@ Index: triplea/triplea_unix.sh
+cd /usr/share/triplea
- java -Xmx512m -cp bin/patch.jar:bin/triplea.jar games.strategy.engine.framework.GameRunner
+ java -Xmx640m -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 901eb1a..7ed8f45 100644
--- a/debian/patches/macwrappers.patch
+++ b/debian/patches/macwrappers.patch
@@ -3,9 +3,9 @@ Author: Scott Howard <showard at debian.org>
Index: triplea/src/games/strategy/common/ui/BasicGameMenuBar.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 @@
+--- triplea.orig/src/games/strategy/common/ui/BasicGameMenuBar.java 2012-12-05 21:32:31.136927333 -0500
++++ triplea/src/games/strategy/common/ui/BasicGameMenuBar.java 2012-12-05 21:33:28.380927054 -0500
+@@ -400,6 +400,7 @@
else
// On Mac OS X, put the About menu where Mac users expect it to be
{
@@ -13,7 +13,7 @@ Index: triplea/src/games/strategy/common/ui/BasicGameMenuBar.java
Application.getApplication().addApplicationListener(new ApplicationAdapter()
{
@Override
-@@ -399,6 +400,7 @@
+@@ -409,6 +410,7 @@
JOptionPane.showMessageDialog(m_frame, editorPane, "About " + m_frame.getGame().getData().getGameName(), JOptionPane.PLAIN_MESSAGE);
}
});
@@ -23,8 +23,8 @@ Index: triplea/src/games/strategy/common/ui/BasicGameMenuBar.java
Index: triplea/src/games/strategy/common/ui/MacWrapper.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
+--- triplea.orig/src/games/strategy/common/ui/MacWrapper.java 2012-12-05 21:32:31.136927333 -0500
++++ triplea/src/games/strategy/common/ui/MacWrapper.java 2012-12-05 21:33:28.380927054 -0500
@@ -33,6 +33,7 @@
{
private static MainGameFrame s_shutdownFrame;
@@ -43,8 +43,8 @@ Index: triplea/src/games/strategy/common/ui/MacWrapper.java
// 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.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
+--- triplea.orig/src/games/strategy/engine/lobby/client/ui/MacLobbyWrapper.java 2012-12-05 21:32:31.136927333 -0500
++++ triplea/src/games/strategy/engine/lobby/client/ui/MacLobbyWrapper.java 2012-12-05 21:33:28.380927054 -0500
@@ -28,17 +28,5 @@
// i think the java validator triggers this
public static void registerMacShutdownHandler(final LobbyFrame frame)
diff --git a/debian/patches/series b/debian/patches/series
index 91d8e9a..84a7080 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
AppleJavaExtensions.patch
macwrappers.patch
-compile_jar.patch
launcher_scripts.patch
diff --git a/debian/triplea.install b/debian/triplea.install
index 831f3c4..c7f59d6 100644
--- a/debian/triplea.install
+++ b/debian/triplea.install
@@ -7,7 +7,7 @@ maps/* usr/share/triplea/maps
data/* usr/share/triplea/data
sounds/* usr/share/triplea/sounds
readme.html usr/share/doc/triplea
-TripleaA_RuleBook.pdf usr/share/doc/triplea
+TripleA_RuleBook.pdf usr/share/doc/triplea
triplea usr/games
debian/icons/* usr/share/icons/hicolor
debian/triplea.desktop usr/share/applications
--
triplea packaging
More information about the pkg-java-commits
mailing list