The following commit has been merged in the experimental branch:
commit 8f3708bdb9a1d121c5254af4923a8e647d8144bd
Author: Jan Dittberner <[email protected]>
Date: Thu Jan 6 00:16:04 2011 +0100
New upstream version.
* New upstream version.
* refresh patches debian/patches/0002-use-Debian-java-libs.patch and
debian/patches/0005-fix-sdl-build.patch
* remove sourceless installer/nsis_plugins/nsis7z.dll from tarball in
debian/new-upstream
* fix spelling error successfully instead of succesfully in
debian/patches/0006-fix-spelling-error.patch
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index 978c8e9..f81fd3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+spring (0.82.7+dfsg1-1) experimental; urgency=low
+
+ * New upstream version.
+ * refresh patches debian/patches/0002-use-Debian-java-libs.patch and
+ debian/patches/0005-fix-sdl-build.patch
+ * remove sourceless installer/nsis_plugins/nsis7z.dll from tarball in
+ debian/new-upstream
+ * fix spelling error successfully instead of succesfully in
+ debian/patches/0006-fix-spelling-error.patch
+
+ -- Jan Dittberner <[email protected]> Thu, 06 Jan 2011 00:15:47 +0100
+
spring (0.82.6.1+dfsg1-1) experimental; urgency=low
* New upstream version.
diff --git a/debian/new-upstream b/debian/new-upstream
index e1bce8c..53526a6 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -40,7 +40,8 @@ rm -f
spring_$version/AI/Interfaces/Java/data/jlib/vecmath.jar \
spring_$version/installer/dos2unix.exe \
spring_$version/installer/nsis_plugins/FindProcDLL.dll \
spring_$version/installer/nsis_plugins/inetc.dll \
- spring_$version/installer/nsis_plugins/registry.dll
+ spring_$version/installer/nsis_plugins/registry.dll \
+ spring_$version/installer/nsis_plugins/nsis7z.dll
tar czf "$origname" spring_$version
echo "Repacked tarball is $origname"
cd -
diff --git a/debian/patches/0002-use-Debian-java-libs.patch
b/debian/patches/0002-use-Debian-java-libs.patch
index 662ff7f..480f8c2 100644
--- a/debian/patches/0002-use-Debian-java-libs.patch
+++ b/debian/patches/0002-use-Debian-java-libs.patch
@@ -3,7 +3,15 @@ Subject: use Debian packaged versions of jna.jar and
vecmath.jar
Author: Jan Dittberner <[email protected]>
--- a/AI/Interfaces/Java/CMakeLists.txt
+++ b/AI/Interfaces/Java/CMakeLists.txt
-@@ -194,8 +194,8 @@
+@@ -115,7 +115,6 @@
+ set(myJarFile "SkirmishAI")
+ set(myBinJarFile "${myJarFile}.jar")
+ set(mySrcJarFile "${myJarFile}-src.jar")
+- set(myJLibDir "${myDir}/data/jlib")
+ GetVersionFromFile(myVersion "${myDir}/VERSION")
+ set(myTarget "${myName}")
+ set(myInstLibsDir "${SKIRMISH_AI_LIBS}/${myName}/${myVersion}")
+@@ -194,8 +193,8 @@
set(myJavaBuildDir "${myBuildDir}/classes")
# Create our full Java class-path
@@ -14,7 +22,7 @@ Author: Jan Dittberner <[email protected]>
# Create a list of all the AIs source files
file(GLOB_RECURSE mySources RELATIVE "${mySourceDir}"
FOLLOW_SYMLINKS "${mySourceDir}/*.java")
-@@ -215,7 +215,7 @@
+@@ -215,7 +214,7 @@
DEPENDS ${Java_AIINTERFACE_TARGET}
COMMAND "${JAVA_COMPILE}"
"${JAVA_COMPILE_FLAG_CONDITIONAL}"
@@ -23,10 +31,11 @@ Author: Jan Dittberner <[email protected]>
"-d" "${myJavaBuildDir}"
${mySources}
COMMAND "${JAVA_ARCHIVE}"
-@@ -357,9 +357,9 @@
+@@ -356,15 +355,14 @@
+ set(myBinJarFile "${myJarFile}.jar")
set(mySrcJarFile "${myJarFile}-src.jar")
set(myJavaGeneratedSourceDir "${myBuildDir}/src-generated/main/java")
- set(myJLibDir "${myDir}/data/jlib")
+- set(myJLibDir "${myDir}/data/jlib")
- #set(myJavaLibs
"${myJLibDir}/jna/jna.jar${PATH_DELIM_H}${myJLibDir}/vecmath.jar")
- CreateClasspath(myJavaLibs ${myJLibDir})
- set(myClassPath
".${PATH_DELIM_H}${myJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
@@ -36,7 +45,13 @@ Author: Jan Dittberner <[email protected]>
# Used by Java Skirmish AIs
SetGlobal(SOURCE_ROOT_${myName}_AIINTERFACE "${myDir}")
-@@ -445,7 +445,7 @@
+ SetGlobal(BUILD_ROOT_${myName}_AIINTERFACE "${myBuildDir}")
+- SetGlobal(CLASSPATH_${myName}_AIINTERFACE
"${myJavaLibs}${PATH_DELIM_H}${myBuildDir}/${myBinJarFile}")
++ SetGlobal(CLASSPATH_${myName}_AIINTERFACE
"${myClassPath}${PATH_DELIM_H}${myBuildDir}/${myBinJarFile}")
+
+ # We have to create these directories, cause otherwise the AWK scripts
+ # for generating the source code will not work
+@@ -446,7 +444,7 @@
DEPENDS "${myJavaGeneratedSourceDir}/${myPkg}/oo/*.java"
COMMAND "${JAVA_COMPILE}" ARGS
"${JAVA_COMPILE_FLAG_CONDITIONAL}"
diff --git a/debian/patches/0005-fix-sdl-build.patch
b/debian/patches/0005-fix-sdl-build.patch
index a4d436e..9b0f5f1 100644
--- a/debian/patches/0005-fix-sdl-build.patch
+++ b/debian/patches/0005-fix-sdl-build.patch
@@ -90,8 +90,8 @@ Subject: Use Debian version of SDL headers instead of missing
included
INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/)
--- a/rts/builds/HL/CMakeLists.txt
+++ b/rts/builds/HL/CMakeLists.txt
-@@ -11,25 +11,10 @@
- ADD_DEFINITIONS(-DNO_SOUND)
+@@ -12,25 +12,10 @@
+ ADD_DEFINITIONS(-DBITMAP_NO_OPENGL)
REMOVE_DEFINITIONS(-DAVI_CAPTURING)
-IF (MINGW OR APPLE)
diff --git a/debian/patches/0006-fix-spelling-error.patch
b/debian/patches/0006-fix-spelling-error.patch
index e724dbe..5e01728 100644
--- a/debian/patches/0006-fix-spelling-error.patch
+++ b/debian/patches/0006-fix-spelling-error.patch
@@ -23,3 +23,25 @@ Subject: fix spelling error (environment instead of
enviroment)
on systems without graphics and sound output support.
For more details, please reffer to:
+--- a/rts/System/Net/UDPListener.cpp
++++ b/rts/System/Net/UDPListener.cpp
+@@ -42,7 +42,7 @@
+ if (!acceptNewConnections) {
+ handleerror(NULL, "[UDPListener] error: unable to bind UDP
port, see log for details.", "Network error", MBF_OK | MBF_EXCL);
+ } else {
+- LogObject() << "[UDPListener] succesfully bound socket on port
" << port;
++ LogObject() << "[UDPListener] successfully bound socket on port
" << port;
+ }
+ }
+
+--- a/tools/ArchiveMover/ArchiveMover.cpp
++++ b/tools/ArchiveMover/ArchiveMover.cpp
+@@ -434,7 +434,7 @@
+
+ if (!quiet) {
+ message<<_("The ")<<(content == R_MAP? _("map '") :
_("mod '"))<<source_file.leaf()
+- <<_("' has been saved succesfully to
'")<<target_dir.branch_path()<<_("'.")<<endl
++ <<_("' has been saved successfully to
'")<<target_dir.branch_path()<<_("'.")<<endl
+ <<_("Use the reload mods/maps button in the lobby to
make Spring find it.")<<endl;
+ }
+
--
advanced 3D real time strategy game engine
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
