[SCM] advanced 3D real time strategy game engine branch, experimental, updated. debian/0.82.7.1+dfsg1-2-1-g50df15f
Jan Dittberner
jandd at debian.org
Tue May 3 19:14:31 UTC 2011
The following commit has been merged in the experimental branch:
commit 50df15f721beb6065a3feb87ab5c94959014f9b2
Author: Jan Dittberner <jandd at debian.org>
Date: Sat Mar 5 13:21:48 2011 +0100
restructuring to upstream recommendations
* debian/control:
- build engine binary packages as recommended by upstream:
springrts-engine-default, springrts-engine-default-dbg,
springrts-engine-dedicated, springrts-engine-dedicated-dbg,
springrts-engine-multithreaded, springrts-engine-multithreaded-dbg,
springrts-engine-headless, springrts-engine-headless-dbg,
springrts-unitsync, springrts-unitsync-dbg
- add Python AI package springrts-pythonai
- add python-all-dev to Build-Depends
- rename spring-common to springrts-common, rename spring-javaai to
springrts-javaai
- move default AIs to springrts-default-ai package
* debian/rules:
- add --with python2 to dh invocation
- simplify get-orig-source rule because uscan uses debian/new-upstream
for repacking
diff --git a/.gitignore b/.gitignore
index 845ca06..1be94dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
.pc
+*~
diff --git a/debian/changelog b/debian/changelog
index b05814d..1e793c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+spring (0.82.7.1+dfsg1-2+exp1) experimental; urgency=low
+
+ * debian/control:
+ - build engine binary packages as recommended by upstream:
+ springrts-engine-default, springrts-engine-default-dbg,
+ springrts-engine-dedicated, springrts-engine-dedicated-dbg,
+ springrts-engine-multithreaded, springrts-engine-multithreaded-dbg,
+ springrts-engine-headless, springrts-engine-headless-dbg,
+ springrts-unitsync, springrts-unitsync-dbg
+ - add Python AI package springrts-pythonai
+ - add python-all-dev to Build-Depends
+ - rename spring-common to springrts-common, rename spring-javaai to
+ springrts-javaai
+ - move default AIs to springrts-default-ai package
+ * debian/rules:
+ - add --with python2 to dh invocation
+ - simplify get-orig-source rule because uscan uses debian/new-upstream
+ for repacking
+
+ -- Jan Dittberner <jandd at debian.org> Sat, 05 Mar 2011 12:05:28 +0100
+
spring (0.82.7.1+dfsg1-2) unstable; urgency=low
* upload to unstable
diff --git a/debian/control b/debian/control
index ce5f81f..6401ed3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,81 +3,244 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Marco Amadori <marco.amadori at gmail.com>, Jan Dittberner <jandd at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
- cmake,
- asciidoc,
- docbook-xsl,
- xsltproc,
- bzip2,
- default-jdk,
- libboost-dev,
- libboost-program-options-dev,
- libboost-regex-dev,
- libboost-serialization-dev,
- libboost-signals-dev,
- libboost-system-dev,
- libboost-thread-dev,
- libdevil-dev,
- libfreetype6-dev,
- libglew-dev,
- libogg-dev,
- libopenal-dev,
- libsdl-dev,
- libvorbis-dev,
- libxcursor-dev,
- p7zip-full,
- zip,
- libvecmath-java,
- libjna-java
+Build-Depends: debhelper (>= 7.0.50~), cmake, asciidoc, docbook-xsl,
+ xsltproc, bzip2, default-jdk, libboost-dev,
+ libboost-program-options-dev, libboost-regex-dev,
+ libboost-serialization-dev, libboost-signals-dev,
+ libboost-system-dev, libboost-thread-dev, libdevil-dev,
+ libfreetype6-dev, libglew-dev, libogg-dev, libopenal-dev, libsdl-dev,
+ libvorbis-dev, libxcursor-dev, p7zip-full, zip, libvecmath-java,
+ libjna-java, python-all-dev (>= 2.6.5-1~)
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/pkg-games/spring.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/spring.git;a=summary
Homepage: http://springrts.com
-Package: spring
+Package: springrts-common
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: spring-engine
+Breaks: spring-common (<< 0.82.7.1+dfsg1-2+exp1)
+Recommends: springrts-engine-default (>= ${source:Version}) |
+ springrts-engine (>= ${source:Version), springlobby
+Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic | spring-mod
+Description: a modern full-3D RTS game engine (common files)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package just includes the game engine's arch independent files, with no
+ maps, mods or rich user interface.
+
+Package: springrts-engine-default
Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, spring-common (= ${source:Version}), otf-freefont
+Depends: ${shlibs:Depends}, ${misc:Depends}, springrts-common (=
+ ${source:Version}), springrts-unitsync (= ${binary:Version}),
+ springrts-default-ai (= ${binary:Version}), otf-freefont
Conflicts: spring-engine
-Recommends: springlobby | spring-lobby
-Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic | spring-mod, spring-javaai, libtxc-dxtn0
-Description: a modern full-3D RTS game engine
+Breaks: spring (<< 0.82.7.1+dfsg1-2+exp1)
+Provides: spring, springrts-engine
+Recommends: springlobby
+Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic
+ | spring-mod, libtxc-dxtn0
+Description: a modern full-3D RTS game engine (default)
Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
created to bring the gameplay experience of Total Annihilation into 3D.
Games are played using one of a number of mods.
.
- This package just includes the game engine and the default AI, with no maps,
- mods or rich user interface.
+ This package just includes the default single threaded version of the
+ game engine, with no maps, mods or rich user interface.
-Package: spring-common
-Architecture: all
-Depends: ${misc:Depends}
+Package: springrts-engine-default-dbg
+Section: debug
+Architecture: i386 amd64
+Priority: extra
+Depends: ${misc:Depends}, springrts-engine-default (=
+ ${binary:Version})
+Recommends: springrts-default-ai-dbg (= ${binary:Version}),
+ springrts-unitsync-dbg (= ${binary:Version})
+Breaks: spring-dbg (<< 0.82.7.1+dfsg1-2+exp1)
+Provides: spring-dbg
+Description: a modern full-3D RTS game engine (default debugging symbols)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package contains the debugging symbols for the default single
+ threaded spring binaries.
+
+Package: springrts-default-ai
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, springrts-common (=
+ ${source:Version}), springrts-engine-default (= ${binary:Version) |
+ springrts-engine (= ${binary:Version})
Conflicts: spring-engine
-Recommends: spring (>= ${source:Version}), spring (<< ${source:Version}.1~), springlobby | spring-lobby
-Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic | spring-mod
-Description: a modern full-3D RTS game engine (common files)
+Breaks: spring (<< 0.82.7.1+dfsg1-2+exp1)
+Recommends: springrts-javaai (= ${binary:Version), springrts-pythonai
+ (= ${binary:Version})
+Description: a modern full-3D RTS game engine (default AIs)
Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
created to bring the gameplay experience of Total Annihilation into 3D.
Games are played using one of a number of mods.
.
- This package just includes the game engine's arch independent files, with no
- maps, mods or rich user interface.
+ This package contains the default spring AI (artificial intelligence).
+
+Package: springrts-default-ai-dbg
+Architecture: i386 amd64
+Depends: ${misc:Depends}, springrts-default-ai (= ${binary:Version})
+Breaks: spring-dbg (<< 0.82.7.1+dfsg1-2+exp1)
+Description: a modern full-3D RTS game engine (default AIs debugging symbols)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package contains the debugging symbols for the default spring AI
+ binaries.
-Package: spring-dbg
+Package: springrts-engine-dedicated
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, springrts-common (=
+ ${source:Version}), springrts-unitsync (= ${binary:Version}),
+ springrts-default-ai (= ${binary:Version}), otf-freefont
+Conflicts: spring-engine
+Breaks: spring (<< 0.82.7.1+dfsg1-2+exp1)
+Provides: spring, springrts-engine
+Recommends: springlobby
+Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic
+ | spring-mod, spring-javaai, libtxc-dxtn0
+Description: a modern full-3D RTS game engine (dedicated)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package just includes the dedicated version of the game engine,
+ with no maps, mods or rich user interface.
+
+Package: springrts-engine-dedicated-dbg
Section: debug
Architecture: i386 amd64
Priority: extra
-Depends: ${misc:Depends}, spring (= ${binary:Version})
-Description: a modern full-3D RTS game engine (debugging symbols)
+Depends: ${misc:Depends}, springrts-engine-dedicated (=
+ ${binary:Version})
+Recommends: springrts-default-ai-dbg (= ${binary:Version}),
+ springrts-unitsync-dbg (= ${binary:Version})
+Breaks: spring-dbg (<< 0.82.7.1+dfsg1-2+exp1)
+Provides: spring-dbg
+Description: a modern full-3D RTS game engine (dedicated debugging symbols)
Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
created to bring the gameplay experience of Total Annihilation into 3D.
Games are played using one of a number of mods.
.
- This package contains the debugging symbols for the spring binaries.
+ This package contains the debugging symbols for the dedicated spring
+ binaries.
-Package: spring-javaai
+Package: springrts-engine-multithreaded
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, springrts-common (=
+ ${source:Version}), springrts-unitsync (= ${binary:Version}),
+ springrts-default-ai (= ${binary:Version}), otf-freefont
+Conflicts: spring-engine
+Breaks: spring (<< 0.82.7.1+dfsg1-2+exp1)
+Provides: spring, springrts-engine
+Recommends: springlobby
+Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic
+ | spring-mod, spring-javaai, libtxc-dxtn0
+Description: a modern full-3D RTS game engine (multithreaded)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package just includes the multithreaded version of the game
+ engine, with no maps, mods or rich user interface.
+
+Package: springrts-engine-multithreaded-dbg
+Section: debug
+Architecture: i386 amd64
+Priority: extra
+Depends: ${misc:Depends}, springrts-engine-multithreaded (=
+ ${binary:Version})
+Recommends: springrts-default-ai-dbg (= ${binary:Version}),
+ springrts-unitsync-dbg (= ${binary:Version})
+Breaks: spring-dbg (<< 0.82.7.1+dfsg1-2+exp1)
+Provides: spring-dbg
+Description: a modern full-3D RTS game engine (multithreaded debugging symbols)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package contains the debugging symbols for the multithreaded
+ spring binaries.
+
+Package: springrts-engine-headless
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, springrts-common (=
+ ${source:Version}), springrts-unitsync (= ${binary:Version}),
+ springrts-default-ai (= ${binary:Version}), otf-freefont
+Conflicts: spring-engine
+Breaks: spring (<< 0.82.7.1+dfsg1-2+exp1)
+Provides: spring, springrts-engine
+Recommends: springlobby
+Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic
+ | spring-mod, spring-javaai, libtxc-dxtn0
+Description: a modern full-3D RTS game engine (headless)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package just includes the headless version of the game engine,
+ with no maps, mods or rich user interface.
+
+Package: springrts-engine-headless-dbg
+Section: debug
+Architecture: i386 amd64
+Priority: extra
+Depends: ${misc:Depends}, springrts-engine-headless (=
+ ${binary:Version})
+Recommends: springrts-default-ai-dbg (= ${binary:Version}),
+ springrts-unitsync-dbg (= ${binary:Version})
+Breaks: spring-dbg (<< 0.82.7.1+dfsg1-2+exp1)
+Provides: spring-dbg
+Description: a modern full-3D RTS game engine (headless debugging symbols)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package contains the debugging symbols for the headless spring
+ binaries.
+
+Package: springrts-unitsync
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: spring-engine
+Breaks: spring (<< 0.82.7.1+dfsg1-2+exp1)
+Description: a modern full-3D RTS game engine (unitsync)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package just includes the unitsync part of the game engine.
+
+Package: springrts-unitsync-dbg
+Section: debug
+Architecture: i386 amd64
+Priority: extra
+Depends: ${misc:Depends}, springrts-unitsync (= ${binary:Version})
+Breaks: spring-dbg (<< 0.82.7.1+dfsg1-2+exp1)
+Description: a modern full-3D RTS game engine (unitsync debugging symbols)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package contains the debugging symbols for the unitsync spring
+ binaries.
+
+Package: springrts-javaai
Architecture: all
-Depends: ${misc:Depends}, default-jre, libjna-java, libvecmath-java, spring (>= ${source:Version})
+Depends: ${misc:Depends}, default-jre, libjna-java, libvecmath-java,
+ springrts-engine-default (>= ${source:Version}) | springrts-engine
+ (>= ${source:Version}
Conflicts: spring-engine
+Breaks: spring-javaai (<< 0.82.7.1+dfsg1-2+exp1)
Description: a modern full-3D RTS game engine (Java AIs)
Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
created to bring the gameplay experience of Total Annihilation into 3D.
@@ -86,3 +249,16 @@ Description: a modern full-3D RTS game engine (Java AIs)
This package contains Java based AIs and the spring interface libraries these
require.
+Package: spring-pythonai
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, springrts-engine-default
+ (>= ${source:Version}) | springrts-engine (>= ${source:Version})
+Breaks: ${python:Breaks}
+Conflicts: spring-engine
+Description: a modern full-3D RTS game engine (Python AIs)
+ Spring is a modern full-3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation into 3D.
+ Games are played using one of a number of mods.
+ .
+ This package contains Python based AIs and the spring interface
+ libraries these require.
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 0369a70..24c5e34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,26 +59,13 @@ override_dh_installchangelogs:
+dh_installchangelogs doc/changelog.txt
%:
- +dh $@
+ +dh --with python2 $@
# the following rule gets the original source and creates a dfsg free
# tarball
get-orig-source:
DFSGVER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p'); \
VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p'); \
- TMPDIR=`mktemp --directory`; \
- uscan --force-download --rename --download-version=$$VER --destdir="$$TMPDIR"; \
- cd "$$TMPDIR"; \
- tar xzf spring_$$VER.orig.tar.gz; \
- rm -f spring_$$VER/AI/Interfaces/Java/data/jlib/vecmath.jar \
- spring_$$VER/AI/Interfaces/Java/data/jlib/jna.jar \
- spring_$$VER/installer/7za.exe \
- spring_$$VER/installer/dos2unix.exe \
- spring_$$VER/installer/nsis_plugins/FindProcDLL.dll \
- spring_$$VER/installer/nsis_plugins/inetc.dll \
- spring_$$VER/installer/nsis_plugins/registry.dll; \
- tar czf spring_$$DFSGVER.orig.tar.gz spring_$$VER; \
- cd "$(CURDIR)"; mv "$$TMPDIR/spring_$$DFSGVER.orig.tar.gz" .; \
- rm -rf "$$TMPDIR"
+ uscan --force-download --rename --download-version=$$VER --destdir="$(CURDIR)"
.PHONY: get-orig-source
diff --git a/debian/spring.install b/debian/spring.install
deleted file mode 100644
index 8e154a0..0000000
--- a/debian/spring.install
+++ /dev/null
@@ -1,7 +0,0 @@
-etc
-usr/games
-usr/lib
-usr/share/applications
-usr/share/mime
-usr/share/pixmaps
-usr/share/man
diff --git a/debian/spring-common.install b/debian/springrts-common.install
similarity index 84%
rename from debian/spring-common.install
rename to debian/springrts-common.install
index 515a9f6..141bda9 100644
--- a/debian/spring-common.install
+++ b/debian/springrts-common.install
@@ -1,7 +1,9 @@
+etc
usr/share/games/spring/AI/Skirmish/AAI
usr/share/games/spring/AI/Skirmish/E323AI
usr/share/games/spring/base
usr/share/games/spring/*.*
usr/share/games/spring/fonts
usr/share/games/spring/LuaUI
-
+usr/share/mime
+usr/share/pixmaps
\ No newline at end of file
diff --git a/debian/springrts-default-ai.install b/debian/springrts-default-ai.install
new file mode 100644
index 0000000..b8b8d9b
--- /dev/null
+++ b/debian/springrts-default-ai.install
@@ -0,0 +1 @@
+usr/lib/spring/AI
\ No newline at end of file
diff --git a/debian/springrts-engine-dedicated.install b/debian/springrts-engine-dedicated.install
new file mode 100644
index 0000000..d0f67b9
--- /dev/null
+++ b/debian/springrts-engine-dedicated.install
@@ -0,0 +1,2 @@
+usr/games/spring-dedicated
+usr/share/man/man6/spring-dedicated.6.gz
\ No newline at end of file
diff --git a/debian/springrts-engine-default.install b/debian/springrts-engine-default.install
new file mode 100644
index 0000000..14a49e4
--- /dev/null
+++ b/debian/springrts-engine-default.install
@@ -0,0 +1,3 @@
+usr/games/spring
+usr/share/applications
+usr/share/man/man6/spring.6.gz
\ No newline at end of file
diff --git a/debian/springrts-engine-headless.install b/debian/springrts-engine-headless.install
new file mode 100644
index 0000000..56a951c
--- /dev/null
+++ b/debian/springrts-engine-headless.install
@@ -0,0 +1,2 @@
+usr/games/spring-headless
+usr/share/man/man6/spring-headless.6.gz
\ No newline at end of file
diff --git a/debian/springrts-engine-multithreaded.install b/debian/springrts-engine-multithreaded.install
new file mode 100644
index 0000000..20d5257
--- /dev/null
+++ b/debian/springrts-engine-multithreaded.install
@@ -0,0 +1,2 @@
+usr/games/spring-multithreaded
+usr/share/man/man6/spring-multithreaded.6.gz
diff --git a/debian/springrts-unitsync.install b/debian/springrts-unitsync.install
new file mode 100644
index 0000000..4b94b4f
--- /dev/null
+++ b/debian/springrts-unitsync.install
@@ -0,0 +1,2 @@
+usr/lib/spring/libspringserver.so
+usr/lib/spring/libunitsync.so
\ No newline at end of file
--
advanced 3D real time strategy game engine
More information about the Pkg-games-commits
mailing list