[rbdoom3bfg] annotated tag debian/1.0.3+repack1+git20150625-1 created (now b1f1dd5)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/1.0.3+repack1+git20150625-1 in repository rbdoom3bfg. at b1f1dd5 (tag) tagging 138f263c33ae4893a5eeced90f3c1c30c0d83a41 (commit) replaces debian/1.0.3+repack1-5 tagged by Tobias Frost on Sat Jul 11 10:04:00 2015 +0200 - Log - rbdoom3bfg Debian release 1.0.3+repack1+git20150625-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVoM3wAAoJEJFk+h0XvV02kfoP/0e5tGEX0j5KfgYrNBdo5kvl TBHuOw2BGKfrZFPHBljhbNjxR9a2oaVqcyHPzh8iXzH/sJZtcBlVG1XpOHS+HUjs ztmuNtiDvjDLt4JBqE+vFDE5RcfuL2COAjBsJicp7xlMkr88ePQZJCzUKC3Ig0xq a1FYvJGhkSPgnXH5If8q6qLlJCdYkFWwJFiP2ai3PA3CBF8D2kD54wKFtU2RNOyt Pf3BUndbdzdZQfmBKiPZbKH+7iFzOzYmMOhwH9OccubM1b4IthrjScKrKknFbYjs FtZ6Ac8WBqvMZ6koSci9wAYAEBIh69u+mC6S2lm8xnjnIUkK1e2D4VlTfI2gL8xF aPQcKMjOpaCbKfVwTINy48UG9Bnq312xDjxTxkrIa5w5AyKVeDAhxNi4VgJcze6K sN6wLST1GSYTYIkHkTb5DkQrDvkimNHT+fxGueWq+Q3jZFQ0cgxXUkuokCTav4c9 GdCVio1/8rxAdoCulMh3VYbB1VjLp28CNDbUu3xUzm2h7YAMSYliUzq3tMT296sq 8rrRrcfqiVECXIm9/qwvIJOX/RBkRiL3V6beC0HOX0xWA5AQSNLgSj2ATP68BFnB ou+uWgTmmTg+0kJjgI4RXGiookzUxIcGGKkPOyjTamhCZBC6MW1i6gYt/F1+EmB7 MvxpTQZmScu7sHUNjDxq =WBtO -END PGP SIGNATURE- Tobias Frost (11): Patches 75, 80 and 82 applied upstream Imported Upstream version 1.0.3+repack1+git20150625 Merge tag 'upstream/1.0.3+repack1+git20150625' Refresh 10-lowercase-executeable.patch Remove 75-local-no-precompiled-header.patch -- applied upstream Refresh patch 80-disable-cpu-features.patch, applied mostly upstream Remove 82-enable-hurd-kfreebsd.patch -- applied upstream Update dep3 header of debian/patches/80-disable-cpu-features.patch Work towards reprdoucible builds Reformatting debian/changelog Fix get-orig-target -- order of version components were swapped; and prepare for relase --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (138f263 - 3c6c038)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from 138f263 Fix get-orig-target -- order of version components were swapped; and prepare for relase new 3c6c038 Update dep3 header: 80-disable-cpu-features.patch The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/patches/80-disable-cpu-features.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/01: Update dep3 header: 80-disable-cpu-features.patch
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 3c6c038aa9acdabeadd3200850669773e81752b6 Author: Tobias Frost t...@coldtobi.de Date: Sat Jul 11 10:39:35 2015 +0200 Update dep3 header: 80-disable-cpu-features.patch --- debian/patches/80-disable-cpu-features.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/patches/80-disable-cpu-features.patch b/debian/patches/80-disable-cpu-features.patch index 75b58f8..73409ae 100644 --- a/debian/patches/80-disable-cpu-features.patch +++ b/debian/patches/80-disable-cpu-features.patch @@ -3,9 +3,10 @@ Description: Do not use CPU features like sse and mmx is better to stick to the GCC's default. The patch introduces this by modifying CMakeOptions Author: Tobias Frost t...@debian.org -Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/228 +Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/229 (first submission, partly applied) +Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/234 (remainin part) Applied-Upstream: (partially) https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/9d4c468f087041df78ef5945f7b61397966e8560 -Last-Update: 2015-07-04 +Last-Update: 2015-07-11 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/neo/idlib/sys/sys_intrinsics.h -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/03: Update dep3 header of debian/patches/80-disable-cpu-features.patch
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit d0b7f7c6d39c920f58d84111d8b027c6b3bc8ced Author: Tobias Frost t...@coldtobi.de Date: Sat Jul 4 14:04:23 2015 +0200 Update dep3 header of debian/patches/80-disable-cpu-features.patch --- debian/patches/80-disable-cpu-features.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/80-disable-cpu-features.patch b/debian/patches/80-disable-cpu-features.patch index 1466a4b..75b58f8 100644 --- a/debian/patches/80-disable-cpu-features.patch +++ b/debian/patches/80-disable-cpu-features.patch @@ -4,8 +4,8 @@ Description: Do not use CPU features like sse and mmx The patch introduces this by modifying CMakeOptions Author: Tobias Frost t...@debian.org Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/228 -Applied-Upstream: https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/9d4c468f087041df78ef5945f7b61397966e8560 -Last-Update: 2015-06-24 +Applied-Upstream: (partially) https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/9d4c468f087041df78ef5945f7b61397966e8560 +Last-Update: 2015-07-04 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/neo/idlib/sys/sys_intrinsics.h -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 02/03: Work towards reprdoucible builds
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit d8645da4571b76b4e583927695a2763ffa20332a
Author: Tobias Frost t...@coldtobi.de
Date: Sat Jul 4 15:00:50 2015 +0200
Work towards reprdoucible builds
---
debian/changelog | 1 +
debian/patches/20-reproducible.patch | 61
debian/patches/series| 1 +
3 files changed, 63 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c50f3c3..edcfdef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED;
urgency=medium
* Remove 75-local-no-precompiled-header.patch -- applied upstream
* Refresh patch 80-disable-cpu-features.patch, applied mostly upstream
* Remove 82-enable-hurd-kfreebsd.patch -- applied upstream
+ * Work towards reprdoucible builds
-- Tobias Frost t...@debian.org Sat, 04 Jul 2015 10:09:40 +0200
diff --git a/debian/patches/20-reproducible.patch
b/debian/patches/20-reproducible.patch
new file mode 100644
index 000..2bfb7cb
--- /dev/null
+++ b/debian/patches/20-reproducible.patch
@@ -0,0 +1,61 @@
+Description: Make rbdoom3bfg reproducible
+ by removing the usages of __TIME__ and __DATE__
+Author: Tobias Frost t...@debian.org
+Forwarded: not yet
+Last-Update: 2015-07-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/neo/framework/Common.cpp
b/neo/framework/Common.cpp
+@@ -59,7 +59,7 @@
+ {
+ version_s()
+ {
+- sprintf( string, %s.%d%s %s %s %s, ENGINE_VERSION,
BUILD_NUMBER, BUILD_DEBUG, BUILD_STRING, __DATE__, __TIME__ );
++ sprintf( string, %s.%d%s %s, ENGINE_VERSION, BUILD_NUMBER,
BUILD_DEBUG, BUILD_STRING );
+ }
+ charstring[256];
+ } version;
+--- a/neo/d3xp/Game_local.cpp
b/neo/d3xp/Game_local.cpp
+@@ -315,7 +315,7 @@
+
+ Printf( - Initializing Game --\n );
+ Printf( gamename: %s\n, GAME_VERSION );
+- Printf( gamedate: %s\n, __DATE__ );
++ // Printf( gamedate: %s\n, __DATE__ );
+
+ // register game specific decl types
+ declManager-RegisterDeclType( model,
DECL_MODELDEF, idDeclAllocatoridDeclModelDef );
+--- a/neo/d3xp/gamesys/SysCvar.cpp
b/neo/d3xp/gamesys/SysCvar.cpp
+@@ -43,14 +43,14 @@
+ */
+
+ struct gameVersion_s {
+- gameVersion_s() { sprintf( string, %s.%d%s %s %s %s, ENGINE_VERSION,
BUILD_NUMBER, BUILD_DEBUG, BUILD_STRING, __DATE__, __TIME__ ); }
++ gameVersion_s() { sprintf( string, %s.%d%s %s, ENGINE_VERSION,
BUILD_NUMBER, BUILD_DEBUG, BUILD_STRING ); }
+ charstring[256];
+ } gameVersion;
+
+
+ // noset vars
+ idCVar gamename( gamename,
GAME_VERSION, CVAR_GAME | CVAR_ROM, );
+-idCVar gamedate( gamedate,
__DATE__, CVAR_GAME | CVAR_ROM, );
++//idCVar gamedate(gamedate,
__DATE__, CVAR_GAME | CVAR_ROM, );
+
+ idCVar si_map(si_map,
-1, CVAR_GAME |
CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_INTEGER, default map choice for profile
);
+ idCVar si_mode( si_mode,
-1, CVAR_GAME |
CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_INTEGER, default mode choice for
profile, -1, GAME_COUNT - 1 );
+--- a/neo/idlib/Parser.cpp
b/neo/idlib/Parser.cpp
+@@ -796,8 +796,8 @@
+
+ CONSOLE_COMMAND( TestPreprocessorMacros, check analyze warning, 0 )
+ {
+- idLib::Printf( %s : %s\n, __DATE__, PreProcessorDate().c_str() );
+- idLib::Printf( %s : %s\n, __TIME__, PreProcessorTime().c_str() );
++ idLib::Printf( %s\n, PreProcessorDate().c_str() );
++ idLib::Printf( %s\n, PreProcessorTime().c_str() );
+ }
+
+ /*
diff --git a/debian/patches/series b/debian/patches/series
index 59f554d..476e97d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
10-lowercase-executeable.patch
+20-reproducible.patch
65-init-sdl2.patch
80-disable-cpu-features.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 03/03: Reformatting debian/changelog
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 5fceb26a58ce5194854737f6da70ae4015fb508c Author: Tobias Frost t...@coldtobi.de Date: Sat Jul 4 15:08:20 2015 +0200 Reformatting debian/changelog --- debian/changelog | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index edcfdef..ef38400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED; urgency=medium * New uptream git snapshot. - * Refresh 10-lowercase-executeable.patch - * Remove 75-local-no-precompiled-header.patch -- applied upstream - * Refresh patch 80-disable-cpu-features.patch, applied mostly upstream - * Remove 82-enable-hurd-kfreebsd.patch -- applied upstream + * Refreshing/Removing patches: + - 10-lowercase-executeable.patch refreshed + - 75-local-no-precompiled-header.patch removed, applied upstream + - 80-disable-cpu-features.patch refreshed, almost applied upstream completly + - 82-enable-hurd-kfreebsd.patch removed, applied upstream * Work towards reprdoucible builds -- Tobias Frost t...@debian.org Sat, 04 Jul 2015 10:09:40 +0200 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (32c655c - 5fceb26)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from 32c655c Remove 82-enable-hurd-kfreebsd.patch -- applied upstream new d0b7f7c Update dep3 header of debian/patches/80-disable-cpu-features.patch new d8645da Work towards reprdoucible builds new 5fceb26 Reformatting debian/changelog The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 +++-- debian/patches/20-reproducible.patch | 61 debian/patches/80-disable-cpu-features.patch | 4 +- debian/patches/series| 1 + 4 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 debian/patches/20-reproducible.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 02/06: Merge tag 'upstream/1.0.3+repack1+git20150625'
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 0a2cbdc9b3b513f0859480c4ba3b86971d3c26a2 Merge: 5201950 0ea5e60 Author: Tobias Frost t...@coldtobi.de Date: Sat Jul 4 10:09:15 2015 +0200 Merge tag 'upstream/1.0.3+repack1+git20150625' Upstream version 1.0.3+repack1+git20150625 # gpg: Signature made Sa 04 Jul 2015 10:09:15 CEST using RSA key ID 17BD5D36 # gpg: Good signature from Tobias Frost t...@coldtobi.de # gpg: aka Tobias Frost t...@frost.de # gpg: aka [jpeg image of size 5939] # gpg: aka Tobias Frost t...@debian.org .gitignore | 37 - ChangeLog | 1907 +++ README.txt | 16 + base/renderprogs/interactionSM.pixel|8 +- neo/CMakeLists.txt | 198 ++-- neo/d3xp/SecurityCamera.cpp |2 +- neo/d3xp/ai/AI.cpp |2 +- neo/idlib/CMakeLists.txt| 10 +- neo/idlib/sys/sys_defines.h | 10 +- neo/idlib/sys/sys_intrinsics.h |4 + neo/renderer/RenderProgs_embedded.h |8 +- neo/renderer/RenderSystem_init.cpp |2 + neo/renderer/tr_backend_draw.cpp|2 +- neo/renderer/tr_local.h |2 + neo/sound/XAudio2/XA2_SoundHardware.cpp | 243 ++-- 15 files changed, 2223 insertions(+), 228 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 04/06: Remove 75-local-no-precompiled-header.patch -- applied upstream
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit ad2e8ec954ded087c9664fef06bcb5ad88221954
Author: Tobias Frost t...@coldtobi.de
Date: Sat Jul 4 10:28:18 2015 +0200
Remove 75-local-no-precompiled-header.patch -- applied upstream
---
debian/changelog | 8 +
.../patches/75-local-no-precompiled-header.patch | 267 -
debian/patches/series | 1 -
3 files changed, 8 insertions(+), 268 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 200e00a..013223a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED; urgency=medium
+
+ * New uptream git snapshot.
+ * Refresh 10-lowercase-executeable.patch
+ * Remove 75-local-no-precompiled-header.patch -- applied upstream
+
+ -- Tobias Frost t...@debian.org Sat, 04 Jul 2015 10:09:40 +0200
+
rbdoom3bfg (1.0.3+repack1-5) unstable; urgency=medium
* Generalized Forwarded patch 80-disable-cpu-features.patch
diff --git a/debian/patches/75-local-no-precompiled-header.patch
b/debian/patches/75-local-no-precompiled-header.patch
deleted file mode 100644
index 5dece97..000
--- a/debian/patches/75-local-no-precompiled-header.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-Description: Do not precompile headers
- As this will break ccache (at least without introducing CCACHE_SLOPPINESS)
- Updated to use a CMake option to disable/enable
-Author: Tobias Frost t...@debian.org
-Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/229
-Applied-Upstream:
https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/edc3dfb55ab954894382b375236483aaed4dcc1d
-Last-Update: 2015-06-24
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
a/neo/idlib/CMakeLists.txt
-+++ b/neo/idlib/CMakeLists.txt
-@@ -101,6 +101,7 @@
-
- add_library(idlib ${ID_SOURCES_ALL} ${ID_INCLUDES_ALL})
- else()
-+ if (USE_PRECOMPILED_HEADERS)
- foreach( src_file ${ID_PRECOMPILED_SOURCES} )
- #message(STATUS -include precompiled.h for ${src_file})
- set_source_files_properties(
-@@ -109,9 +110,11 @@
- COMPILE_FLAGS -include
${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h
- )
- endforeach()
--
-+ endif()
-+
- include_directories(.)
-
-+ if (USE_PRECOMPILED_HEADERS)
- # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
- STRING(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} _flags_var_name)
- SET(_compiler_FLAGS ${${_flags_var_name}})
-@@ -119,20 +122,25 @@
- FOREACH(item ${_directory_flags})
- LIST(APPEND _compiler_FLAGS -I${item})
- ENDFOREACH(item)
-+ endif()
-
- GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
- LIST(APPEND _compiler_FLAGS ${_directory_flags})
-
- SEPARATE_ARGUMENTS(_compiler_FLAGS)
-
-+ if (USE_PRECOMPILED_HEADERS)
- add_custom_target(precomp_header_idlib ALL
- COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header precompiled.h -o precompiled.h.gch
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMENT Creating idlib/precompiled.h.gch for idlib
- )
-+ endif()
-
- add_library(idlib ${ID_SOURCES_ALL} ${ID_INCLUDES_ALL})
-+ if (USE_PRECOMPILED_HEADERS)
- add_dependencies(idlib precomp_header_idlib)
-+ endif()
-
- endif()
-
a/neo/CMakeLists.txt
-+++ b/neo/CMakeLists.txt
-@@ -8,6 +8,9 @@
-
- option(MONOLITH
- Embed game logic into main executable ON)
-+
-+option(USE_PRECOMPILED_HEADERS
-+ Use precompiled headers during build ON)
-
- option(SDL2
- Use SDL2 instead of SDL1.2 ON)
-@@ -1347,33 +1364,35 @@
-
- list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
-
-- set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES}
${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs
[rbdoom3bfg] 03/06: Refresh 10-lowercase-executeable.patch
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit a2b8f1b2d3e78f1d1eeef7ba931cb2d573c9d9b8
Author: Tobias Frost t...@coldtobi.de
Date: Sat Jul 4 10:27:33 2015 +0200
Refresh 10-lowercase-executeable.patch
---
debian/patches/10-lowercase-executeable.patch | 29 ++-
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/debian/patches/10-lowercase-executeable.patch
b/debian/patches/10-lowercase-executeable.patch
index 081acf2..794ffe0 100644
--- a/debian/patches/10-lowercase-executeable.patch
+++ b/debian/patches/10-lowercase-executeable.patch
@@ -5,25 +5,26 @@ Forwarded: no, Debian specific
Last-Update: 2014-10-07
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
-@@ -1538,13 +1538,13 @@
- # make sure this is run after creating idlib
- add_dependencies(precomp_header_rbdoom3bfg idlib)
+@@ -1565,14 +1565,14 @@
+ add_dependencies(precomp_header_rbdoom3bfg idlib)
+ endif()
- add_executable(RBDoom3BFG WIN32 ${RBDOOM3_SOURCES})
+ add_executable(rbdoom3bfg WIN32 ${RBDOOM3_SOURCES})
-
- # make sure precompiled header is created before executable is compiled
-- add_dependencies(RBDoom3BFG precomp_header_rbdoom3bfg)
-+ add_dependencies(rbdoom3bfg precomp_header_rbdoom3bfg)
-
- # make sure precompiled header is deleted after executable is compiled
-- add_dependencies(rm_precomp_header RBDoom3BFG)
-+ add_dependencies(rm_precomp_header rbdoom3bfg)
-
+
+ if (USE_PRECOMPILED_HEADERS)
+ # make sure precompiled header is created before executable is
compiled
+- add_dependencies(RBDoom3BFG precomp_header_rbdoom3bfg)
++ add_dependencies(rbdoom3bfg precomp_header_rbdoom3bfg)
+
+ # make sure precompiled header is deleted after executable is
compiled
+- add_dependencies(rm_precomp_header RBDoom3BFG)
++ add_dependencies(rm_precomp_header rbdoom3bfg)
+ endif()
if(NOT WIN32)
-@@ -1556,7 +1556,7 @@
- set(DL_LIBRARY dl)
+@@ -1580,7 +1580,7 @@
+ set(RT_LIBRARY rt)
endif()
- target_link_libraries(RBDoom3BFG
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch pristine-tar updated (28b16f3 - 714c7bf)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch pristine-tar in repository rbdoom3bfg. from 28b16f3 pristine-tar data for rbdoom3bfg_1.0.3+repack1.orig.tar.xz new 714c7bf pristine-tar data for rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.delta | Bin 0 - 31633 bytes rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.delta create mode 100644 rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 06/06: Remove 82-enable-hurd-kfreebsd.patch -- applied upstream
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 32c655c3a74ebdcd341b03a903b635fc88bf2ebe
Author: Tobias Frost t...@coldtobi.de
Date: Sat Jul 4 10:57:35 2015 +0200
Remove 82-enable-hurd-kfreebsd.patch -- applied upstream
---
debian/changelog | 1 +
debian/patches/82-enable-hurd-kfreebsd.patch | 72
debian/patches/series| 1 -
3 files changed, 1 insertion(+), 73 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cb0a434..c50f3c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED;
urgency=medium
* Refresh 10-lowercase-executeable.patch
* Remove 75-local-no-precompiled-header.patch -- applied upstream
* Refresh patch 80-disable-cpu-features.patch, applied mostly upstream
+ * Remove 82-enable-hurd-kfreebsd.patch -- applied upstream
-- Tobias Frost t...@debian.org Sat, 04 Jul 2015 10:09:40 +0200
diff --git a/debian/patches/82-enable-hurd-kfreebsd.patch
b/debian/patches/82-enable-hurd-kfreebsd.patch
deleted file mode 100644
index 628e851..000
--- a/debian/patches/82-enable-hurd-kfreebsd.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Tweak build system to support compilation under kfreebsd and hurd
- The patch focuses to set the compiler flags not accroding to architecture
- but according to the compiler.
-Author: Tobias Frost t...@debian.org
-Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/231
-Applied-Upstream:
https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/8a8deb63fde5286b56600f7f8af60eb4a99cef98
-Last-Update: 2015-06-24
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
a/neo/idlib/sys/sys_defines.h
-+++ b/neo/idlib/sys/sys_defines.h
-@@ -102,7 +102,7 @@
- #endif
-
-
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
-+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) ||
defined(__GNUC__) || defined(__clang__)
-
- #ifndef CPUSTRING
- #if defined(__i386__)
-@@ -120,6 +120,8 @@
- #define BUILD_STRINGlinux-
CPUSTRING
- #elif defined(__APPLE__)
- #define BUILD_STRING osx- CPUSTRING
-+#else
-+#define BUILD_STRING other- CPUSTRING
- #endif
-
- #define _alloca alloca
-@@ -150,6 +152,8 @@
- #define CALLBACK
- #define __cdecl
-
-+#else
-+#error unknown build enviorment
- #endif
- // RB end
-
a/neo/CMakeLists.txt
-+++ b/neo/CMakeLists.txt
-@@ -1423,6 +1423,7 @@
- ${PNG_LIBRARY}
- ${JPEG_LIBRARY}
- ${GLEW_LIBRARY}
-+ ${CMAKE_DL_LIBS}
- )
-
- #CMAKE_BINARY_DIR
-@@ -1579,15 +1580,10 @@
- set(RT_LIBRARY rt)
- endif()
-
-- if(NOT ${CMAKE_SYSTEM} MATCHES FreeBSD)
-- set(DL_LIBRARY dl)
-- endif()
--
- target_link_libraries(rbdoom3bfg
- idlib
- ${OPENGL_LIBRARIES}
- pthread
-- ${DL_LIBRARY}
- ${RT_LIBRARY}
- ${SDLx_LIBRARY}
- ${OPENAL_LIBRARY}
-@@ -1596,6 +1592,7 @@
- ${PNG_LIBRARY}
- ${JPEG_LIBRARY}
- ${GLEW_LIBRARY}
-+ ${CMAKE_DL_LIBS}
- )
- endif()
-
diff --git a/debian/patches/series b/debian/patches/series
index 3468b98..59f554d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
10-lowercase-executeable.patch
65-init-sdl2.patch
80-disable-cpu-features.patch
-82-enable-hurd-kfreebsd.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 05/06: Refresh patch 80-disable-cpu-features.patch, applied mostly upstream
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit d3b9253cf63c41f37b25abdc24cc60928ec397a6
Author: Tobias Frost t...@coldtobi.de
Date: Sat Jul 4 10:53:21 2015 +0200
Refresh patch 80-disable-cpu-features.patch, applied mostly upstream
---
debian/changelog | 1 +
debian/patches/80-disable-cpu-features.patch | 55 +++-
2 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 013223a..cb0a434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED;
urgency=medium
* New uptream git snapshot.
* Refresh 10-lowercase-executeable.patch
* Remove 75-local-no-precompiled-header.patch -- applied upstream
+ * Refresh patch 80-disable-cpu-features.patch, applied mostly upstream
-- Tobias Frost t...@debian.org Sat, 04 Jul 2015 10:09:40 +0200
diff --git a/debian/patches/80-disable-cpu-features.patch
b/debian/patches/80-disable-cpu-features.patch
index b304d4c..1466a4b 100644
--- a/debian/patches/80-disable-cpu-features.patch
+++ b/debian/patches/80-disable-cpu-features.patch
@@ -8,62 +8,17 @@ Applied-Upstream:
https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/9d4c468
Last-Update: 2015-06-24
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
a/neo/CMakeLists.txt
-+++ b/neo/CMakeLists.txt
-@@ -39,6 +39,12 @@
- option(USE_SYSTEM_LIBGLEW
- Use the system libglew instead of the bundled one OFF)
-
-+set(CPU_TYPE CACHE STRING When set, passes this string as CPU-ID which
will be embedded into the binary.)
-+
-+set(CPU_OPTIMIZATION -mmmx -msse -msse2 CACHE STRING Which CPU specific
optimitations should be used beside the compiler's default?)
-+
-+option(USE_INTRINSICS Compile using intrinsics (e.g mmx, sse, msse2) ON)
-+
- if(UNIX)
- set(OPENAL TRUE)
- endif()
-@@ -64,7 +70,15 @@
- #add_definitions(-Wall)
- add_definitions(-Werror=format-security)
- add_definitions(-Werror=format)
-- add_definitions(-mmmx -msse -msse2)
-+ if(CPU_TYPE)
-+ add_definitions(-DCPUSTRING=${CPU_TYPE})
-+ endif()
-+ if (CPU_OPTIMIZATION)
-+ add_definitions(${CPU_OPTIMIZATION})
-+ endif()
-+ if (USE_INTRINSICS)
-+ add_definitions(-DUSE_INTRINSICS)
-+ endif()
- if(WIN32)
- # require msvcr70.dll or newer for _aligned_malloc etc
- # I think it is from Visual C++ .NET 2002, so it should be
available on any remotely modern system.
a/neo/idlib/sys/sys_defines.h
-+++ b/neo/idlib/sys/sys_defines.h
-@@ -104,10 +104,14 @@
-
- #elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
-
-+#ifndef CPUSTRING
- #if defined(__i386__)
- #define CPUSTRING x86
- #elif defined(__x86_64__)
- #define CPUSTRING x86_86
-+#else
-+#error unknown CPU
-+#endif
- #endif
-
- #if defined(__FreeBSD__)
--- a/neo/idlib/sys/sys_intrinsics.h
+++ b/neo/idlib/sys/sys_intrinsics.h
-@@ -29,8 +29,6 @@
+@@ -29,12 +29,6 @@
#ifndef __SYS_INTRIINSICS_H__
#define __SYS_INTRIINSICS_H__
+-#if !defined(USE_INTRINSICS)
+-#if defined(WIN32) || defined(__i386__) || defined(__x86_64__)
-#define USE_INTRINSICS
+-#endif
+-#endif
-
#if defined(USE_INTRINSICS)
#include emmintrin.h
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch upstream updated (4d8a13b - 0ea5e60)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch upstream in repository rbdoom3bfg. from 4d8a13b Imported Upstream version 1.0.3+repack1 new 0ea5e60 Imported Upstream version 1.0.3+repack1+git20150625 The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 37 - ChangeLog | 1907 +++ README.txt | 16 + base/renderprogs/interactionSM.pixel|8 +- neo/CMakeLists.txt | 198 ++-- neo/d3xp/SecurityCamera.cpp |2 +- neo/d3xp/ai/AI.cpp |2 +- neo/idlib/CMakeLists.txt| 10 +- neo/idlib/sys/sys_defines.h | 10 +- neo/idlib/sys/sys_intrinsics.h |4 + neo/renderer/RenderProgs_embedded.h |8 +- neo/renderer/RenderSystem_init.cpp |2 + neo/renderer/tr_backend_draw.cpp|2 +- neo/renderer/tr_local.h |2 + neo/sound/XAudio2/XA2_SoundHardware.cpp | 243 ++-- 15 files changed, 2223 insertions(+), 228 deletions(-) delete mode 100644 .gitignore create mode 100644 ChangeLog -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (5201950 - 32c655c)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from 5201950 Patches 75, 80 and 82 applied upstream new 0ea5e60 Imported Upstream version 1.0.3+repack1+git20150625 new 0a2cbdc Merge tag 'upstream/1.0.3+repack1+git20150625' new a2b8f1b Refresh 10-lowercase-executeable.patch new ad2e8ec Remove 75-local-no-precompiled-header.patch -- applied upstream new d3b9253Refresh patch 80-disable-cpu-features.patch, applied mostly upstream new 32c655c Remove 82-enable-hurd-kfreebsd.patch -- applied upstream The 6 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 37 - ChangeLog | 1907 README.txt | 16 + base/renderprogs/interactionSM.pixel |8 +- debian/changelog | 10 + debian/patches/10-lowercase-executeable.patch | 29 +- .../patches/75-local-no-precompiled-header.patch | 267 --- debian/patches/80-disable-cpu-features.patch | 55 +- debian/patches/82-enable-hurd-kfreebsd.patch | 72 - debian/patches/series |2 - neo/CMakeLists.txt | 198 +- neo/d3xp/SecurityCamera.cpp|2 +- neo/d3xp/ai/AI.cpp |2 +- neo/idlib/CMakeLists.txt | 10 +- neo/idlib/sys/sys_defines.h| 10 +- neo/idlib/sys/sys_intrinsics.h |4 + neo/renderer/RenderProgs_embedded.h|8 +- neo/renderer/RenderSystem_init.cpp |2 + neo/renderer/tr_backend_draw.cpp |2 +- neo/renderer/tr_local.h|2 + neo/sound/XAudio2/XA2_SoundHardware.cpp| 243 ++- 21 files changed, 2253 insertions(+), 633 deletions(-) delete mode 100644 .gitignore create mode 100644 ChangeLog delete mode 100644 debian/patches/75-local-no-precompiled-header.patch delete mode 100644 debian/patches/82-enable-hurd-kfreebsd.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/01: pristine-tar data for rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch pristine-tar in repository rbdoom3bfg. commit 714c7bf2144413c0ee2da570b7ac3d0811b40dac Author: Tobias Frost t...@coldtobi.de Date: Sat Jul 4 10:09:15 2015 +0200 pristine-tar data for rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz --- rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.delta | Bin 0 - 31633 bytes rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.delta b/rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.delta new file mode 100644 index 000..3bf4bbb Binary files /dev/null and b/rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.delta differ diff --git a/rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.id b/rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.id new file mode 100644 index 000..20697ab --- /dev/null +++ b/rbdoom3bfg_1.0.3+repack1+git20150625.orig.tar.xz.id @@ -0,0 +1 @@ +4301e3f4c35881a0f5ee64f73f582c1fa693d8d1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (91226e4 - 5201950)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from 91226e4 Release 1.0.3+repack1-5 new 5201950 Patches 75, 80 and 82 applied upstream The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/patches/75-local-no-precompiled-header.patch | 5 +++-- debian/patches/80-disable-cpu-features.patch| 3 ++- debian/patches/82-enable-hurd-kfreebsd.patch| 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/01: Patches 75, 80 and 82 applied upstream
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 5201950ab5c4c87eecf2d4de3df54539f5a6b2a8 Author: Tobias Frost t...@coldtobi.de Date: Wed Jun 24 18:52:06 2015 +0200 Patches 75, 80 and 82 applied upstream --- debian/patches/75-local-no-precompiled-header.patch | 5 +++-- debian/patches/80-disable-cpu-features.patch| 3 ++- debian/patches/82-enable-hurd-kfreebsd.patch| 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/patches/75-local-no-precompiled-header.patch b/debian/patches/75-local-no-precompiled-header.patch index ccace27..5dece97 100644 --- a/debian/patches/75-local-no-precompiled-header.patch +++ b/debian/patches/75-local-no-precompiled-header.patch @@ -2,8 +2,9 @@ Description: Do not precompile headers As this will break ccache (at least without introducing CCACHE_SLOPPINESS) Updated to use a CMake option to disable/enable Author: Tobias Frost t...@debian.org -Forwarded: no, Debian specific -Last-Update: 2015-06-19 +Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/229 +Applied-Upstream: https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/edc3dfb55ab954894382b375236483aaed4dcc1d +Last-Update: 2015-06-24 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/neo/idlib/CMakeLists.txt diff --git a/debian/patches/80-disable-cpu-features.patch b/debian/patches/80-disable-cpu-features.patch index 86236ac..b304d4c 100644 --- a/debian/patches/80-disable-cpu-features.patch +++ b/debian/patches/80-disable-cpu-features.patch @@ -4,7 +4,8 @@ Description: Do not use CPU features like sse and mmx The patch introduces this by modifying CMakeOptions Author: Tobias Frost t...@debian.org Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/228 -Last-Update: 2015-06-19 +Applied-Upstream: https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/9d4c468f087041df78ef5945f7b61397966e8560 +Last-Update: 2015-06-24 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/neo/CMakeLists.txt diff --git a/debian/patches/82-enable-hurd-kfreebsd.patch b/debian/patches/82-enable-hurd-kfreebsd.patch index 457303e..628e851 100644 --- a/debian/patches/82-enable-hurd-kfreebsd.patch +++ b/debian/patches/82-enable-hurd-kfreebsd.patch @@ -3,7 +3,8 @@ Description: Tweak build system to support compilation under kfreebsd and hurd but according to the compiler. Author: Tobias Frost t...@debian.org Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/231 -Last-Update: 2015-06-21 +Applied-Upstream: https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/8a8deb63fde5286b56600f7f8af60eb4a99cef98 +Last-Update: 2015-06-24 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/neo/idlib/sys/sys_defines.h -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/01: Need to add for kfreebsd
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit d5efe704e74a2df989331d2128e43b53830db20a
Author: Tobias Frost t...@coldtobi.de
Date: Sun Jun 21 16:40:08 2015 +0200
Need to add
for kfreebsd
---
debian/patches/82-enable-hurd-kfreebsd.patch | 29
1 file changed, 29 insertions(+)
diff --git a/debian/patches/82-enable-hurd-kfreebsd.patch
b/debian/patches/82-enable-hurd-kfreebsd.patch
index 6f5c556..904d6d9 100644
--- a/debian/patches/82-enable-hurd-kfreebsd.patch
+++ b/debian/patches/82-enable-hurd-kfreebsd.patch
@@ -35,3 +35,32 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
#endif
// RB end
+--- a/neo/CMakeLists.txt
b/neo/CMakeLists.txt
+@@ -1423,6 +1423,7 @@
+ ${PNG_LIBRARY}
+ ${JPEG_LIBRARY}
+ ${GLEW_LIBRARY}
++ ${CMAKE_DL_LIBS}
+ )
+
+ #CMAKE_BINARY_DIR
+@@ -1579,10 +1580,6 @@
+ set(RT_LIBRARY rt)
+ endif()
+
+- if(NOT ${CMAKE_SYSTEM} MATCHES FreeBSD)
+- set(DL_LIBRARY dl)
+- endif()
+-
+ target_link_libraries(rbdoom3bfg
+ idlib
+ ${OPENGL_LIBRARIES}
+@@ -1596,6 +1593,7 @@
+ ${PNG_LIBRARY}
+ ${JPEG_LIBRARY}
+ ${GLEW_LIBRARY}
++ ${CMAKE_DL_LIBS}
+ )
+ endif()
+
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (1cc8c6b - d5efe70)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from 1cc8c6b New patch: Try to compile on hurd and kfreebsd as well new d5efe70 Need to add for kfreebsd The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/patches/82-enable-hurd-kfreebsd.patch | 29 1 file changed, 29 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/01: DL_LIBARIES is not needed
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 49019349c1d5f6cab5e2b0ba43cee8f2604f0629
Author: Tobias Frost t...@coldtobi.de
Date: Sun Jun 21 16:51:31 2015 +0200
DL_LIBARIES is not needed
---
debian/patches/82-enable-hurd-kfreebsd.patch | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/patches/82-enable-hurd-kfreebsd.patch
b/debian/patches/82-enable-hurd-kfreebsd.patch
index 904d6d9..154dd02 100644
--- a/debian/patches/82-enable-hurd-kfreebsd.patch
+++ b/debian/patches/82-enable-hurd-kfreebsd.patch
@@ -45,7 +45,7 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
)
#CMAKE_BINARY_DIR
-@@ -1579,10 +1580,6 @@
+@@ -1579,15 +1580,10 @@
set(RT_LIBRARY rt)
endif()
@@ -56,7 +56,12 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
target_link_libraries(rbdoom3bfg
idlib
${OPENGL_LIBRARIES}
-@@ -1596,6 +1593,7 @@
+ pthread
+- ${DL_LIBRARY}
+ ${RT_LIBRARY}
+ ${SDLx_LIBRARY}
+ ${OPENAL_LIBRARY}
+@@ -1596,6 +1592,7 @@
${PNG_LIBRARY}
${JPEG_LIBRARY}
${GLEW_LIBRARY}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (d5efe70 - 4901934)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from d5efe70 Need to add for kfreebsd new 4901934 DL_LIBARIES is not needed The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/patches/82-enable-hurd-kfreebsd.patch | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 02/02: Release 1.0.3+repack1-5
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 91226e46b2e680389feaf1bd8acf18c6f9fd58ed Author: Tobias Frost t...@coldtobi.de Date: Sun Jun 21 17:24:03 2015 +0200 Release 1.0.3+repack1-5 --- debian/changelog | 10 ++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9d63a3d..200e00a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +rbdoom3bfg (1.0.3+repack1-5) unstable; urgency=medium + + * Generalized Forwarded patch 80-disable-cpu-features.patch + * Modified d/rules to utilize this patch and enable mmx, sse and co on amd64 + * Refactor patch to disable precompiled headers be upstreamable + * Add --as-needed to linker flags + * New patch: Try to compile on hurd and kfreebsd as well + + -- Tobias Frost t...@debian.org Sun, 21 Jun 2015 17:23:43 +0200 + rbdoom3bfg (1.0.3+repack1-4) unstable; urgency=medium * Again, patch incomplete. Now also submitting the cpu information. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/02: patch forwarded
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 9037c72281557c32d4ca3bc11bc8a79a5dc764d7 Author: Tobias Frost t...@coldtobi.de Date: Sun Jun 21 17:16:58 2015 +0200 patch forwarded --- debian/patches/82-enable-hurd-kfreebsd.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/82-enable-hurd-kfreebsd.patch b/debian/patches/82-enable-hurd-kfreebsd.patch index 154dd02..457303e 100644 --- a/debian/patches/82-enable-hurd-kfreebsd.patch +++ b/debian/patches/82-enable-hurd-kfreebsd.patch @@ -2,7 +2,7 @@ Description: Tweak build system to support compilation under kfreebsd and hurd The patch focuses to set the compiler flags not accroding to architecture but according to the compiler. Author: Tobias Frost t...@debian.org -Forwarded: not-yet +Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/231 Last-Update: 2015-06-21 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] annotated tag debian/1.0.3+repack1-5 created (now e76512e)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/1.0.3+repack1-5 in repository rbdoom3bfg. at e76512e (tag) tagging 91226e46b2e680389feaf1bd8acf18c6f9fd58ed (commit) replaces debian/1.0.3+repack1-4 tagged by Tobias Frost on Sun Jun 21 20:32:34 2015 +0200 - Log - rbdoom3bfg Debian release 1.0.3+repack1-5 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVhwNCAAoJEJFk+h0XvV02dNUQAN06WcBXObnk59fE4ko0CEWm LBcs/1HXf4W1OqBedN7Ade0Has/d03vIkSL0ekIP2HFoGuciARwvrzGrK8PPhXJI BDs2tL9Msiv/dUAqTj9WhKAs1qiZko2/LpBfY2hXD1JbKxNq7kRpNa3Eypvhd+TQ QmWesUbjessvzI3E3NPMSjhDIL8DjSIDXx+ZeQnyCZZC/5LYW3wFGH1HALMz9evt fQ116+bzz7eu8mlOK+9JgueC39lttpPjrwiXEC5UukNMG2BMMr6G2UUek6vTh/7j SOW9l93iYs68EL+fUvQWrIJwvSDJrZ0QeTfxSUFwcuJEuczzht0s5YC8Gs91pZUC 5HQ8yy3ohyQbhkx35l82OOyn6layeHcX+WQFVGUnhYLqF/IqJqA/2bQ6PwxSwjJ1 yqCm0yuhZORbiJOUuYMwwBM916l3lPiUzL6L9ncqMA6Tlgnvk9eZUsKk848A15kT HipvZx/zz00WMGnDl+dDOSvgBo/hyVLmGVDcIm+oCAAgKnlUDckcaAel3fk+nkMV KDgGcm+QzaNavj8kVrXIPSBnMGHYJzoP/+TZxQxYvuB6mNxFF10HUrhIEBlcI1aC dXVev4L99/1WmJAzYKRLv7R+MYLzAMJ60f9po9hPQagaKoq+TKGcuiz62DkPiFdV BCpL/iCJwfQKen0KZS0L =8cmU -END PGP SIGNATURE- Tobias Frost (13): 80-disable-cpu-features.patch refined forwarded 80-disable-cpu-features.patch refined forwarded, tweaked d/rules to use it Merge branch 'master' of ssh://git.debian.org/git/pkg-games/rbdoom3bfg Last commit broke patch... Repaired now Refactor patch to disable precompiled headers -- making it ready to be upstreamable Adding missing chagne to patch to disable CPU Features Allow mmx, sse and co for amd64 Add --as-needed linking flag New patch: Try to compile on hurd and kfreebsd as well Need to add DL_LIBARIES is not needed patch forwarded Release 1.0.3+repack1-5 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (4901934 - 91226e4)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from 4901934 DL_LIBARIES is not needed new 9037c72 patch forwarded new 91226e4 Release 1.0.3+repack1-5 The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 ++ debian/patches/82-enable-hurd-kfreebsd.patch | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 02/02: New patch: Try to compile on hurd and kfreebsd as well
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 1cc8c6bc2ae518ee958929965b0acaeafae6ff86 Author: Tobias Frost t...@coldtobi.de Date: Sun Jun 21 11:17:21 2015 +0200 New patch: Try to compile on hurd and kfreebsd as well --- debian/patches/82-enable-hurd-kfreebsd.patch | 37 debian/patches/series| 1 + 2 files changed, 38 insertions(+) diff --git a/debian/patches/82-enable-hurd-kfreebsd.patch b/debian/patches/82-enable-hurd-kfreebsd.patch new file mode 100644 index 000..6f5c556 --- /dev/null +++ b/debian/patches/82-enable-hurd-kfreebsd.patch @@ -0,0 +1,37 @@ +Description: Tweak build system to support compilation under kfreebsd and hurd + The patch focuses to set the compiler flags not accroding to architecture + but according to the compiler. +Author: Tobias Frost t...@debian.org +Forwarded: not-yet +Last-Update: 2015-06-21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/neo/idlib/sys/sys_defines.h b/neo/idlib/sys/sys_defines.h +@@ -102,7 +102,7 @@ + #endif + + +-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) ++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__GNUC__) || defined(__clang__) + + #ifndef CPUSTRING + #if defined(__i386__) +@@ -120,6 +120,8 @@ + #define BUILD_STRINGlinux- CPUSTRING + #elif defined(__APPLE__) + #define BUILD_STRING osx- CPUSTRING ++#else ++#define BUILD_STRING other- CPUSTRING + #endif + + #define _alloca alloca +@@ -150,6 +152,8 @@ + #define CALLBACK + #define __cdecl + ++#else ++#error unknown build enviorment + #endif + // RB end + diff --git a/debian/patches/series b/debian/patches/series index 4d5f6c3..57b4e22 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 65-init-sdl2.patch 75-local-no-precompiled-header.patch 80-disable-cpu-features.patch +82-enable-hurd-kfreebsd.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/02: Add --as-needed linking flag
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit f172940ff308ece243e740d6d4c77cac91620131 Author: Tobias Frost t...@coldtobi.de Date: Sun Jun 21 11:16:40 2015 +0200 Add --as-needed linking flag --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index fa677d2..744a635 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,8 @@ # output every command that modifies files on the build system. #DH_VERBOSE = 1 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) CMAKE_ADDTIONAL_FLAGS ?= -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (d3641a8 - 1cc8c6b)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from d3641a8 Allow mmx, sse and co for amd64 new f172940 Add --as-needed linking flag new 1cc8c6b New patch: Try to compile on hurd and kfreebsd as well The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/patches/82-enable-hurd-kfreebsd.patch | 37 debian/patches/series| 1 + debian/rules | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 debian/patches/82-enable-hurd-kfreebsd.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 02/02: Adding missing chagne to patch to disable CPU Features
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 89af242c742a1244e21ff33ba8f54280085749ac Author: Tobias Frost t...@coldtobi.de Date: Sat Jun 20 23:22:16 2015 +0200 Adding missing chagne to patch to disable CPU Features --- debian/patches/80-disable-cpu-features.patch | 11 +++ 1 file changed, 11 insertions(+) diff --git a/debian/patches/80-disable-cpu-features.patch b/debian/patches/80-disable-cpu-features.patch index ebf1c59..86236ac 100644 --- a/debian/patches/80-disable-cpu-features.patch +++ b/debian/patches/80-disable-cpu-features.patch @@ -56,3 +56,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #endif #if defined(__FreeBSD__) +--- a/neo/idlib/sys/sys_intrinsics.h b/neo/idlib/sys/sys_intrinsics.h +@@ -29,8 +29,6 @@ + #ifndef __SYS_INTRIINSICS_H__ + #define __SYS_INTRIINSICS_H__ + +-#define USE_INTRINSICS +- + #if defined(USE_INTRINSICS) + #include emmintrin.h + #endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/02: Refactor patch to disable precompiled headers -- making it ready to be upstreamable
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 49254431f6850cfc81f1da8325f13c4d7eae1a9a
Author: Tobias Frost t...@coldtobi.de
Date: Fri Jun 19 21:51:20 2015 +0200
Refactor patch to disable precompiled headers -- making it ready to be
upstreamable
---
.../patches/75-local-no-precompiled-header.patch | 291 ++---
debian/patches/80-disable-cpu-features.patch | 4 +-
debian/rules | 5 +-
3 files changed, 204 insertions(+), 96 deletions(-)
diff --git a/debian/patches/75-local-no-precompiled-header.patch
b/debian/patches/75-local-no-precompiled-header.patch
index 26f3258..ccace27 100644
--- a/debian/patches/75-local-no-precompiled-header.patch
+++ b/debian/patches/75-local-no-precompiled-header.patch
@@ -1,79 +1,150 @@
Description: Do not precompile headers
As this will break ccache (at least without introducing CCACHE_SLOPPINESS)
+ Updated to use a CMake option to disable/enable
Author: Tobias Frost t...@debian.org
Forwarded: no, Debian specific
-Last-Update: 2014-10-07
+Last-Update: 2015-06-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/neo/idlib/CMakeLists.txt
+++ b/neo/idlib/CMakeLists.txt
-@@ -101,38 +101,38 @@
+@@ -101,6 +101,7 @@
add_library(idlib ${ID_SOURCES_ALL} ${ID_INCLUDES_ALL})
else()
-- foreach( src_file ${ID_PRECOMPILED_SOURCES} )
-- #message(STATUS -include precompiled.h for ${src_file})
-- set_source_files_properties(
-- ${src_file}
-- PROPERTIES
-- COMPILE_FLAGS -include
${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h
-- )
-- endforeach()
++ if (USE_PRECOMPILED_HEADERS)
+ foreach( src_file ${ID_PRECOMPILED_SOURCES} )
+ #message(STATUS -include precompiled.h for ${src_file})
+ set_source_files_properties(
+@@ -109,9 +110,11 @@
+ COMPILE_FLAGS -include
${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h
+ )
+ endforeach()
-
-+##foreach( src_file ${ID_PRECOMPILED_SOURCES} )
-+###message(STATUS -include precompiled.h for ${src_file})
-+##set_source_files_properties(
-+##${src_file}
-+##PROPERTIES
-+##COMPILE_FLAGS -include
${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h
-+##)
-+##endforeach()
-+##
++ endif()
++
include_directories(.)
-- # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
-- STRING(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} _flags_var_name)
-- SET(_compiler_FLAGS ${${_flags_var_name}})
-- GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
-- FOREACH(item ${_directory_flags})
-- LIST(APPEND _compiler_FLAGS -I${item})
-- ENDFOREACH(item)
-+### precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
-+##STRING(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} _flags_var_name)
-+##SET(_compiler_FLAGS ${${_flags_var_name}})
-+##GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
-+##FOREACH(item ${_directory_flags})
-+##LIST(APPEND _compiler_FLAGS -I${item})
-+##ENDFOREACH(item)
++ if (USE_PRECOMPILED_HEADERS)
+ # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
+ STRING(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} _flags_var_name)
+ SET(_compiler_FLAGS ${${_flags_var_name}})
+@@ -119,20 +122,25 @@
+ FOREACH(item ${_directory_flags})
+ LIST(APPEND _compiler_FLAGS -I${item})
+ ENDFOREACH(item)
++ endif()
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
LIST(APPEND _compiler_FLAGS ${_directory_flags})
SEPARATE_ARGUMENTS(_compiler_FLAGS)
-- add_custom_target(precomp_header_idlib ALL
--COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header precompiled.h -o precompiled.h.gch
--WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--COMMENT Creating idlib/precompiled.h.gch for idlib
--)
-+##add_custom_target(precomp_header_idlib ALL
-+## COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header precompiled.h -o precompiled.h.gch
-+## WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+## COMMENT Creating idlib/precompiled.h.gch for idlib
-+## )
++ if (USE_PRECOMPILED_HEADERS)
+ add_custom_target(precomp_header_idlib ALL
+ COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header precompiled.h -o precompiled.h.gch
[rbdoom3bfg] branch master updated (e62abe5 - 89af242)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from e62abe5 Last commit broke patch... Repaired now new 4925443 Refactor patch to disable precompiled headers -- making it ready to be upstreamable new 89af242 Adding missing chagne to patch to disable CPU Features The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .../patches/75-local-no-precompiled-header.patch | 291 ++--- debian/patches/80-disable-cpu-features.patch | 15 +- debian/rules | 5 +- 3 files changed, 215 insertions(+), 96 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (89af242 - d3641a8)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from 89af242 Adding missing chagne to patch to disable CPU Features new d3641a8 Allow mmx, sse and co for amd64 The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/rules | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 02/02: Merge branch 'master' of ssh://git.debian.org/git/pkg-games/rbdoom3bfg
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit c25835014d09d7304ea363e5176cf5ed13149a9a Merge: 3dca85b e18fffc Author: Tobias Frost t...@coldtobi.de Date: Fri Jun 19 16:20:57 2015 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-games/rbdoom3bfg -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (e18fffc - c258350)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from e18fffc 80-disable-cpu-features.patch refined forwarded new 3dca85b 80-disable-cpu-features.patch refined forwarded, tweaked d/rules to use it new c258350 Merge branch 'master' of ssh://git.debian.org/git/pkg-games/rbdoom3bfg The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/02: 80-disable-cpu-features.patch refined forwarded, tweaked d/rules to use it
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 3dca85b5ffd473d3afc889274361f8bde1cc084e
Author: Tobias Frost t...@coldtobi.de
Date: Fri Jun 19 16:20:16 2015 +0200
80-disable-cpu-features.patch refined forwarded, tweaked d/rules to use it
---
debian/patches/80-disable-cpu-features.patch | 141 ++-
debian/rules | 2 +-
2 files changed, 137 insertions(+), 6 deletions(-)
diff --git a/debian/patches/80-disable-cpu-features.patch
b/debian/patches/80-disable-cpu-features.patch
index fa21121..59706de 100644
--- a/debian/patches/80-disable-cpu-features.patch
+++ b/debian/patches/80-disable-cpu-features.patch
@@ -1,25 +1,156 @@
Description: Do not use CPU features like sse and mmx
Those features are not guaranteed to be supported even on i386/amd64, so it
is better to stick to the GCC's default.
+ The patch introduces this by modifying CMakeOptions
Author: Tobias Frost t...@debian.org
-Forwarded: not-needed, Debian specific
-Last-Update: 2015-06-12
+Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/228
+Last-Update: 2015-06-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
-@@ -61,7 +61,10 @@
+@@ -36,6 +36,12 @@
+ option(USE_SYSTEM_LIBGLEW
+ Use the system libglew instead of the bundled one OFF)
+
++set(CPU_TYPE CACHE STRING When set, passes this string as CPU-ID which
will be embedded into the binary.)
++
++set(CPU_OPTIMIZATION -mmmx -msse -msse2 CACHE STRING Which CPU specific
optimitations should be used beside the compiler's default?)
++
++option(USE_INTRINSICS Compile using intrinsics (e.g mmx, sse, msse2) ON)
++
+ if(UNIX)
+ set(OPENAL TRUE)
+ endif()
+@@ -61,7 +67,15 @@
#add_definitions(-Wall)
add_definitions(-Werror=format-security)
add_definitions(-Werror=format)
- add_definitions(-mmmx -msse -msse2)
-+# add_definitions(-mmmx -msse -msse2)
+ if(CPU_TYPE)
+ add_definitions(-DCPUSTRING=${CPU_TYPE})
+ endif()
++ if (CPU_OPTIMIZATION)
++ add_definitions(${CPU_OPTIMIZATION})
++ endif()
++ if (USE_INTRINSICS)
++ add_definitions(-DUSE_INTRINSICS)
++ endif()
if(WIN32)
# require msvcr70.dll or newer for _aligned_malloc etc
# I think it is from Visual C++ .NET 2002, so it should be
available on any remotely modern system.
+@@ -78,12 +92,12 @@
+ #endif()
+
+ # the warnings are used for every profile anyway, so put them in a
variable
+- set(my_warn_flags -Wno-pragmas -Wno-unused-variable
-Wno-unused-but-set-variable -Wno-switch -Wno-unused-value -Winvalid-pch
-Wno-multichar)
++ set(my_warn_flags -Wno-pragmas -Wno-unused-variable -Wno-switch
-Wno-unused-value -Winvalid-pch -Wno-multichar)
+
+ if(CMAKE_C_COMPILER_ID STREQUAL Clang)
+ # append clang-specific settings for warnings (the second one
make sure clang doesn't complain
+ # about unknown -W flags, like -Wno-unused-but-set-variable)
+- set(my_warn_flags ${my_warn_flags}
-Wno-local-type-template-args -Wno-unknown-warning-option
-Wno-inline-new-delete)
++ set(my_warn_flags ${my_warn_flags}
-Wno-local-type-template-args -Wno-unknown-warning-option
-Wno-inline-new-delete -Wno-switch-enum)
+ endif()
+
+ if(NOT CMAKE_CROSSCOMPILING AND ONATIVE)
+@@ -1491,22 +1505,22 @@
+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
+
+-##foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
+-###message(STATUS -include precompiled.h for ${src_file})
+-##set_source_files_properties(
+-##${src_file}
+-##PROPERTIES
+-##COMPILE_FLAGS -include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h
+-##)
+-##endforeach()
+-
+-### precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
+-##STRING(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} _flags_var_name)
+-##SET(_compiler_FLAGS ${${_flags_var_name}})
+-##GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
+-##FOREACH(item ${_directory_flags})
+-##LIST(APPEND _compiler_FLAGS -I${item})
+-##ENDFOREACH(item)
++ foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
++ #message(STATUS -include precompiled.h for ${src_file})
++ set_source_files_properties(
++ ${src_file}
++ PROPERTIES
++ COMPILE_FLAGS -include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h
[trigger-rally-data] annotated tag debian/0.6.1-1 created (now 7dccea6)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/0.6.1-1 in repository trigger-rally-data. at 7dccea6 (tag) tagging 1880f362b9764c1a721096596c2fab33deca131f (commit) replaces debian/0.6.1-0.1 tagged by Tobias Frost on Fri Jun 19 13:06:17 2015 +0200 - Log - trigger-rally-data Debian release 0.6.1-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVg/epAAoJEJFk+h0XvV02YAMP/imyX5CgaHjDjw+UlO4itTXd KlO0pAyxGToh8sBIE7IPOjHTPed+kszR2YUwt7MwD7WDFlwBDs2jRelo6kGAsxnV iF03IidLm00+kZWftTVeGlOjZkUoFqqf7EACWAvPv4FjQcFO8oCKcJvn5+EadKXP PTLNJwlHtcPKZF6HA0ZQ0SqJcZKSDjFIjeVRXU31lcCEBzy+A0JLBADdjkGSU139 /RFDqDwN6sDAq0hadZixkE4+XkBfdyDTvPBWxxcAG41N1ls+Zop3sDMNCURo6Axj H31UjylIZzYWcn+KtN1V9n8u/CXni9RDxDn+zbbxeIGdGYN8HJOwoJfl+hba4RPx N5f6Cg09nA98YC7bKLADo+t7SA26xdKOjXfV8F/82vPL5fx/FOgLv90rwmDdftVb Fc+ihRE8FrhrYD84wDLopzOsWg4jsaRX8/2Ztn0GhR6ncJlOkYJA3Ncpmao5T+nZ BI8Kgveg5TZk+J0cQwUpM2U8x3395JWR2wH1oOuAsIyRkGVLeipgCaR4dawtm7y0 gVrZWV1KEHQSIqz+CtmeGbMFrGNnNbRgaNtPD8A1OvUiqlcdZHVVu8MsGDMx6he1 yYr2qyEc4YbRYMCNHRhc9qUg1DeMP8uesMzZKpNJPg/7a7atfGXJVgCRJP3spcWw 97EBiApbCyheUhxykZiz =5P6R -END PGP SIGNATURE- Tobias Frost (8): Change packaging repository to git. Remove obsolete DM-Upload-Allowed from d/control Fix homepage in debian/control SV to 3.9.6 Switch debian/compat to 9 d/copyright: - Simplify d/rules using short debhelper format: Release 0.6.1-1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] branch master updated (1880f36 - 70cda3b)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository trigger-rally-data. from 1880f36 Release 0.6.1-1 new 70cda3b Repair watch file The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 +++ debian/watch | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] 01/01: Repair watch file
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit 70cda3b6a426fa787d6a41a39ae1fb7a00753d2f Author: Tobias Frost t...@coldtobi.de Date: Fri Jun 19 13:30:35 2015 +0200 Repair watch file --- debian/changelog | 7 +++ debian/watch | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 309bbde..a32abfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +trigger-rally-data (0.6.1-2) UNRELEASED; urgency=medium + + * Team upload + * Repair watch-file + + -- Tobias Frost t...@debian.org Fri, 19 Jun 2015 13:29:58 +0200 + trigger-rally-data (0.6.1-1) unstable; urgency=medium * Team upload. diff --git a/debian/watch b/debian/watch index 226ec7c..dc10e15 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://sf.net/trigger-rally/trigger-(\d+\..+)-data\.tar\.bz2 +http://sf.net/trigger-rally/trigger-rally-(\d\S*)-data\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] 03/05: d/copyright: - Rewrite using machine readable format - Complete copyright information (Closes: #784343)
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit cf0fff00e57b82965654aec125723c3a9d40fa67 Author: Tobias Frost t...@coldtobi.de Date: Fri Jun 19 11:49:25 2015 +0200 d/copyright: - Rewrite using machine readable format - Complete copyright information (Closes: #784343) --- debian/changelog | 3 + debian/copyright | 243 +-- 2 files changed, 223 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5102626..e9a63d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium d/control no change was necessary. * Fix homepage in debian/control * Switch debian/compat to 9 + * d/copyright: + - Rewrite using machine readable format + - Complete copyright information (Closes: #784343) -- Tobias Frost t...@debian.org Thu, 18 Jun 2015 19:49:07 +0200 diff --git a/debian/copyright b/debian/copyright index a01e240..d48ef1b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,29 +1,226 @@ -This package was debianized by Stefan Potyra sistp...@ubuntu.com on -Fri, 17 Feb 2006 00:16:05 +0100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: trigger-rally +Source: https://sourceforge.net/projects/trigger-rally/files/ -It was downloaded from http://www.positro.net/trigger/#downloads +Files: * +Copyright: Jasmine Langridge + Richard Langridge + Matthias Keysermann + Agnius Vasiliauskas + David Pagnier + Bruno Fuddl Kleinert + Jared Buckner + Laxminarayan G Kamath A + Marcio Bremm + Matthias Keysermann + Viktor Radnai + Tim Wintle + Andreas Rosdal + Ishmael Turner + Iwan 'qubodup' Gabovitch + Onsemeliot onsemel...@riseup.net + URW++ + Liviu Andronic + Mysteryem + Farrer +License: GPL-2+ +Comment: The subdir data has been stripped from the path in the tarball. +License-Grant: + Author and licence info for files under data/ directory. + GPL = GNU General Public License v2 or later ( http://www.gnu.org/licenses/gpl.txt ) + CC0 (PD) = Creative Commons Zero 1.0 Universal Public Domain Dedication ( http://creativecommons.org/publicdomain/zero/1.0/ ) -Copyright (C) 2004-2006 Jasmine Langridge and Richard Langridge. +Files: sounds/gear.wav + sounds/bang.wav + textures/life_helmet.png + textures/dial_gear.png + textures/veg/grass-sprite.png + textures/veg/palmy.png + textures/noise.png + sounds/wind.wav + sounds/gravel.wav +Copyright: kougloff + Iwan Gabovitch + Liviu Andronic + yughues + Quargzon + cognito perceptu +License-Grant: + Author and licence info for files under data/ directory. + GPL = GNU General Public License v2 or later ( http://www.gnu.org/licenses/gpl.txt ) + CC0 (PD) = Creative Commons Zero 1.0 Universal Public Domain Dedication ( http://creativecommons.org/publicdomain/zero/1.0/ ) +License: CC0 +Files: textures/splash/endgame.jpg + textures/splash/splash.jpg +Copyright: Iwan Gabovitch +License: non-copyrightable + Not copyrightable (temporary black images) -License: +Files: debian/* +Copyright: 2006-2015 Stefan Potyra sistp...@ubuntu.com + 2015 Tobias Frost t...@debian.org +License: GPL-2+ -Trigger is released under the GPL (see gpl.txt in -source package, or http://www.gnu.org/licenses/gpl.txt ). +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + In addition, as a special exception, the author of this + program gives permission to link the code of its + release with the OpenSSL project's OpenSSL library (or + with modified versions of it that use the same license as + the OpenSSL library), and distribute the linked + executables. You must obey the GNU General Public + License in all respects for all of the code used other + than OpenSSL. If you modify this file, you may extend + this exception to your version of the file, but you are + not obligated to do so. If you do not wish to do so, + delete this exception statement from your version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA
[trigger-rally-data] 04/05: - Simplify d/rules using short debhelper format: - Install files using d/install, removing non-existant dir fonts - Make links using d/links - d/dirs is not required - remo
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit 53d8b724714d7eab3715c7df074d580b0da850d4 Author: Tobias Frost t...@coldtobi.de Date: Fri Jun 19 12:57:15 2015 +0200 - Simplify d/rules using short debhelper format: - Install files using d/install, removing non-existant dir fonts - Make links using d/links - d/dirs is not required - remove compatibility link, as the affected package is only in o-o-stable - make symlink from README.txt.gz to Changelog.gz -- as it contains the changelog. --- debian/changelog | 7 ++ debian/dirs | 2 -- debian/install | 7 ++ debian/links | 2 ++ debian/rules | 72 +++- 5 files changed, 19 insertions(+), 71 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9a63d4..58c5dc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,13 @@ trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium d/control no change was necessary. * Fix homepage in debian/control * Switch debian/compat to 9 + - Simplify d/rules using short debhelper format: + - Install files using d/install, removing non-existant dir fonts + - Make links using d/links + - d/dirs is not required + - remove compatibility link, as the affected package is only in o-o-stable + - make symlink from README.txt.gz to Changelog.gz -- as it contains the + changelog. * d/copyright: - Rewrite using machine readable format - Complete copyright information (Closes: #784343) diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 8c14964..000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -/usr/share/games/trigger-rally -/etc diff --git a/debian/install b/debian/install new file mode 100644 index 000..1f1e93f --- /dev/null +++ b/debian/install @@ -0,0 +1,7 @@ +events/usr/share/games/trigger-rally +maps/ usr/share/games/trigger-rally +plugins/ usr/share/games/trigger-rally +sounds/usr/share/games/trigger-rally +textures/ usr/share/games/trigger-rally +trigger.config.defs etc +vehicles/ usr/share/games/trigger-rally diff --git a/debian/links b/debian/links new file mode 100644 index 000..c38fdd9 --- /dev/null +++ b/debian/links @@ -0,0 +1,2 @@ +etc/trigger.config.defs usr/share/games/trigger-rally/trigger.config.defs +usr/share/doc/trigger-rally-data/README.txt.gz usr/share/doc/trigger-rally-data/changelog.gz diff --git a/debian/rules b/debian/rules index 7c1bad4..a64c50d 100755 --- a/debian/rules +++ b/debian/rules @@ -5,81 +5,15 @@ DATADIR=usr/share/games/trigger-rally # package name PACKAGE=trigger-rally-data -# top-level dirs that are installed -INSTALLDIRS=events \ - fonts \ - maps\ - plugins \ - sounds \ - textures\ - vehicles - -# game data that is shipped executable but shouldn't be -EXECUTABLE_GAME_DATA= \ - maps/greengrounds/colormap.jpg \ - maps/mountainpass/heightmap.png \ - maps/mountainpass/foliagemap.png\ - maps/mountainpass/colormap.jpg \ - maps/greengrounds/greengrounds.level\ - maps/mountainpass/mountainpass.level\ - maps/greengrounds/foliagemap.png\ - maps/greengrounds/heightmap.png # top-level files that go to /etc and are linked to # DATADIR LINKEDCONFFILES=trigger.config.defs -clean: - dh_testdir - dh_testroot - dh_clean --exclude=vehicles/seat/seat.vehicle.orig - -install: - dh_testdir - dh_testroot - dh_clean --exclude=vehicles/seat/seat.vehicle.orig - dh_installdirs - - # manually installing all files - for i in $(INSTALLDIRS); do \ - cp -r $$i debian/$(PACKAGE)/$(DATADIR); \ - done - for i in $(LINKEDCONFFILES); do \ - cp -r $$i debian/$(PACKAGE)/etc;\ - dh_link etc/$$i $(DATADIR)/$$i; \ - done - # fix execute permissions for - for i in $(EXECUTABLE_GAME_DATA); do\ - chmod ugo-x debian/$(PACKAGE)/$(DATADIR)/$$i; \ - done +%: + dh $@ +override_dh_fixperms: cd debian/$(PACKAGE)/$(DATADIR) find . -name '*.level' | xargs chmod ugo-x cd debian/$(PACKAGE)/$(DATADIR) find . -name '*.png' | xargs chmod ugo-x cd debian/$(PACKAGE)/$(DATADIR) find . -name '*.jpg' | xargs chmod ugo-x - - # compatibility link for trigger version 0.5.2.1-2+b1 - dh_link $(DATADIR)/textures/dial_speed_mph.png \ - $(DATADIR)/textures/dial_speed.png - - -binary-arch: build install - -binary-indep: build install - dh_testdir - dh_testroot
[trigger-rally-data] 05/05: Release 0.6.1-1
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit 1880f362b9764c1a721096596c2fab33deca131f Author: Tobias Frost t...@coldtobi.de Date: Fri Jun 19 13:03:05 2015 +0200 Release 0.6.1-1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 58c5dc4..309bbde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium +trigger-rally-data (0.6.1-1) unstable; urgency=medium * Team upload. * Change packaging repository to git. @@ -17,7 +17,7 @@ trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium - Rewrite using machine readable format - Complete copyright information (Closes: #784343) - -- Tobias Frost t...@debian.org Thu, 18 Jun 2015 19:49:07 +0200 + -- Tobias Frost t...@debian.org Fri, 19 Jun 2015 13:02:38 +0200 trigger-rally-data (0.6.1-0.1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] branch master updated (8599016 - 1880f36)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository trigger-rally-data. from 8599016 Fix homepage in debian/control new f5f5084 SV to 3.9.6 new ca199e3 Switch debian/compat to 9 new cf0fff0d/copyright: - Rewrite using machine readable format - Complete copyright information (Closes: #784343) new 53d8b72 - Simplify d/rules using short debhelper format: - Install files using d/install, removing non-existant dir fonts - Make links using d/links - d/dirs is not required - remove compatibility link, as the affected package is only in o-o-stable - make symlink from README.txt.gz to Changelog.gz -- as it contains the changelog. new 1880f36 Release 0.6.1-1 The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 20 - debian/compat| 2 +- debian/control | 4 +- debian/copyright | 243 +-- debian/dirs | 2 - debian/install | 7 ++ debian/links | 2 + debian/rules | 72 + 8 files changed, 251 insertions(+), 101 deletions(-) delete mode 100644 debian/dirs create mode 100644 debian/install create mode 100644 debian/links -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] 01/05: SV to 3.9.6
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit f5f508417cc34ea50ab74458a0e835b5da77c77f Author: Tobias Frost t...@coldtobi.de Date: Thu Jun 18 20:28:17 2015 +0200 SV to 3.9.6 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 72d08bd..0d54adb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium * Team upload. * Change packaging repository to git. - * Remove obsolete DM-Upload-Allowed from d/control + * Update to SV 3.9.6, except of removing the obsolete DM-Upload-Allowed from +d/control no change was necessary. * Fix homepage in debian/control -- Tobias Frost t...@debian.org Thu, 18 Jun 2015 19:49:07 +0200 diff --git a/debian/control b/debian/control index 0667298..f28344e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org Build-Depends: debhelper (= 5.0.0) -Standards-Version: 3.9.2 +Standards-Version: 3.9.6 Uploaders: Stefan Potyra sistp...@ubuntu.com, Barry deFreese bdefre...@debian.org Vcs-Git: git://anonscm.debian.org/pkg-games/trigger-rally-data.git Vcs-Browser: https://anonscm.debian.org/git/pkg-games/trigger-rally-data.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] 02/05: Switch debian/compat to 9
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit ca199e305ab0a1e022709f3b450b7675dc44d70b Author: Tobias Frost t...@coldtobi.de Date: Thu Jun 18 20:33:35 2015 +0200 Switch debian/compat to 9 --- debian/changelog | 1 + debian/compat| 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d54adb..5102626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium * Update to SV 3.9.6, except of removing the obsolete DM-Upload-Allowed from d/control no change was necessary. * Fix homepage in debian/control + * Switch debian/compat to 9 -- Tobias Frost t...@debian.org Thu, 18 Jun 2015 19:49:07 +0200 diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index f28344e..b22d187 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: trigger-rally-data Section: games Priority: optional Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org -Build-Depends: debhelper (= 5.0.0) +Build-Depends: debhelper (= 9) Standards-Version: 3.9.6 Uploaders: Stefan Potyra sistp...@ubuntu.com, Barry deFreese bdefre...@debian.org Vcs-Git: git://anonscm.debian.org/pkg-games/trigger-rally-data.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (c258350 - e62abe5)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from c258350 Merge branch 'master' of ssh://git.debian.org/git/pkg-games/rbdoom3bfg new e62abe5 Last commit broke patch... Repaired now The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/patches/80-disable-cpu-features.patch | 125 --- 1 file changed, 125 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/01: Last commit broke patch... Repaired now
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit e62abe55c1d6a4960c562536612b32185f6418e5
Author: Tobias Frost t...@coldtobi.de
Date: Fri Jun 19 19:34:03 2015 +0200
Last commit broke patch... Repaired now
---
debian/patches/80-disable-cpu-features.patch | 125 ---
1 file changed, 125 deletions(-)
diff --git a/debian/patches/80-disable-cpu-features.patch
b/debian/patches/80-disable-cpu-features.patch
index 59706de..dbb0ded 100644
--- a/debian/patches/80-disable-cpu-features.patch
+++ b/debian/patches/80-disable-cpu-features.patch
@@ -39,131 +39,6 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
if(WIN32)
# require msvcr70.dll or newer for _aligned_malloc etc
# I think it is from Visual C++ .NET 2002, so it should be
available on any remotely modern system.
-@@ -78,12 +92,12 @@
- #endif()
-
- # the warnings are used for every profile anyway, so put them in a
variable
-- set(my_warn_flags -Wno-pragmas -Wno-unused-variable
-Wno-unused-but-set-variable -Wno-switch -Wno-unused-value -Winvalid-pch
-Wno-multichar)
-+ set(my_warn_flags -Wno-pragmas -Wno-unused-variable -Wno-switch
-Wno-unused-value -Winvalid-pch -Wno-multichar)
-
- if(CMAKE_C_COMPILER_ID STREQUAL Clang)
- # append clang-specific settings for warnings (the second one
make sure clang doesn't complain
- # about unknown -W flags, like -Wno-unused-but-set-variable)
-- set(my_warn_flags ${my_warn_flags}
-Wno-local-type-template-args -Wno-unknown-warning-option
-Wno-inline-new-delete)
-+ set(my_warn_flags ${my_warn_flags}
-Wno-local-type-template-args -Wno-unknown-warning-option
-Wno-inline-new-delete -Wno-switch-enum)
- endif()
-
- if(NOT CMAKE_CROSSCOMPILING AND ONATIVE)
-@@ -1491,22 +1505,22 @@
- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
-
--##foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
--###message(STATUS -include precompiled.h for ${src_file})
--##set_source_files_properties(
--##${src_file}
--##PROPERTIES
--##COMPILE_FLAGS -include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h
--##)
--##endforeach()
--
--### precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
--##STRING(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} _flags_var_name)
--##SET(_compiler_FLAGS ${${_flags_var_name}})
--##GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
--##FOREACH(item ${_directory_flags})
--##LIST(APPEND _compiler_FLAGS -I${item})
--##ENDFOREACH(item)
-+ foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
-+ #message(STATUS -include precompiled.h for ${src_file})
-+ set_source_files_properties(
-+ ${src_file}
-+ PROPERTIES
-+ COMPILE_FLAGS -include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h
-+ )
-+ endforeach()
-+
-+ # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
-+ STRING(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} _flags_var_name)
-+ SET(_compiler_FLAGS ${${_flags_var_name}})
-+ GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
-+ FOREACH(item ${_directory_flags})
-+ LIST(APPEND _compiler_FLAGS -I${item})
-+ ENDFOREACH(item)
-
- GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
- LIST(APPEND _compiler_FLAGS ${_directory_flags})
-@@ -1515,11 +1529,11 @@
- # we need to recreate the precompiled header for RBDoom3BFG
- # (i.e. can't use the one created for idlib before)
- # because some definitions (e.g. -D__IDLIB__ -D__DOOM_DLL__) differ
--##add_custom_target(precomp_header_rbdoom3bfg ALL
--## COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header idlib/precompiled.h -o idlib/precompiled.h.gch
--## WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--## COMMENT Creating idlib/precompiled.h.gch for
RBDoom3BFG
--## )
-+ add_custom_target(precomp_header_rbdoom3bfg ALL
-+COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header idlib/precompiled.h -o idlib/precompiled.h.gch
-+WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+COMMENT Creating idlib/precompiled.h.gch for
RBDoom3BFG
-+)
-
- if(WIN32)
- set(remove_command del)
-@@ -1529,22
[trigger-rally-data] 02/06: Imported Debian patch 0.5.2-2
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit d3abbc291deae44315d54535ec9fe826a06d8aa6 Author: Barry deFreese bdefre...@debian.org Date: Tue Mar 24 12:13:11 2009 -0400 Imported Debian patch 0.5.2-2 --- debian/TODO.Debian | 3 +++ debian/changelog | 33 + debian/compat | 1 + debian/control | 26 +++ debian/copyright | 29 ++ debian/dirs| 2 ++ debian/docs| 2 ++ debian/rules | 61 ++ debian/watch | 2 ++ 9 files changed, 159 insertions(+) diff --git a/debian/TODO.Debian b/debian/TODO.Debian new file mode 100644 index 000..a16aaa9 --- /dev/null +++ b/debian/TODO.Debian @@ -0,0 +1,3 @@ +Eventually, see trigger's TODO.Debian as well: +* have the snowlevel extracted during build (to not + mess up with user installed plugins) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..6d35d52 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,33 @@ +trigger-rally-data (0.5.2-2) unstable; urgency=low + + [ Stefan Potyra ] + * Move trigger.config.defs to /etc, since it's a config file. + * debian/rules: don't install crap.obj, not needed. + * debian/rules: cleanup + * debian/control: bump standards-version. + + [ Gonéri Le Bouder ] + * data file are in /usr/share/games/trigger-rally + * watch file fixed since upstream files had been moved (Closes: #450395). + + [ Cyril Brulebois ] + * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file. + + [ Barry deFreese ] + * Rename to trigger-rally-data since that is what trigger-rally deps on + * Add myself to uploaders. + + [ Jon Dowland ] + * add Homepage: to source stanza + + [ Ansgar Burchardt ] + * debian/control: Change XS-Vcs-* to Vcs-* + * Remove Homepage semi-field from description + + -- Barry deFreese bdefre...@debian.org Tue, 24 Mar 2009 12:13:11 -0400 + +trigger-data (0.5.2-1) unstable; urgency=low + + * Initial release. + + -- Stefan Potyra sistp...@ubuntu.com Fri, 17 Feb 2006 01:30:11 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 000..31036f9 --- /dev/null +++ b/debian/control @@ -0,0 +1,26 @@ +Source: trigger-rally-data +Section: games +Priority: optional +Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org +Build-Depends: debhelper (= 5.0.0) +Standards-Version: 3.8.0 +Uploaders: Stefan Potyra sistp...@ubuntu.com, Gonéri Le Bouder gon...@rulezlan.org, Barry deFreese bdefre...@debian.org +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/trigger-data/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/trigger-data/?op=log +Homepage: http://www.positro.net/trigger/ + +Package: trigger-rally-data +Architecture: all +Recommends: trigger-rally (= 0.5.2) +Description: free 3D rally racing car game - data files + Trigger is a free 3D rally car racing game. Fun for all the family! + You race a sequence of 6 courses, with increasing levels of difficulty. + . + Trigger is highly customisable, and it's easy to add new levels and vehicles. + . + System Requirements: + * 400 MHz CPU + * 64 MB Ram + * good OpenGL hardware accellerated video card (NVidia Geforce or better) + . + This package contains the data-files. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000..a01e240 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Stefan Potyra sistp...@ubuntu.com on +Fri, 17 Feb 2006 00:16:05 +0100. + +It was downloaded from http://www.positro.net/trigger/#downloads + +Copyright (C) 2004-2006 Jasmine Langridge and Richard Langridge. + + +License: + +Trigger is released under the GPL (see gpl.txt in +source package, or http://www.gnu.org/licenses/gpl.txt ). + +NO WARRANTY WHATSOEVER. + +-- + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + + +On Debian systems, the complete text of the GNU General Public License +(version 2) can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 000..8c14964 --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +/usr/share/games/trigger-rally +/etc diff --git a/debian/docs b/debian/docs new file mode 100644 index 000..607a1a6 ---
[trigger-rally-data] branch master created (now 1d19c95)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository trigger-rally-data. at 1d19c95 Imported Debian patch 0.6.1-0.1 This branch includes the following new commits: new 070bca1 Imported Upstream version 0.5.2 new d3abbc2 Imported Debian patch 0.5.2-2 new 368c9ca Imported Upstream version 0.6.0 new d7ca3a6 Imported Debian patch 0.6.0-1 new 15f1a11 Imported Upstream version 0.6.1 new 1d19c95 Imported Debian patch 0.6.1-0.1 The 6 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] 03/03: Fix homepage in debian/control
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit 8599016b086fbdbf8f253281fad93183ce414958 Author: Tobias Frost t...@coldtobi.de Date: Thu Jun 18 20:21:08 2015 +0200 Fix homepage in debian/control --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b2bae90..72d08bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium * Team upload. * Change packaging repository to git. * Remove obsolete DM-Upload-Allowed from d/control + * Fix homepage in debian/control -- Tobias Frost t...@debian.org Thu, 18 Jun 2015 19:49:07 +0200 diff --git a/debian/control b/debian/control index c4cd0de..0667298 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.2 Uploaders: Stefan Potyra sistp...@ubuntu.com, Barry deFreese bdefre...@debian.org Vcs-Git: git://anonscm.debian.org/pkg-games/trigger-rally-data.git Vcs-Browser: https://anonscm.debian.org/git/pkg-games/trigger-rally-data.git -Homepage: http://www.positro.net/trigger/ +Homepage: https://sourceforge.net/projects/trigger-rally/ Package: trigger-rally-data Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] annotated tag upstream/0.6.1 created (now e5ead87)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag upstream/0.6.1 in repository trigger-rally-data. at e5ead87 (tag) tagging 15f1a1145ff305168f29d76b7724746376746716 (commit) replaces upstream/0.6.0 tagged by Tobias Frost on Thu Jun 18 19:32:40 2015 +0200 - Log - Upstream version 0.6.1 Tobias Frost (1): Imported Upstream version 0.6.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] annotated tag debian/0.6.0-1 created (now 708f9b9)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/0.6.0-1 in repository trigger-rally-data. at 708f9b9 (tag) tagging d7ca3a611ad7d77d90d221ab4e763e3163d6e60d (commit) replaces debian/0.5.2-2 tagged by Tobias Frost on Thu Jun 18 19:32:30 2015 +0200 - Log - Debian release 0.6.0-1 Bruno Fuddl Kleinert (1): Imported Debian patch 0.6.0-1 Tobias Frost (1): Imported Upstream version 0.6.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] annotated tag debian/0.6.1-0.1 created (now b47d10c)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/0.6.1-0.1 in repository trigger-rally-data. at b47d10c (tag) tagging 1d19c95a246f7863b0bb48d4d7e1ea35fb8e812c (commit) replaces debian/0.6.0-1 tagged by Tobias Frost on Thu Jun 18 19:33:24 2015 +0200 - Log - Debian release 0.6.1-0.1 Tobias Frost (2): Imported Upstream version 0.6.1 Imported Debian patch 0.6.1-0.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] 06/06: Imported Debian patch 0.6.1-0.1
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit 1d19c95a246f7863b0bb48d4d7e1ea35fb8e812c Merge: d7ca3a6 15f1a11 Author: Tobias Frost t...@debian.org Date: Sat Oct 25 18:25:41 2014 +0200 Imported Debian patch 0.6.1-0.1 COPYING = COPYING.txt |0 DATA_AUTHORS.txt | 284 ++ README.txt | 98 +- debian/changelog |7 + debian/control |3 +- debian/rules |5 + events/alps/alps.event | 12 + events/alps/dawn/c.jpg | Bin 0 - 34500 bytes events/alps/dawn/dawn.level| 67 + events/alps/dawn/f.png | Bin 0 - 1882 bytes events/alps/dawn/h.png | Bin 0 - 150307 bytes events/alps/dawn/m.png | Bin 0 - 30724 bytes events/alps/forest/c.jpg | Bin 0 - 79588 bytes events/alps/forest/f.png | Bin 0 - 87746 bytes events/alps/forest/forest.level| 58 + events/alps/forest/h.png | Bin 0 - 70671 bytes events/alps/green/c.png| Bin 0 - 87727 bytes events/alps/green/green.level | 48 + events/alps/green/h.png| Bin 0 - 98462 bytes events/alps/lake/c.jpg | Bin 0 - 183987 bytes events/alps/lake/f.png | Bin 0 - 82554 bytes events/alps/lake/h.png | Bin 0 - 161835 bytes events/alps/lake/lake.level| 56 + events/alps/maze/c.jpg | Bin 0 - 120701 bytes events/alps/maze/f.png | Bin 0 - 75300 bytes events/alps/maze/h.png | Bin 0 - 157490 bytes events/alps/maze/m.png | Bin 0 - 52161 bytes events/alps/maze/maze.level| 63 + events/alps/mountain/c.jpg | Bin 0 - 198404 bytes events/alps/mountain/f.png | Bin 0 - 136355 bytes events/alps/mountain/h.png | Bin 0 - 148220 bytes events/alps/mountain/mountain.level| 75 + events/alps/readme.txt | 21 + events/alps/rocky/c.jpg| Bin 0 - 62954 bytes events/alps/rocky/f.png| Bin 0 - 1882 bytes events/alps/rocky/h.png| Bin 0 - 239789 bytes events/alps/rocky/rocky.level | 57 + events/chasingshadows/chasingshadows.event | 10 + events/chasingshadows/daybreak/c.png | Bin 0 - 301663 bytes events/chasingshadows/daybreak/daybreak.level | 67 + events/chasingshadows/daybreak/f.png | Bin 0 - 57552 bytes events/chasingshadows/daybreak/h.png | Bin 0 - 242416 bytes events/chasingshadows/forsakenpath/c.png | Bin 0 - 271362 bytes events/chasingshadows/forsakenpath/f.png | Bin 0 - 68102 bytes .../chasingshadows/forsakenpath/forsakenpath.level | 64 + events/chasingshadows/forsakenpath/h.png | Bin 0 - 178172 bytes events/chasingshadows/nighttrip/c.png | Bin 0 - 212006 bytes events/chasingshadows/nighttrip/f.png | Bin 0 - 73608 bytes events/chasingshadows/nighttrip/h.png | Bin 0 - 221565 bytes events/chasingshadows/nighttrip/nighttrip.level| 73 + events/chasingshadows/nighttrip/post.png | Bin 0 - 1399 bytes events/chasingshadows/oldquarry/c.png | Bin 0 - 72425 bytes events/chasingshadows/oldquarry/f.png | Bin 0 - 47955 bytes events/chasingshadows/oldquarry/h.png | Bin 0 - 29434 bytes events/chasingshadows/oldquarry/m.png | Bin 0 - 231117 bytes events/chasingshadows/oldquarry/oldquarry.level| 78 + events/chasingshadows/softbumps/c.png | Bin 0 - 387706 bytes events/chasingshadows/softbumps/f.png | Bin 0 - 72488 bytes events/chasingshadows/softbumps/h.png | Bin 0 - 151757 bytes events/chasingshadows/softbumps/softbumps.level| 65 + events/highstakes/crossing/c.png | Bin 0 - 281061 bytes events/highstakes/crossing/crossing.level | 117 + events/highstakes/crossing/f.png | Bin 0 - 99664 bytes events/highstakes/crossing/h.png | Bin 0 - 243575 bytes events/highstakes/crossing/m.png | Bin 0 - 292295 bytes events/highstakes/endless/c.png| Bin 0 - 320679 bytes events
[trigger-rally-data] 04/06: Imported Debian patch 0.6.0-1
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository trigger-rally-data.
commit d7ca3a611ad7d77d90d221ab4e763e3163d6e60d
Merge: d3abbc2 368c9ca
Author: Bruno Fuddl Kleinert fu...@debian.org
Date: Thu Dec 8 16:52:32 2011 +0100
Imported Debian patch 0.6.0-1
gpl.txt = COPYING |4 +-
README-stereo.txt |0
README.txt | 145 ++-
crap.obj | 1073
debian/TODO.Debian |3 -
debian/changelog | 23 +
debian/control |6 +-
debian/rules | 47 +-
debian/source/format |1 +
.../triggercup}/desertstorm/colormap.jpg | Bin
.../triggercup}/desertstorm/foliagemap.png | Bin
.../triggercup}/desertstorm/heightmap.png | Bin
.../triggercup}/desertstorm/storm.level|0
{maps = events/triggercup}/lunar/colormap.jpg | Bin
{maps = events/triggercup}/lunar/foliagemap.png | Bin
{maps = events/triggercup}/lunar/heightmap.png| Bin
{maps = events/triggercup}/lunar/lunar.level |0
events/triggercup/triggercup.event |4 +-
maps/greengrounds/colormap.jpg | Bin 0 - 43542 bytes
maps/greengrounds/foliagemap.png | Bin 0 - 129655 bytes
maps/greengrounds/greengrounds.level | 72 ++
maps/greengrounds/heightmap.png| Bin 0 - 126609 bytes
maps/mountainpass/colormap.jpg | Bin 0 - 28070 bytes
maps/mountainpass/foliagemap.png | Bin 0 - 697596 bytes
maps/mountainpass/heightmap.png| Bin 0 - 287548 bytes
maps/mountainpass/mountainpass.level | 65 ++
maps/roundhouse/roundhouse-c.jpg | Bin 0 - 14944 bytes
maps/roundhouse/roundhouse-f.jpg | Bin 0 - 14068 bytes
maps/roundhouse/roundhouse-h.jpg | Bin 0 - 11731 bytes
maps/roundhouse/roundhouse.level | 67 ++
materials/hud-diffuse.material | 10 -
plugins/banana_island.zip | Bin 0 - 323283 bytes
plugins/cross_mountain.zip | Bin 0 - 273146 bytes
plugins/crosspulp.zip | Bin 0 - 444866 bytes
plugins/delta.zip | Bin 0 - 2876624 bytes
plugins/desert_rush.zip| Bin 0 - 360297 bytes
plugins/ghats.zip | Bin 0 - 822890 bytes
plugins/helicoil.zip | Bin 0 - 451793 bytes
plugins/icypeak.zip| Bin 0 - 968571 bytes
plugins/illa.zip | Bin 0 - 258849 bytes
plugins/monza.zip | Bin 0 - 104802 bytes
plugins/muntaya.zip| Bin 0 - 237594 bytes
plugins/rscup.zip | Bin 0 - 1431619 bytes
plugins/santa.zip | Bin 0 - 61347 bytes
plugins/serpentine.zip | Bin 0 - 118207 bytes
plugins/snowyhills.zip | Bin 0 - 469789 bytes
plugins/tobago.zip | Bin 0 - 980416 bytes
plugins/westernchallenge.zip | Bin 0 - 3330639 bytes
textures/dial_speed_hybrid_kph.png | Bin 0 - 47288 bytes
textures/dial_speed_hybrid_mph.png | Bin 0 - 33826 bytes
textures/dial_speed_kph.png| Bin 0 - 47014 bytes
textures/{dial_speed.png = dial_speed_mph.png}| Bin
trigger.config.defs| 22 +-
53 files changed, 400 insertions(+), 1142 deletions(-)
diff --cc debian/changelog
index 6d35d52,000..4dcbce1
mode 100644,00..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,0 +1,56 @@@
++trigger-rally-data (0.6.0-1) unstable; urgency=low
++
++ * Team upload.
++
++ [ Stefan Potyra ]
++ * New upstream release.
++ * debian/source/format: Switch to 3.0 (quilt) to make use of the
++upstream .tar.bz2 as is.
++ * debian/control:
+++ Add DM-Upload-Allowed: yes.
+++ Add ${misc:Depends}.
+++ Bump Standards-Version to 3.9.2 (no changes needed).
++ * debian/rules:
+++ Make some level data files non-executable.
+++ add build-arch and build-indep targets, that do not get anything
++ done, as there is nothing to be built.
+++ select xz as compression algorithm as this gives the best results.
+++ provide a compatibility link to work (at least somewhat) with
++ trigger-rally, version 0.5.2.1-2+b1.
++ * debian/TODO.debian:
[trigger-rally-data] branch master updated (1d19c95 - 8599016)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository trigger-rally-data. from 1d19c95 Imported Debian patch 0.6.1-0.1 new 9bf752d Change packaging repository to git. new 99deaab Remove obsolete DM-Upload-Allowed from d/control new 8599016 Fix homepage in debian/control The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 + debian/control | 15 +++ 2 files changed, 16 insertions(+), 8 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] 01/03: Change packaging repository to git.
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository trigger-rally-data.
commit 9bf752d67d4c6fcba0b892bc716290dd4b78ad5f
Author: Tobias Frost t...@coldtobi.de
Date: Thu Jun 18 20:14:22 2015 +0200
Change packaging repository to git.
---
debian/changelog | 7 +++
debian/control | 12 ++--
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7c75eae..fc42bb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Change packaging repository to git.
+
+ -- Tobias Frost t...@debian.org Thu, 18 Jun 2015 19:49:07 +0200
+
trigger-rally-data (0.6.1-0.1) unstable; urgency=medium
* Non-maintainer upload (as asked for on d-devel-games@ by maintainer)
diff --git a/debian/control b/debian/control
index 79303fb..2fdc000 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Games Team
pkg-games-de...@lists.alioth.debian.org
Build-Depends: debhelper (= 5.0.0)
Standards-Version: 3.9.2
Uploaders: Stefan Potyra sistp...@ubuntu.com, Barry deFreese
bdefre...@debian.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/trigger-data/
-Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/packages/trunk/trigger-data/?op=log
+Vcs-Git: git://anonscm.debian.org/pkg-games/trigger-rally-data.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-games/trigger-rally-data.git
Homepage: http://www.positro.net/trigger/
DM-Upload-Allowed: yes
@@ -16,14 +16,14 @@ Depends: ${misc:Depends}
Recommends: trigger-rally (= 0.6.1)
Breaks: trigger-really ( 0.6.0)
Description: free 3D rally racing car game - data files
- Trigger is a free 3D rally car racing game. Fun for all the family!
+ Trigger is a free 3D rally car racing game. Fun for all the family!
You race a sequence of 6 courses, with increasing levels of difficulty.
.
Trigger is highly customisable, and it's easy to add new levels and vehicles.
- .
- System Requirements:
+ .
+ System Requirements:
* 400 MHz CPU
* 64 MB Ram
* good OpenGL hardware accellerated video card (NVidia Geforce or better)
- .
+ .
This package contains the data-files.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/trigger-rally-data.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[trigger-rally-data] 02/03: Remove obsolete DM-Upload-Allowed from d/control
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository trigger-rally-data. commit 99deaab032f5131bcf58658d5a14d240f8391593 Author: Tobias Frost t...@coldtobi.de Date: Thu Jun 18 20:15:27 2015 +0200 Remove obsolete DM-Upload-Allowed from d/control --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fc42bb0..b2bae90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium * Team upload. * Change packaging repository to git. + * Remove obsolete DM-Upload-Allowed from d/control -- Tobias Frost t...@debian.org Thu, 18 Jun 2015 19:49:07 +0200 diff --git a/debian/control b/debian/control index 2fdc000..c4cd0de 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Stefan Potyra sistp...@ubuntu.com, Barry deFreese bdefreese@debian Vcs-Git: git://anonscm.debian.org/pkg-games/trigger-rally-data.git Vcs-Browser: https://anonscm.debian.org/git/pkg-games/trigger-rally-data.git Homepage: http://www.positro.net/trigger/ -DM-Upload-Allowed: yes Package: trigger-rally-data Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally-data.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/01: Again, patch incomplete. Now also submitting the cpu information.
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 1aa74906e698f73febdf43424b57c92dcf660948
Author: Tobias Frost t...@coldtobi.de
Date: Sat Jun 13 15:49:09 2015 +0200
Again, patch incomplete. Now also submitting the cpu information.
---
debian/changelog | 6 ++
debian/patches/80-disable-cpu-features.patch | 22 +-
debian/rules | 3 ++-
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 63fdb93..9d63a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rbdoom3bfg (1.0.3+repack1-4) unstable; urgency=medium
+
+ * Again, patch incomplete. Now also submitting the cpu information.
+
+ -- Tobias Frost t...@debian.org Sat, 13 Jun 2015 15:48:59 +0200
+
rbdoom3bfg (1.0.3+repack1-3) unstable; urgency=medium
* The patch to disable the CPU features was incomplete: We need also to undef
diff --git a/debian/patches/80-disable-cpu-features.patch
b/debian/patches/80-disable-cpu-features.patch
index 99471fd..fa21121 100644
--- a/debian/patches/80-disable-cpu-features.patch
+++ b/debian/patches/80-disable-cpu-features.patch
@@ -8,12 +8,15 @@ Last-Update: 2015-06-12
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,10 @@
#add_definitions(-Wall)
add_definitions(-Werror=format-security)
add_definitions(-Werror=format)
- add_definitions(-mmmx -msse -msse2)
+# add_definitions(-mmmx -msse -msse2)
++ if(CPU_TYPE)
++ add_definitions(-DCPUSTRING=${CPU_TYPE})
++ endif()
if(WIN32)
# require msvcr70.dll or newer for _aligned_malloc etc
# I think it is from Visual C++ .NET 2002, so it should be
available on any remotely modern system.
@@ -30,3 +33,20 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
#if defined(USE_INTRINSICS)
#include emmintrin.h
+--- a/neo/idlib/sys/sys_defines.h
b/neo/idlib/sys/sys_defines.h
+@@ -104,10 +104,14 @@
+
+ #elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
+
++#if not defined(CPUSTRING)
+ #if defined(__i386__)
+ #define CPUSTRING x86
+ #elif defined(__x86_64__)
+ #define CPUSTRING x86_86
++#else
++#error unknown CPU
++#endif
+ #endif
+
+ #if defined(__FreeBSD__)
diff --git a/debian/rules b/debian/rules
index 692e0eb..08d3b66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,8 @@ override_dh_auto_configure:
dh_auto_configure -- -G Unix Makefiles \
-DSDL2=ON -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-DUSE_SYSTEM_ZLIB=ON -DUSE_SYSTEM_LIBPNG=ON \
--DUSE_SYSTEM_LIBJPEG=ON -DUSE_SYSTEM_LIBGLEW=ON
+-DUSE_SYSTEM_LIBJPEG=ON -DUSE_SYSTEM_LIBGLEW=ON \
+-DCPU_TYPE=$(DEB_BUILD_ARCH_CPU)
#-DCMAKE_BUILD_TYPE=RelWithDebInfo
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (e4a432c - 1aa7490)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from e4a432c release 1.0.3+repack1-3 new 1aa7490 Again, patch incomplete. Now also submitting the cpu information. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ debian/patches/80-disable-cpu-features.patch | 22 +- debian/rules | 3 ++- 3 files changed, 29 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] annotated tag debian/1.0.3+repack1-4 created (now fe87d82)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/1.0.3+repack1-4 in repository rbdoom3bfg. at fe87d82 (tag) tagging 1aa74906e698f73febdf43424b57c92dcf660948 (commit) replaces debian/1.0.3+repack1-3 tagged by Tobias Frost on Sat Jun 13 15:49:28 2015 +0200 - Log - rbdoom3bfg Debian release 1.0.3+repack1-4 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVfDToAAoJEJFk+h0XvV02HI4QAMbgUF+KQ7I7RtpCTHwutk3r XCv1ObprbuFFpTzDWU9SuXKFhVEFWABHVO6d95AkuZWijucTO2Rrn9s0bBSfyt1J du4ZHCHXAxNaXWV2JvYL3EbZHvg3B8HRCsg22Sh+KsXrDyK7MfCgdNb5TRPRb+E5 DLmO6sOlW3XG37Dv++vMaCYum8E1FNEC9XmTJOn239jJeaoztAOfd/7YDtdheBzG NDLjxqhjw7MQC84jSrWKF5H1sOYd5Jw5OVC+Kpvv4fHIi0kLC2Wy5pu9iUv5gxNm pbAi0ENHBxKH2WuJWwEECKkDSI9pL4gf8EjZKPHPkRAfTk4WLP+GafBs2w+WJ35T Im1vjDkMbLcuPNvokFy4/OUPB9B0ImYI8k/Ylqq+ttjaDNlfEfD9e7YmuhQN6l+j WujePhFf6aU9EYdBtbdVjxB+oQr1GaEkkGAaP2hjHA/EIXIdwQLbK0Fs2LuWmFq1 3LgeQgPekJtie4Xu3AsLPGCgi5I8lpTHlBbxoIXm4x7jsHbo2BLblhLppvuHX/AW 378O44Bd6hUZTIWTtX5uDCKNyJspb2XXg1OZsnRJu3Su/LZNS6IIY+Bukz7Ek5Il avj3535SHHyQpbY0wipUpQqQJRzPkH2SlsVuUcEif3+BZVuHcjHOhEMPzA+2KjpE usp8BAzGW791qPmawkRf =lejS -END PGP SIGNATURE- Tobias Frost (1): Again, patch incomplete. Now also submitting the cpu information. --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 02/03: The patch to disable the CPU features was incomplete: We need also to undef the usage of intriniscs for all CPU'S except on amd64
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit b8106f220a6852e140daa5bf31c05bf58d2974e4 Author: Tobias Frost t...@coldtobi.de Date: Sat Jun 13 10:37:18 2015 +0200 The patch to disable the CPU features was incomplete: We need also to undef the usage of intriniscs for all CPU'S except on amd64 --- debian/changelog | 7 +++ debian/patches/80-disable-cpu-features.patch | 13 + 2 files changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index cf34a9c..be88fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +rbdoom3bfg (1.0.3+repack1-3) UNRELEASED; urgency=medium + + * The patch to disable the CPU features was incomplete: We need also to undef +the usage of intriniscs for all CPU'S except on amd64 + + -- Tobias Frost t...@debian.org Sat, 13 Jun 2015 10:35:31 +0200 + rbdoom3bfg (1.0.3+repack1-2) unstable; urgency=medium * Add patch to disable using CPU features like sse and mmx. diff --git a/debian/patches/80-disable-cpu-features.patch b/debian/patches/80-disable-cpu-features.patch index b1c7424..99471fd 100644 --- a/debian/patches/80-disable-cpu-features.patch +++ b/debian/patches/80-disable-cpu-features.patch @@ -17,3 +17,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ if(WIN32) # require msvcr70.dll or newer for _aligned_malloc etc # I think it is from Visual C++ .NET 2002, so it should be available on any remotely modern system. +--- a/neo/idlib/sys/sys_intrinsics.h b/neo/idlib/sys/sys_intrinsics.h +@@ -29,7 +29,10 @@ + #ifndef __SYS_INTRIINSICS_H__ + #define __SYS_INTRIINSICS_H__ + ++#if defined(__x86_64__) ++// Enable this only on amd64 + #define USE_INTRINSICS ++#endif + + #if defined(USE_INTRINSICS) + #include emmintrin.h -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (4a85df2 - e4a432c)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from 4a85df2 release rbdoom3bfg (1.0.3+repack1-2) new 9abce79 dpkg-source: Ignore eclipse project files new b8106f2 The patch to disable the CPU features was incomplete: We need also to undef the usage of intriniscs for all CPU'S except on amd64 new e4a432c release 1.0.3+repack1-3 The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 +++ debian/patches/80-disable-cpu-features.patch | 13 + debian/source/local-options | 1 + 3 files changed, 21 insertions(+) create mode 100644 debian/source/local-options -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 03/03: release 1.0.3+repack1-3
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit e4a432c6d855d5d4174cd33c1583bd4c0da6c285 Author: Tobias Frost t...@coldtobi.de Date: Sat Jun 13 14:18:59 2015 +0200 release 1.0.3+repack1-3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index be88fa2..63fdb93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -rbdoom3bfg (1.0.3+repack1-3) UNRELEASED; urgency=medium +rbdoom3bfg (1.0.3+repack1-3) unstable; urgency=medium * The patch to disable the CPU features was incomplete: We need also to undef the usage of intriniscs for all CPU'S except on amd64 - -- Tobias Frost t...@debian.org Sat, 13 Jun 2015 10:35:31 +0200 + -- Tobias Frost t...@debian.org Sat, 13 Jun 2015 14:18:36 +0200 rbdoom3bfg (1.0.3+repack1-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] annotated tag debian/1.0.3+repack1-3 created (now e9f236c)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/1.0.3+repack1-3 in repository rbdoom3bfg. at e9f236c (tag) tagging e4a432c6d855d5d4174cd33c1583bd4c0da6c285 (commit) replaces debian/1.0.3+repack1-2 tagged by Tobias Frost on Sat Jun 13 14:32:55 2015 +0200 - Log - rbdoom3bfg Debian release 1.0.3+repack1-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVfCL3AAoJEJFk+h0XvV02MFQQANOsDGpHIf/R4vzTxgqu7upa EGCQr9eVFCflvSHYHgMIEHjrbWdt1Ye7EL5cQfz2IIii2wdwcdP7IgvI4GHZeP3M 6o1uzo/B5pA2kli2/e10N4oPwVN3Hpxkgdd/oIwwSCurrjUx8pXmRNJndWXR1MP0 pLgRGygpYY3+bHlDZ7vR/ZwPKubNerdu+pKVezABMLf69w3f1L6ZZ00qLAs0dkka iGslJN6AKH9sAQpaJJXwHvnDE05w5NVqRUlpoeK+BYJP7G6HtbEjeQCdoxPzIrTJ YMJ3GtvNtye42fd0VRdezWjODll5YqOS572IBy29M/MHb4zB56I23fkD13UiXMFN bNxPKrpObSEQSUz9HZLrPlQAiwzIx1IHAgBVSoJF2H2gZF0T29Z01LZuosxyMI8j RiWjNFCTNkByWNfKWBLLg9tXs+hap7kE97uZ4cvASttDz1kIVNHeYvS5EpJYH9XX gCMSoIgNRyfowqRvsgpcClNlJomXeU0eCz1iUUxY/mfjHIiXWz5sEWRDjJWWzmDI rli36ANM9y6VQ/3a/mf6uQ+oWkSXJpcWG+VbYRALuedb7gZYpa+iSIZyCs7Ycq3a qMTeKgMmbapEVLTlIdVMObMwO4VLrQEaLrWdHguRCu5u7f/n3ulxngVUnmUggIN6 bUI2X2bYkRl7vimzwLf8 =gS2b -END PGP SIGNATURE- Tobias Frost (3): dpkg-source: Ignore eclipse project files The patch to disable the CPU features was incomplete: We need also to undef the release 1.0.3+repack1-3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/03: dpkg-source: Ignore eclipse project files
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 9abce7965b815e92a835667ff883ad5067341966 Author: Tobias Frost t...@coldtobi.de Date: Sat Jun 13 10:34:38 2015 +0200 dpkg-source: Ignore eclipse project files --- debian/source/local-options | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000..7d2a52b --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1 @@ +extend-diff-ignore = (^|/)(\.cproject|\.project|\.settings.*)$ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (79d7dee - 4a85df2)
This is an automated email from the git hooks/post-receive script.
tobi pushed a change to branch master
in repository rbdoom3bfg.
from 79d7dee Release
new d30161a Rename patch for free up namespace a litle
new 750058a New patch to disable CPU features
new 4a85df2 release rbdoom3bfg (1.0.3+repack1-2)
The 3 revisions listed above as new are entirely new to this
repository and will be described in separate emails. The revisions
listed as adds were already present in the repository and have only
been added to this reference.
Summary of changes:
debian/changelog | 8
debian/control| 1 +
...der.patch = 75-local-no-precompiled-header.patch} | 0
debian/patches/80-disable-cpu-features.patch | 19 +++
debian/patches/series | 3 ++-
5 files changed, 30 insertions(+), 1 deletion(-)
rename debian/patches/{99-local-no-precompiled-header.patch =
75-local-no-precompiled-header.patch} (100%)
create mode 100644 debian/patches/80-disable-cpu-features.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 02/03: New patch to disable CPU features
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 750058ace4da7b009c6b518326470e9256aaf7e2 Author: Tobias Frost t...@coldtobi.de Date: Fri Jun 12 18:05:36 2015 +0200 New patch to disable CPU features --- debian/changelog | 7 +++ debian/patches/80-disable-cpu-features.patch | 19 +++ debian/patches/series| 1 + 3 files changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index 468fd3e..68445a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +rbdoom3bfg (1.0.3+repack1-2) UNRELEASED; urgency=medium + + * Add patch to disable using CPU features like sse and mmx. + * Rename local patch to free up the namespace a little bit. + + -- Tobias Frost t...@debian.org Fri, 12 Jun 2015 18:00:31 +0200 + rbdoom3bfg (1.0.3+repack1-1) unstable; urgency=medium * Initial release (Closes: #764200) diff --git a/debian/patches/80-disable-cpu-features.patch b/debian/patches/80-disable-cpu-features.patch new file mode 100644 index 000..b1c7424 --- /dev/null +++ b/debian/patches/80-disable-cpu-features.patch @@ -0,0 +1,19 @@ +Description: Do not use CPU features like sse and mmx + Those features are not guaranteed to be supported even on i386/amd64, so it + is better to stick to the GCC's default. +Author: Tobias Frost t...@debian.org +Forwarded: not-needed, Debian specific +Last-Update: 2015-06-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/neo/CMakeLists.txt b/neo/CMakeLists.txt +@@ -61,7 +61,7 @@ + #add_definitions(-Wall) + add_definitions(-Werror=format-security) + add_definitions(-Werror=format) +- add_definitions(-mmmx -msse -msse2) ++# add_definitions(-mmmx -msse -msse2) + if(WIN32) + # require msvcr70.dll or newer for _aligned_malloc etc + # I think it is from Visual C++ .NET 2002, so it should be available on any remotely modern system. diff --git a/debian/patches/series b/debian/patches/series index 2d32635..4d5f6c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 10-lowercase-executeable.patch 65-init-sdl2.patch 75-local-no-precompiled-header.patch +80-disable-cpu-features.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/03: Rename patch for free up namespace a litle
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit d30161ab781aa3bd05d3d5ba367100f9e1b20916 Author: Tobias Frost t...@coldtobi.de Date: Fri Jun 12 17:51:05 2015 +0200 Rename patch for free up namespace a litle --- ...no-precompiled-header.patch = 75-local-no-precompiled-header.patch} | 0 debian/patches/series | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/99-local-no-precompiled-header.patch b/debian/patches/75-local-no-precompiled-header.patch similarity index 100% rename from debian/patches/99-local-no-precompiled-header.patch rename to debian/patches/75-local-no-precompiled-header.patch diff --git a/debian/patches/series b/debian/patches/series index 433dd73..2d32635 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ 10-lowercase-executeable.patch 65-init-sdl2.patch -99-local-no-precompiled-header.patch +75-local-no-precompiled-header.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] annotated tag debian/1.0.3+repack1-2 created (now 141c163)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/1.0.3+repack1-2 in repository rbdoom3bfg. at 141c163 (tag) tagging 4a85df2c6550cc56de3117248ab2196583a87ffa (commit) replaces debian/1.0.3+repack1-1 tagged by Tobias Frost on Fri Jun 12 18:27:25 2015 +0200 - Log - rbdoom3bfg Debian release 1.0.3+repack1-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVewhtAAoJEJFk+h0XvV02kFkQAJMpJdzvjxeUg9Hua1rB6nBW 07R9BWqfeyrfMEt3hOu8pCG88tVgGUbv4it7EmenzF5F3eUG3XO0B9OqTJ1BIfne o3QkYyzkZzNoh66afk2CkWSW49zIqFV2k/+RHlrdkeHKau5Ld2n/D8PyFnGgyYVk 72cFUYJwPlJuzgyVmg4M9FF9JxTyI04phL1dyyM7saZk6EBwLA0mV4Kpqk4vBGXt elTBt+KTPeYiHkQp+uohqy8z4XG33DlfXPF0ILi3r59OzdVt5agvv/ZMX0LbMIif L7agTJG9gtFz37aQDiODB7gTyEm8a6KN8KdZu5jwkuQgqtmUeJVgvLxiO1i/Y33U WH8Dp9JWI1mOlpCF9KGtQufYQRjd7/Xhc71Qkj6Hk+rTjNOBYarN3mCoAwBbs04n ZgNkQwPOXjpVXC+yeyks4Oz4df93fCJEEg5yw4XBuHLVhezl/+3xmdRsTLamJ3ls fCjqMahRnPwOT92vJ+FlBSFkKnPlhZj82SydWy4S7dWfqogKLXWrN0k8NmXqXjjb GuS7xrDzQyY93370lezQ6gbppG1uJ4li/zZAGimZwnrYZQIa9AtjQKbceRCE5tuG EPiFhTewTKESRNfBX5cyDzIK9qWjHCxM93RfbH+xK/gNgyDqN2U39yENxOZIXTve ZDhu09GORFnHZs1EB6py =8fDf -END PGP SIGNATURE- Tobias Frost (3): Rename patch for free up namespace a litle New patch to disable CPU features release rbdoom3bfg (1.0.3+repack1-2) --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 03/03: release rbdoom3bfg (1.0.3+repack1-2)
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit 4a85df2c6550cc56de3117248ab2196583a87ffa Author: Tobias Frost t...@coldtobi.de Date: Fri Jun 12 18:09:24 2015 +0200 release rbdoom3bfg (1.0.3+repack1-2) --- debian/changelog | 5 +++-- debian/control | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 68445a3..cf34a9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -rbdoom3bfg (1.0.3+repack1-2) UNRELEASED; urgency=medium +rbdoom3bfg (1.0.3+repack1-2) unstable; urgency=medium * Add patch to disable using CPU features like sse and mmx. * Rename local patch to free up the namespace a little bit. + * Add the Debian Games Team to Uploaders in d/control - -- Tobias Frost t...@debian.org Fri, 12 Jun 2015 18:00:31 +0200 + -- Tobias Frost t...@debian.org Fri, 12 Jun 2015 18:17:07 +0200 rbdoom3bfg (1.0.3+repack1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index bf5375b..3fda26b 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Source: rbdoom3bfg Section: games Priority: optional Maintainer: Tobias Frost t...@debian.org +Uploaders: Debian Games Team pkg-games-de...@lists.alioth.debian.org Build-Depends: cmake, debhelper (= 9), libavcodec-dev | libavcodec-ffmpeg-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 01/01: Enable parallel build
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3. commit 3964d0991249e9d4d99b2f7a15fc47a198801062 Author: Tobias Frost t...@coldtobi.de Date: Mon Mar 30 21:38:21 2015 +0200 Enable parallel build --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 39fa087..49c976c 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ DH_VERBOSE = 1 %: - dh $@ -Dneo + dh $@ -Dneo --parallel # debmake generated override targets # This is example for Cmake (See http://bugs.debian.org/641051 ) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] branch master updated (61e47b7 - 3964d09)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository dhewm3. from 61e47b7 Release... new 3964d09 Enable parallel build The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 12/13: Fix debian/watch
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3. commit d2668045c28d84a941ef760fea51f8291ee303e7 Author: Tobias Frost t...@coldtobi.de Date: Thu Mar 12 11:21:36 2015 +0100 Fix debian/watch --- debian/watch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index a9a32b0..b137ea9 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,8 @@ version=3 -opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/dhewm3-$1\.tar\.gz/ \ +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/dhewm3-$1\.tar\.gz/,\ +dversionmangle=s/\+git.*$//;s/\+dfsg.*$//,uversionmangle=s/-/~/,\ +repacksuffix=+dfsg \ https://github.com/dhewm/dhewm3/tags .*/v?(\d\S*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 10/13: Add patch to support removal of the two jpeg-files
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository dhewm3.
commit 9de978bc5fe56fa4a342495e258e8ba7964120a1
Author: Tobias Frost t...@coldtobi.de
Date: Thu Mar 12 10:18:18 2015 +0100
Add patch to support removal of the two jpeg-files
---
debian/patches/02-remove-jpeg_memory_src.patch | 75 ++
debian/patches/series | 1 +
2 files changed, 76 insertions(+)
diff --git a/debian/patches/02-remove-jpeg_memory_src.patch
b/debian/patches/02-remove-jpeg_memory_src.patch
new file mode 100644
index 000..d8c908a
--- /dev/null
+++ b/debian/patches/02-remove-jpeg_memory_src.patch
@@ -0,0 +1,75 @@
+Description: Patch to support removal of jpeg_memory_src.(ch)
+ As the above two files state in their license grant that a README is required
for
+ the license terms, but there is only a README.md.
+ This patch replaces the calls provided
+ by this source by direct calls to the jpeg libarry. This requires that the
library has
+ the jpeg_mem_src functions, so this is checked during the build process.
+Author: Tobias Frost t...@debian.org
+Bug: https://github.com/dhewm/dhewm3/issues/110
+Forwarded: yes
+Last-Update: 2015-03-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/neo/CMakeLists.txt
b/neo/CMakeLists.txt
+@@ -88,6 +88,10 @@
+ set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
+ CHECK_FUNCTION_EXISTS(jpeg_mem_src HAVE_JPEG_MEM_SRC)
+
++if(NOT HAVE_JPEG_MEM_SRC)
++message(FATAL_ERROR jpeg_mem_src is not available)
++endif()
++
+ find_package(OGG REQUIRED)
+ include_directories(${OGG_INCLUDE_DIR})
+
+@@ -279,7 +283,6 @@
+ endif()
+
+ set(src_renderer
+- renderer/jpeg_memory_src.cpp
+ renderer/Cinematic.cpp
+ renderer/GuiModel.cpp
+ renderer/Image_files.cpp
+--- a/neo/renderer/Cinematic.cpp
b/neo/renderer/Cinematic.cpp
+@@ -29,7 +29,8 @@
+ #include sys/platform.h
+
+ #include framework/FileSystem.h
+-#include renderer/jpeg_memory_src.h
++#include jpeglib.h
++#include jerror.h
+ #include renderer/tr_local.h
+ #include sound/sound.h
+
+@@ -1309,7 +1310,7 @@
+
+ /* Step 2: specify data source (eg, a file) */
+
+- jpeg_memory_src(cinfo, data, datasize);
++ jpeg_mem_src(cinfo, data, datasize);
+
+ /* Step 3: read file parameters with jpeg_read_header() */
+
+--- a/neo/renderer/Image_files.cpp
b/neo/renderer/Image_files.cpp
+@@ -28,7 +28,8 @@
+
+ #include sys/platform.h
+
+-#include renderer/jpeg_memory_src.h
++#include jpeglib.h
++#include jerror.h
+ #include renderer/tr_local.h
+
+ #include renderer/Image.h
+@@ -824,7 +825,7 @@
+
+ /* Step 2: specify data source (eg, a file) */
+
+- jpeg_memory_src(cinfo, fbuffer, len);
++ jpeg_mem_src(cinfo, fbuffer, len);
+
+ /* Step 3: read file parameters with jpeg_read_header() */
+
diff --git a/debian/patches/series b/debian/patches/series
index e537492..8b91764 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-changedatadir.patch
+02-remove-jpeg_memory_src.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/dhewm3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 01/13: Use Files-Excluded: from d/copyright also for get-orig-source
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository dhewm3.
commit f986960c890dc1fa260f1487f3925ce173de3e1c
Author: Tobias Frost t...@coldtobi.de
Date: Thu Mar 12 07:50:27 2015 +0100
Use Files-Excluded: from d/copyright also for get-orig-source
---
debian/rules | 31 +++
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/debian/rules b/debian/rules
index 2990db5..d54ce1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,26 +20,27 @@ PKD = $(abspath $(dir $(MAKEFILE_LIST)))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep
^Source))
VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | sed -e
s/^.*git// -e s/+repack// | cut -d- -f1 )
DTYPE = +repack
-UPSVER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d~
-f1)
+UPSVER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d+
-f1)
## from: https://wiki.debian.org/onlyjob/get-orig-source
.PHONY: get-orig-source
-get-orig-source: $(PKG)_$(UPSVER)~git$(VER)$(DTYPE).orig.tar.xz
- #$(info I: $(UPSVER$)~$(PKG)_$(VER)$(DTYPE))
+get-orig-source: $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz
+ #$(info I: $(UPSVER$)+$(PKG)_$(VER)$(DTYPE))
@
UDATE = $(shell date --rfc-3339=seconds --date='TZ=UTC \
- $(shell echo ~git$(VER) | perl -ne 'print $$1-$$2-$$3 if
m/\~(?:git|svn|hg)(\d{4})(\d{2})(\d{2})/')')
+ $(shell echo +git$(VER) | perl -ne 'print $$1-$$2-$$3 if
m/\+(?:git|svn|hg)(\d{4})(\d{2})(\d{2})/')')
-$(PKG)_$(UPSVER)~git$(VER)$(DTYPE).orig.tar.xz:
+$(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz:
@echo DEBUG: VER=$(VER) UDATE=$(UDATE) UPSVER=$(UPSVER)
- echo $(PKG)_$(UPSVER)~git$(VER)$(DTYPE).orig.tar.xz
+ @echo $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz
+ @echo $(VER) | grep '^[0-9]*$$' || ( echo Cannot find timestamp in
package version. Please specify VER, see README.source. Aborting.. ; exit 1 )
#$(info I: UDATE=$(UDATE))
- $(if $(wildcard $(PKG)-$(UPSVER)~git$(VER)),$(error
$(PKG)-$(UPSVER)~git$(VER) exist, aborting..))
+ $(if $(wildcard $(PKG)-$(UPSVER)+git$(VER)),$(error
$(PKG)-$(UPSVER)+git$(VER) exist, aborting..))
@echo # Downloading...
- git clone $(UURL) $(PKG)-$(UPSVER)~git$(VER) \
- || $(RM) -r $(PKG)-$(UPSVER)~git$(VER)
- cd $(PKG)-$(UPSVER)~git$(VER) \
+ git clone $(UURL) $(PKG)-$(UPSVER)+git$(VER) \
+ || $(RM) -r $(PKG)-$(UPSVER)+git$(VER)
+ cd $(PKG)-$(UPSVER)+git$(VER) \
git checkout v$(VER) || git checkout $$(git log -n1 --format=%h
--before=$(UDATE)) \
( echo # Generating ChangeLog... \
git log --pretty=format:%ad %aN %aE%n%n%x09* %s%n --date=short
ChangeLog \
@@ -47,11 +48,9 @@ $(PKG)_$(UPSVER)~git$(VER)$(DTYPE).orig.tar.xz:
echo # Setting times... \
for F in $$(git ls-tree -r --name-only HEAD); do touch
--no-dereference -d $$(git log -1 --format=%ai -- $$F) $$F; done \
echo # Cleaning-up... \
-$(RM) -r -v \
- neo/tools/common/PropTree/* neo/sys/win32/*
neo/sys/linux/setup/*/bin/* \
- neo/sys/linux/setup/lokisetup neo/sys/linux/setup/image-*
neo/sys/linux/setup/makeself \
+$(RM) -r -v $$(awk
'BEGIN{RS=ORS=\n\n;FS=OFS=\n}/Files-Excluded:/' $(PKD)/copyright | sed
s/Files-Excluded://) \
$(RM) -r .git .git*
@echo # Packing...
- find -L $(PKG)-$(UPSVER)~git$(VER) -xdev -type f -print | sort \
- | XZ_OPT=-6v tar -caf
$(PKG)_$(UPSVER)~git$(VER)$(DTYPE).orig.tar.xz -T- --owner=root --group=root
--mode=a+rX \
-$(RM) -r $(PKG)-$(UPSVER)~git$(VER)
+ find -L $(PKG)-$(UPSVER)+git$(VER) -xdev -type f -print | sort \
+ | XZ_OPT=-6v tar -caf
$(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz -T- --owner=root --group=root
--mode=a+rX \
+$(RM) -r $(PKG)-$(UPSVER)+git$(VER)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/dhewm3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 05/13: Change to dfsg suffix due to the unclear licenses of jpeg_memory_src.*
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3. commit b48f7675a52ac5b95780949a52b0565d2b81159c Author: Tobias Frost t...@coldtobi.de Date: Thu Mar 12 09:31:24 2015 +0100 Change to dfsg suffix due to the unclear licenses of jpeg_memory_src.* --- debian/README.source | 8 +--- debian/copyright | 44 +++- debian/rules | 2 +- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/debian/README.source b/debian/README.source index 76ee192..4e621b7 100644 --- a/debian/README.source +++ b/debian/README.source @@ -8,9 +8,11 @@ With the help of this target, the upstream tarball can be regenerated. Several files will removed from the archive: Binaries, Windows executeables, dlls and files only needed to build non-Unix architectures. +neo/renderer/jpeg_memory_src.* has been removed as the README describing the +distribution license is not in the tarball. (removed for DFSG compliance). -Please see the get-orgig-source target in debian/rules or the Files-Excluded -entry in debian/copyright for the complete list. +Please the Files-Excluded entry in debian/copyright for the complete list +of removed files. To retrieve the latest upstream version you can set the date with the VER variable, set to the format MMDD. If not set, the date from @@ -42,4 +44,4 @@ The game engine is currently packed for the contrib section, aa there is no free game data known. If you know about DFSG-free content, please let me know. - -- Tobias Frost t...@debian.org Sat, 14 Feb 2015 13:49:22 +0100 + -- Tobias Frost t...@debian.org Thu, 12 Mar 2015 09:24:14 +0100 diff --git a/debian/copyright b/debian/copyright index 3f168e3..c6de1a1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,10 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: dhewm3 Source: https://github.com/dhewm/dhewm3 Comment: The removed files contained prebuilt binaries and we do not need those. + The jpeg_memory_src.* have been removed due the missing README -- which + defines the license for those two files. Files-Excluded: neo/tools/common/PropTree/* neo/sys/win32/* neo/sys/linux/setup/*/bin neo/sys/linux/setup/lokisetup neo/sys/linux/setup/image-* neo/sys/linux/setup/makeself/* + neo/renderer/jpeg_memory_src.* Files: * Copyright: 1999-2011 id Software LLC, a ZeniMax Media company @@ -140,6 +143,26 @@ Files: neo/sys/linux/setup/brandelf.c Copyright: 1996 Søren Schmidt License: BSD-2-clause +Files: debian/* +Copyright: 2015 Tobias Frost t...@debian.org +License: GPL-3+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see http://www.gnu.org/licenses/ + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in /usr/share/common-licenses/GPL-3. + + License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -171,24 +194,3 @@ License: zlib 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - - - -Files: debian/* -Copyright: 2015 Tobias Frost t...@debian.org -License: GPL-3+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see http://www.gnu.org/licenses/ - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in /usr/share/common-licenses/GPL-3. diff --git a/debian/rules b/debian/rules index d54ce1e..b5796a0 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ UURL = https://github.com/dhewm/dhewm3.git PKD = $(abspath $(dir $(MAKEFILE_LIST))) PKG = $(word 2,$(shell dpkg
[dhewm3] 11/13: Fix get-orig-source and remove empty line from d/copyright
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository dhewm3.
commit ce9d256b9fd151bb91f875cfd9c87e76728cbd82
Author: Tobias Frost t...@coldtobi.de
Date: Thu Mar 12 11:20:35 2015 +0100
Fix get-orig-source and remove empty line from d/copyright
---
debian/copyright | 1 -
debian/rules | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index c6de1a1..6b6d3d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,6 @@ Source: https://github.com/dhewm/dhewm3
Comment: The removed files contained prebuilt binaries and we do not need
those.
The jpeg_memory_src.* have been removed due the missing README -- which
defines the license for those two files.
-
Files-Excluded: neo/tools/common/PropTree/* neo/sys/win32/*
neo/sys/linux/setup/*/bin neo/sys/linux/setup/lokisetup
neo/sys/linux/setup/image-* neo/sys/linux/setup/makeself/*
diff --git a/debian/rules b/debian/rules
index b5796a0..39fa087 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ override_dh_auto_configure:
UURL = https://github.com/dhewm/dhewm3.git
PKD = $(abspath $(dir $(MAKEFILE_LIST)))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep
^Source))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | sed -e
s/^.*git// -e s/+repack// | cut -d- -f1 )
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | sed -e
s/^.*git// -e s/+dfsg// | cut -d- -f1 )
DTYPE = +dfsg
UPSVER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d+
-f1)
@@ -34,7 +34,7 @@ UDATE = $(shell date --rfc-3339=seconds --date='TZ=UTC \
$(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz:
@echo DEBUG: VER=$(VER) UDATE=$(UDATE) UPSVER=$(UPSVER)
@echo $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz
- @echo $(VER) | grep '^[0-9]*$$' || ( echo Cannot find timestamp in
package version. Please specify VER, see README.source. Aborting.. ; exit 1 )
+ @echo $(VER) | grep -q '^[0-9]*$$' || ( echo Cannot find timestamp in
package version. Please specify VER, see README.source. Aborting.. ; exit 1 )
#$(info I: UDATE=$(UDATE))
$(if $(wildcard $(PKG)-$(UPSVER)+git$(VER)),$(error
$(PKG)-$(UPSVER)+git$(VER) exist, aborting..))
@echo # Downloading...
@@ -48,7 +48,7 @@ $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz:
echo # Setting times... \
for F in $$(git ls-tree -r --name-only HEAD); do touch
--no-dereference -d $$(git log -1 --format=%ai -- $$F) $$F; done \
echo # Cleaning-up... \
-$(RM) -r -v $$(awk
'BEGIN{RS=ORS=\n\n;FS=OFS=\n}/Files-Excluded:/' $(PKD)/copyright | sed
s/Files-Excluded://) \
+$(RM) -r -v $$(awk
'BEGIN{RS=ORS=\n\n;FS=OFS=\n}/Files-Excluded:/' $(PKD)/copyright | sed -n
-e '/^Files-Excluded:/,$${p}' | sed s/Files-Excluded://) \
$(RM) -r .git .git*
@echo # Packing...
find -L $(PKG)-$(UPSVER)+git$(VER) -xdev -type f -print | sort \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/dhewm3.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 03/13: Change version scheme from 0~git... to 0+git...
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3. commit 263120b06ecf1a41fd1626d99d84875a0e30a1aa Author: Tobias Frost t...@coldtobi.de Date: Thu Mar 12 07:53:27 2015 +0100 Change version scheme from 0~git... to 0+git... --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5ffefcc..729599f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dhewm3 (0~git20150214+repack-1) unstable; urgency=low +dhewm3 (0+git20150214+repack-1) unstable; urgency=low * Initial release (Closes: #777373) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] branch master updated (b668777 - 61e47b7)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository dhewm3. from b668777 Initial Packaging new f986960 Use Files-Excluded: from d/copyright also for get-orig-source new 8dd85b0 gbp.conf: By default, sign tags new 263120b Change version scheme from 0~git... to 0+git... new 10f56d5 Fix Files-Excluded in d/copyright new b48f767 Change to dfsg suffix due to the unclear licenses of jpeg_memory_src.* new acfb03d Imported Upstream version 0+git20150226+dfsg new 70d1147 Merge tag 'upstream/0+git20150226+dfsg' new e378693 Remove patch 02-spelling-errors.patch -- applied upstream new 71bebda new upstream git snapshot new 9de978b Add patch to support removal of the two jpeg-files new ce9d256 Fix get-orig-source and remove empty line from d/copyright new d266804 Fix debian/watch new 61e47b7 Release... The 13 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: ChangeLog | 8 +++ debian/README.source | 8 ++- debian/changelog | 4 +- debian/control | 2 +- debian/copyright | 48 +++-- debian/gbp.conf| 1 + debian/patches/02-remove-jpeg_memory_src.patch | 75 debian/patches/02-spelling-errors.patch| 97 -- debian/patches/series | 2 +- debian/rules | 35 +- debian/watch | 4 +- neo/d3xp/gamesys/SysCvar.cpp | 2 +- neo/d3xp/physics/Physics_AF.cpp| 4 +- neo/framework/DeclAF.cpp | 2 +- neo/game/gamesys/SysCvar.cpp | 2 +- neo/game/physics/Physics_AF.cpp| 4 +- neo/idlib/Lexer.cpp| 2 +- neo/idlib/Parser.cpp | 2 +- neo/renderer/jpeg_memory_src.cpp | 93 neo/renderer/jpeg_memory_src.h | 24 --- 20 files changed, 148 insertions(+), 271 deletions(-) create mode 100644 debian/patches/02-remove-jpeg_memory_src.patch delete mode 100644 debian/patches/02-spelling-errors.patch delete mode 100644 neo/renderer/jpeg_memory_src.cpp delete mode 100644 neo/renderer/jpeg_memory_src.h -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 13/13: Release...
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3. commit 61e47b7bac66a8d6434d9e840f3382dc6747f3b5 Author: Tobias Frost t...@coldtobi.de Date: Thu Mar 12 11:24:21 2015 +0100 Release... --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7c7d60..2aba42a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -dhewm3 (0+git20150226+dfsg-1) UNRELEASED; urgency=medium +dhewm3 (0+git20150226+dfsg-1) unstable; urgency=medium * Initial release (Closes: #777373) - -- Tobias Frost t...@debian.org Thu, 12 Mar 2015 09:51:48 +0100 + -- Tobias Frost t...@debian.org Thu, 12 Mar 2015 11:21:47 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 01/01: pristine-tar data for dhewm3_0+git20150226+dfsg.orig.tar.xz
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch pristine-tar in repository dhewm3. commit a57a9970faaf7dadd71b806653bfa08b28c3ed33 Author: Tobias Frost t...@coldtobi.de Date: Thu Mar 12 09:33:53 2015 +0100 pristine-tar data for dhewm3_0+git20150226+dfsg.orig.tar.xz --- dhewm3_0+git20150226+dfsg.orig.tar.xz.delta | Bin 0 - 31629 bytes dhewm3_0+git20150226+dfsg.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/dhewm3_0+git20150226+dfsg.orig.tar.xz.delta b/dhewm3_0+git20150226+dfsg.orig.tar.xz.delta new file mode 100644 index 000..8a76e84 Binary files /dev/null and b/dhewm3_0+git20150226+dfsg.orig.tar.xz.delta differ diff --git a/dhewm3_0+git20150226+dfsg.orig.tar.xz.id b/dhewm3_0+git20150226+dfsg.orig.tar.xz.id new file mode 100644 index 000..8033e46 --- /dev/null +++ b/dhewm3_0+git20150226+dfsg.orig.tar.xz.id @@ -0,0 +1 @@ +aa049aa233f000c10c929e78f0e25b7e630ca6e9 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 08/13: Remove patch 02-spelling-errors.patch -- applied upstream
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository dhewm3.
commit e37869393d9a25a6c0f1d7ef6f742d36c3a6dff6
Author: Tobias Frost t...@coldtobi.de
Date: Thu Mar 12 09:35:01 2015 +0100
Remove patch 02-spelling-errors.patch -- applied upstream
---
debian/patches/02-spelling-errors.patch | 97 -
debian/patches/series | 1 -
2 files changed, 98 deletions(-)
diff --git a/debian/patches/02-spelling-errors.patch
b/debian/patches/02-spelling-errors.patch
deleted file mode 100644
index c3c8f85..000
--- a/debian/patches/02-spelling-errors.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Fixing some spelling errors
-Those words are fixed: s/unkown/unknown, s/seperate/separate.
-Fixes are only done in code, comments are only touch when the there was also
-a code location to fix in the same file.
-Author: Tobias Frost t...@debian.org
-Last-Update: 2015-02-14
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
a/neo/framework/DeclAF.cpp
-+++ b/neo/framework/DeclAF.cpp
-@@ -893,7 +893,7 @@
- src.Error( custom models not yet implemented
);
- return false;
- } else {
-- src.Error( unkown model type %s,
token.c_str() );
-+ src.Error( unknown model type %s,
token.c_str() );
- return false;
- }
- } else if ( !token.Icmp( origin ) ) {
a/neo/idlib/Lexer.cpp
-+++ b/neo/idlib/Lexer.cpp
-@@ -192,7 +192,7 @@
- return idLexer::punctuations[i].p;
- }
- }
-- return unkown punctuation;
-+ return unknown punctuation;
- }
-
- /*
a/neo/idlib/Parser.cpp
-+++ b/neo/idlib/Parser.cpp
-@@ -3144,7 +3144,7 @@
- return idParser::punctuations[i].p;
- }
- }
-- return unkown punctuation;
-+ return unknown punctuation;
- }
-
- /*
a/neo/d3xp/gamesys/SysCvar.cpp
-+++ b/neo/d3xp/gamesys/SysCvar.cpp
-@@ -416,4 +416,4 @@
-
- idCVar net_serverDownload(net_serverDownload,
0,CVAR_GAME | CVAR_INTEGER | CVAR_ARCHIVE, enable server
download redirects. 0: off 1: redirect to si_serverURL 2: use builtin download.
see net_serverDl cvars for configuration );
- idCVar net_serverDlBaseURL( net_serverDlBaseURL,
, CVAR_GAME | CVAR_ARCHIVE, base URL for the
download redirection );
--idCVar net_serverDlTable( net_serverDlTable,
, CVAR_GAME | CVAR_ARCHIVE, pak names for which
download is provided, seperated by ; );
-+idCVar net_serverDlTable( net_serverDlTable,
, CVAR_GAME | CVAR_ARCHIVE, pak names for which
download is provided, separated by ; );
a/neo/d3xp/physics/Physics_AF.cpp
-+++ b/neo/d3xp/physics/Physics_AF.cpp
-@@ -3075,7 +3075,7 @@
- return;
- }
-
-- // seperate friction per contact is silly but it's fast and often looks
close enough
-+ // separate friction per contact is silly but it's fast and often looks
close enough
- if ( af_useImpulseFriction.GetBool() ) {
-
- impulse.SetData( 6, VECX_ALLOCA( 6 ) );
-@@ -6963,7 +6963,7 @@
- }
-
- if ( trees.Num() 1 ) {
-- gameLocal.Warning( Articulated figure has multiple
seperate tree structures for entity '%s' type '%s'.,
-+ gameLocal.Warning( Articulated figure has multiple
separate tree structures for entity '%s' type '%s'.,
-
self-name.c_str(), self-GetType()-classname );
- }
-
a/neo/game/gamesys/SysCvar.cpp
-+++ b/neo/game/gamesys/SysCvar.cpp
-@@ -334,4 +334,4 @@
-
- idCVar net_serverDownload(net_serverDownload,
0,CVAR_GAME | CVAR_INTEGER | CVAR_ARCHIVE, enable server
download redirects. 0: off 1: redirect to si_serverURL 2: use builtin download.
see net_serverDl cvars for configuration );
- idCVar net_serverDlBaseURL( net_serverDlBaseURL,
, CVAR_GAME | CVAR_ARCHIVE, base URL for the
download redirection );
--idCVar net_serverDlTable( net_serverDlTable,
, CVAR_GAME | CVAR_ARCHIVE, pak names for which
download is provided, seperated by ; );
-+idCVar net_serverDlTable( net_serverDlTable,
, CVAR_GAME | CVAR_ARCHIVE, pak names for which
download is provided, separated by ; );
a/neo/game/physics/Physics_AF.cpp
-+++ b/neo/game/physics/Physics_AF.cpp
-@@ -3074,7 +3074,7
[dhewm3] 02/13: gbp.conf: By default, sign tags
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3. commit 8dd85b0b4a96664d93eb970c7d40b1c18cbf1eb7 Author: Tobias Frost t...@coldtobi.de Date: Thu Mar 12 07:51:06 2015 +0100 gbp.conf: By default, sign tags --- debian/gbp.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/gbp.conf b/debian/gbp.conf index cec628c..6d512d3 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,3 @@ [DEFAULT] pristine-tar = True +sign-tags = true -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 07/13: Merge tag 'upstream/0+git20150226+dfsg'
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3. commit 70d1147635d27a2674534eac6f6f4ed36bb33c73 Merge: b48f767 acfb03d Author: Tobias Frost t...@coldtobi.de Date: Thu Mar 12 09:33:54 2015 +0100 Merge tag 'upstream/0+git20150226+dfsg' Upstream version 0+git20150226+dfsg # gpg: Unterschrift vom Do 12 Mär 2015 09:33:53 CET mittels RSA-Schlüssel ID 17BD5D36 # gpg: Korrekte Unterschrift von Tobias Frost t...@coldtobi.de # gpg: alias Tobias Frost t...@frost.de # gpg: alias [jpeg image of size 5939] # gpg: alias Tobias Frost t...@debian.org ChangeLog| 8 neo/d3xp/gamesys/SysCvar.cpp | 2 +- neo/d3xp/physics/Physics_AF.cpp | 4 +- neo/framework/DeclAF.cpp | 2 +- neo/game/gamesys/SysCvar.cpp | 2 +- neo/game/physics/Physics_AF.cpp | 4 +- neo/idlib/Lexer.cpp | 2 +- neo/idlib/Parser.cpp | 2 +- neo/renderer/jpeg_memory_src.cpp | 93 neo/renderer/jpeg_memory_src.h | 24 --- 10 files changed, 17 insertions(+), 126 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] branch pristine-tar updated (e70fde5 - a57a997)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch pristine-tar in repository dhewm3. from e70fde5 pristine-tar data for dhewm3_0~git20150214+repack.orig.tar.xz new a57a997 pristine-tar data for dhewm3_0+git20150226+dfsg.orig.tar.xz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: dhewm3_0+git20150226+dfsg.orig.tar.xz.delta | Bin 0 - 31629 bytes dhewm3_0+git20150226+dfsg.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 dhewm3_0+git20150226+dfsg.orig.tar.xz.delta create mode 100644 dhewm3_0+git20150226+dfsg.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 04/13: Fix Files-Excluded in d/copyright
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository dhewm3. commit 10f56d50bc29271172b46230821fbdef2602ec28 Author: Tobias Frost t...@coldtobi.de Date: Thu Mar 12 08:24:35 2015 +0100 Fix Files-Excluded in d/copyright --- debian/copyright | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 664379f..3f168e3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: dhewm3 Source: https://github.com/dhewm/dhewm3 Comment: The removed files contained prebuilt binaries and we do not need those. -Files-Excluded: neo/tools/common/PropTree/* neo/sys/win32/* neo/sys/linux/setup/*/bin neo/sys/linux/setup/lokisetup neo/sys/linux/setup/linux-* + +Files-Excluded: neo/tools/common/PropTree/* neo/sys/win32/* + neo/sys/linux/setup/*/bin neo/sys/linux/setup/lokisetup + neo/sys/linux/setup/image-* neo/sys/linux/setup/makeself/* Files: * Copyright: 1999-2011 id Software LLC, a ZeniMax Media company -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] annotated tag debian/0+git20150226+dfsg-1 created (now 4710f8f)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag debian/0+git20150226+dfsg-1 in repository dhewm3. at 4710f8f (tag) tagging 61e47b7bac66a8d6434d9e840f3382dc6747f3b5 (commit) replaces upstream/0+git20150226+dfsg tagged by Tobias Frost on Thu Mar 12 11:24:43 2015 +0100 - Log - dhewm3 Debian release 0+git20150226+dfsg-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVAWlrAAoJEJFk+h0XvV02nbkQAK88x/ZpuHsF83Q+TvKsvChf JNWMPwEcm8KO+iIcD9AUqevkgC/zfImkJN5bQq88XALO0Zj8QfW0rO3wew7B6DFT U+B6Lpp0wmVuh1cH0niOSmQ7N6Wx/uoubC2lwudp6gmwTxr1a1JxjTiFDqkGfo/3 or9PfmlCh88ZOpTFGd+NuvsD95AusiBmt06A7Ht8pJW2e9YqoEyfzBNHU25M64td PwA7Xu3GvIkqyijekrAAA0MBV0tzTqcyxVgq74BR1yYU+oKEBmnqPwxkRnPQpZo6 +571fuGzqytFW5nz1D/7akw4S2yIp76qtk6lsM21KId2win5ivpMi/XDDnefR2Va 4CNOqrAPupEPrmc/pnrDkE+C0WBUozsLq/9C5odgD1Zx8zrky9K+DJ5hcTlPAmM6 pcyvKeUxF8j8weyWIx2IfbC5JZ6N2dP7D3wECPI0wFJTgGC9Bx116/SrEvwxfe5Q kj1UCmIn22glKyJrpYJ56JAeuWgh+xPzQvA00pDsaQXOZhg9IeGv34nKnnAXVKPx QEo3chiE+jLj9hdk/OLOX7C5FzfTALwjmY3yBfDDuDbM8rG1laEIE9TKZ5QE0Ppv 1eYSmZPh7mDddNsVgVaoj8F91C7h1YNVMqCRSdjoZLAKF2Ro1y8s/szWzn6NM+Vo GPAxoNk5DIwEnF99qocu =i8pu -END PGP SIGNATURE- Tobias Frost (13): Initial Packaging Use Files-Excluded: from d/copyright also for get-orig-source gbp.conf: By default, sign tags Change version scheme from 0~git... to 0+git... Fix Files-Excluded in d/copyright Change to dfsg suffix due to the unclear licenses of jpeg_memory_src.* Merge tag 'upstream/0+git20150226+dfsg' Remove patch 02-spelling-errors.patch -- applied upstream new upstream git snapshot Add patch to support removal of the two jpeg-files Fix get-orig-source and remove empty line from d/copyright Fix debian/watch Release... --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] annotated tag upstream/0+git20150226+dfsg created (now 2dd2c68)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag upstream/0+git20150226+dfsg in repository dhewm3. at 2dd2c68 (tag) tagging acfb03dbdc66f0e9c3cf7fdef1a1a56bf54cd6ac (commit) replaces upstream/0_git20150214+repack tagged by Tobias Frost on Thu Mar 12 09:33:53 2015 +0100 - Log - Upstream version 0+git20150226+dfsg -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVAU9xAAoJEJFk+h0XvV02Y+IP/RIQ89DtRtbXIoPIwk6RBoHA IFU6bd3INtaROVqUk+5IXApSQGeaOa3NSNwtHz+1xE55OgYJznqY4oZ0T9Te7tf3 WdInts9OQt8bHJMbE1ln4/I3972nub+oygkF7rz7o4QtmZMTdu+mmG3B0a8q3Wus lmyv12+6HHlQPT/180NGb9dJSKfIcjqdyGKWU6/BeabeCs8vUu/MeaQZVc+YbBh6 NTAXHfQ15x2JWmnFzYNYSEx7PWTk4LW5CgL9nYVb9zTXliXVRMHxKgTptnoicJcL 6mtKsUcgF6kdi/gsAw3ggAiKSABTbZ3qUTswshIsBIsEfXMxo39fotPmpUs6HM8S gard0GygtcKe9n/ageZjRvoiPhGS70WMkame/cEb8e9Z8eY6JuWl2EaDxtYmAxVb JqQT4hDAsZdXxnj+wZzK9Fj5fVGvPglKVhAW3/DX14J3tRKel5f61GdlJHg6t4nZ hmpixOdWD3/7Zy+K4jbpv8RyR0m63HnE5yL6QCOtbiXvDogpAJe07gXTw/y7flyy 7QO4jy6lO8HBh0mjdz70G3qjgU4fnWtkRPviWeXHJoNKDSGko9tHhB+iicNC6FvF 8U7etY37vVRYwjUKuNTUycPHIyaZtAxWaIle4oZSI1/phxj4mOA5/GXOEEEdaURp HwrWMlasmbM7OcVUNxTA =PGjb -END PGP SIGNATURE- Tobias Frost (1): Imported Upstream version 0+git20150226+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[dhewm3] 06/13: Imported Upstream version 0+git20150226+dfsg
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository dhewm3.
commit acfb03dbdc66f0e9c3cf7fdef1a1a56bf54cd6ac
Author: Tobias Frost t...@coldtobi.de
Date: Thu Mar 12 09:33:38 2015 +0100
Imported Upstream version 0+git20150226+dfsg
---
ChangeLog| 8
neo/d3xp/gamesys/SysCvar.cpp | 2 +-
neo/d3xp/physics/Physics_AF.cpp | 4 +-
neo/framework/DeclAF.cpp | 2 +-
neo/game/gamesys/SysCvar.cpp | 2 +-
neo/game/physics/Physics_AF.cpp | 4 +-
neo/idlib/Lexer.cpp | 2 +-
neo/idlib/Parser.cpp | 2 +-
neo/renderer/jpeg_memory_src.cpp | 93
neo/renderer/jpeg_memory_src.h | 24 ---
10 files changed, 17 insertions(+), 126 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2b38632..2ba3504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-25 Daniel Gibson metalcae...@gmail.com
+
+ * Merge pull request #108 from coldtobi/master
+
+2015-02-25 Tobias Frost t...@coldtobi.de
+
+ * Fixing some spelling errors: s/unkown/unknown, s/seperate/separate.
(#107)
+
2013-09-17 Daniel Gibson metalcae...@gmail.com
* Merge pull request #88 from waldheinz/drop-minizip-of-usage
diff --git a/neo/d3xp/gamesys/SysCvar.cpp b/neo/d3xp/gamesys/SysCvar.cpp
index 5ed1b1a..e6e7069 100644
--- a/neo/d3xp/gamesys/SysCvar.cpp
+++ b/neo/d3xp/gamesys/SysCvar.cpp
@@ -416,4 +416,4 @@ idCVar g_xp_bind_run_once( g_xp_bind_run_once, 0,
CVAR_GAME | CVAR_BOOL | CV
idCVar net_serverDownload( net_serverDownload,
0,CVAR_GAME | CVAR_INTEGER | CVAR_ARCHIVE, enable server
download redirects. 0: off 1: redirect to si_serverURL 2: use builtin download.
see net_serverDl cvars for configuration );
idCVar net_serverDlBaseURL(net_serverDlBaseURL,
, CVAR_GAME | CVAR_ARCHIVE, base URL for the
download redirection );
-idCVar net_serverDlTable( net_serverDlTable,
, CVAR_GAME | CVAR_ARCHIVE, pak names for which
download is provided, seperated by ; );
+idCVar net_serverDlTable( net_serverDlTable,
, CVAR_GAME | CVAR_ARCHIVE, pak names for which
download is provided, separated by ; );
diff --git a/neo/d3xp/physics/Physics_AF.cpp b/neo/d3xp/physics/Physics_AF.cpp
index b716b74..098a4bf 100644
--- a/neo/d3xp/physics/Physics_AF.cpp
+++ b/neo/d3xp/physics/Physics_AF.cpp
@@ -3075,7 +3075,7 @@ void idAFConstraint_Contact::ApplyFriction( float
invTimeStep ) {
return;
}
- // seperate friction per contact is silly but it's fast and often looks
close enough
+ // separate friction per contact is silly but it's fast and often looks
close enough
if ( af_useImpulseFriction.GetBool() ) {
impulse.SetData( 6, VECX_ALLOCA( 6 ) );
@@ -6963,7 +6963,7 @@ void idPhysics_AF::BuildTrees( void ) {
}
if ( trees.Num() 1 ) {
- gameLocal.Warning( Articulated figure has multiple
seperate tree structures for entity '%s' type '%s'.,
+ gameLocal.Warning( Articulated figure has multiple
separate tree structures for entity '%s' type '%s'.,
self-name.c_str(), self-GetType()-classname );
}
diff --git a/neo/framework/DeclAF.cpp b/neo/framework/DeclAF.cpp
index 2809f29..32bcf98 100644
--- a/neo/framework/DeclAF.cpp
+++ b/neo/framework/DeclAF.cpp
@@ -893,7 +893,7 @@ bool idDeclAF::ParseBody( idLexer src ) {
src.Error( custom models not yet implemented
);
return false;
} else {
- src.Error( unkown model type %s,
token.c_str() );
+ src.Error( unknown model type %s,
token.c_str() );
return false;
}
} else if ( !token.Icmp( origin ) ) {
diff --git a/neo/game/gamesys/SysCvar.cpp b/neo/game/gamesys/SysCvar.cpp
index 9751ca8..34fee96 100644
--- a/neo/game/gamesys/SysCvar.cpp
+++ b/neo/game/gamesys/SysCvar.cpp
@@ -334,4 +334,4 @@ idCVar mod_validSkins(
mod_validSkins, skins/characters/player/marine_mp
idCVar net_serverDownload( net_serverDownload,
0,CVAR_GAME | CVAR_INTEGER | CVAR_ARCHIVE, enable server
download redirects. 0: off 1: redirect to si_serverURL 2: use builtin download.
see net_serverDl cvars for configuration );
idCVar net_serverDlBaseURL(net_serverDlBaseURL,
, CVAR_GAME | CVAR_ARCHIVE, base URL for the
download
[dhewm3] branch upstream updated (31c30f2 - acfb03d)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch upstream in repository dhewm3. from 31c30f2 Imported Upstream version 0~git20150214+repack new acfb03d Imported Upstream version 0+git20150226+dfsg The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: ChangeLog| 8 neo/d3xp/gamesys/SysCvar.cpp | 2 +- neo/d3xp/physics/Physics_AF.cpp | 4 +- neo/framework/DeclAF.cpp | 2 +- neo/game/gamesys/SysCvar.cpp | 2 +- neo/game/physics/Physics_AF.cpp | 4 +- neo/idlib/Lexer.cpp | 2 +- neo/idlib/Parser.cpp | 2 +- neo/renderer/jpeg_memory_src.cpp | 93 neo/renderer/jpeg_memory_src.h | 24 --- 10 files changed, 17 insertions(+), 126 deletions(-) delete mode 100644 neo/renderer/jpeg_memory_src.cpp delete mode 100644 neo/renderer/jpeg_memory_src.h -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] annotated tag upstream/1.0.3 created (now 3c8bf2a)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag upstream/1.0.3 in repository rbdoom3bfg. at 3c8bf2a (tag) tagging 89d8db254aa03471b282e7e2bb770ca9881e6ceb (commit) replaces upstream/1.0.2_git20150215+repack2 tagged by Tobias Frost on Wed Mar 11 09:31:36 2015 +0100 - Log - Upstream version 1.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJU//2LAAoJEJFk+h0XvV02sQ8QAOQKfxXFm79+b2K2X+zUReuq WoP2fJMA+QSmTGLjZR1h/g41hi6CkN6ku0Xe3xPFIad8WNn1kSRZYsDkgI+kC0xh JnNtH4osgW7PRNki6XBbCjJc6GcRGGgl/hs2EHii3H9aK1puytuXa6wK+y3MDBJ7 H3EcNq6aj4oS3PR6aUhhr4DTRX0Y1dCXncOcPEUuate8eb14/EKJfAWu9g1LOAw0 tVXaK+JkdQHMWAH19RvAJBmFD42deqqn5S9dHtWNKr8/jfstlJqJWR56o6FnA62m exQD/tyICKb7Q6MBuxVHprkKba52NNFY+Ka34p/07qDO9VDg08xlapHRXG8SbRPd YKlc/JGNxc4RDyrceUlKis2uPcw+5zSmFxwLc4TeG0cFPCTGopKc7mMR45QhhqDD xeSBPuHjFQnpUCo3exwLO9Ccy2/TPLUStzXA0knBJCPkSXkJXGKhvPqX+xlSHF0k b0CfejwvgeT3mcTefdH3gijXknX1oNEU6Z21WCuAAlYWg9T7d54D/WH53w5gti0u hGxj3v/D9Li3dI2FQ5eEEuo/QzvVs1KcUsOEladc4wkKQRayspFgkuGtgmJ3BHEr U8Py1pdCj2meSwI5nHmWE3R51vEU3U/jsElHdFUNOYf6RxCumhveU+jOCIICD1UK ZyKtU5KQqnJJqeI737/G =XUaP -END PGP SIGNATURE- Tobias Frost (1): Imported Upstream version 1.0.3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 01/01: Use Files-Excluded in get-orig-sourceto rmove files.
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 2ad249b39d286e40194520803222061ea9eac330
Author: Tobias Frost t...@coldtobi.de
Date: Wed Mar 11 10:25:07 2015 +0100
Use Files-Excluded in get-orig-sourceto rmove files.
---
debian/rules | 14 +-
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/debian/rules b/debian/rules
index c83df02..d19ac74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,19 +50,7 @@ $(PKG)_$(UPSVER)+git$(VER)$(DTYPE).orig.tar.xz:
echo # Setting times... \
for F in $$(git ls-tree -r --name-only HEAD); do touch
--no-dereference -d $$(git log -1 --format=%ai -- $$F) $$F; done \
echo # Cleaning-up... \
-$(RM) -r -v \
- neo/libs/openal-soft/win32/OpenAL32.dll neo/*.exe \
- neo/libs/ffmpeg-win*/ neo/sys/win32 neo/libs/mingw-hacks \
- neo/libs/zlib/*.c neo/libs/zlib/*.h neo/libs/zlib/README \
- neo/libs/zlib/Makefile* neo/libs/zlib/zconf.h.included \
- neo/libs/zlib/INDEX neo/libs/zlib/ChangeLog neo/libs/zlib/configure \
- neo/libs/zlib/FAQ neo/libs/zlib/algorithm.txt \
- neo/libs/zlib/zconf.h.in neo/libs/zlib/zlib.3 \
- neo/libs/png \
- neo/libs/jpeg-6 \
- neo/libs/glew \
- neo/libs/openal-soft \
- neo/astyle.x86 neo/astyle.x86_64 \
+$(RM) -r -v $$(awk
'BEGIN{RS=ORS=\n\n;FS=OFS=\n}/Files-Excluded:/' $(PKD)/copyright | sed
s/Files-Excluded://) \
$(RM) -r .git .git*
@echo # Packing...
find -L $(PKG)-$(UPSVER)+git$(VER) -xdev -type f -print | sort \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch master updated (c15f682 - 2ad249b)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch master in repository rbdoom3bfg. from c15f682 Adding repacksuffix to d/watch new 2ad249b Use Files-Excluded in get-orig-sourceto rmove files. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/rules | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 04/06: Merge tag 'upstream/1.0.3+repack1'
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit e1e531bf027a2b2c48c52ac21374d4508c72 Merge: 7307d39 4d8a13b Author: Tobias Frost t...@coldtobi.de Date: Wed Mar 11 11:25:15 2015 +0100 Merge tag 'upstream/1.0.3+repack1' Upstream version 1.0.3+repack1 # gpg: Unterschrift vom Mi 11 Mär 2015 11:25:15 CET mittels RSA-Schlüssel ID 17BD5D36 # gpg: Korrekte Unterschrift von Tobias Frost t...@coldtobi.de # gpg: alias Tobias Frost t...@frost.de # gpg: alias [jpeg image of size 5939] # gpg: alias Tobias Frost t...@debian.org neo/libs/zlib/minizip/ioapi.c | 250 +++ neo/libs/zlib/minizip/ioapi.h | 211 neo/libs/zlib/minizip/unzip.h | 454 ++ neo/libs/zlib/minizip/zip.h | 362 + 4 files changed, 1277 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 03/06: Imported Upstream version 1.0.3+repack1
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 4d8a13b652bee2387137c83d556daa8fa3b55170
Author: Tobias Frost t...@coldtobi.de
Date: Wed Mar 11 11:25:02 2015 +0100
Imported Upstream version 1.0.3+repack1
---
neo/libs/zlib/minizip/ioapi.c | 250 +++
neo/libs/zlib/minizip/ioapi.h | 211
neo/libs/zlib/minizip/unzip.h | 454 ++
neo/libs/zlib/minizip/zip.h | 362 +
4 files changed, 1277 insertions(+)
diff --git a/neo/libs/zlib/minizip/ioapi.c b/neo/libs/zlib/minizip/ioapi.c
new file mode 100644
index 000..5dc99d5
--- /dev/null
+++ b/neo/libs/zlib/minizip/ioapi.c
@@ -0,0 +1,250 @@
+/*
+ this is from zlib-1.2.7/contrib/minizip/
+
+ ioapi.h -- IO base function header for compress/uncompress .zip
+ part of the MiniZip project - (
http://www.winimage.com/zLibDll/minizip.html )
+
+ Copyright (C) 1998-2010 Gilles Vollant (minizip) (
http://www.winimage.com/zLibDll/minizip.html )
+
+ Modifications for Zip64 support
+ Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+ For more info read MiniZip_info.txt
+
+*/
+
+#if defined(_WIN32) (!(defined(_CRT_SECURE_NO_WARNINGS)))
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#if defined(__APPLE__) || defined(IOAPI_NO_64)
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no
need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
+#include ioapi.h
+
+voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const
void*filename,int mode)
+{
+if (pfilefunc-zfile_func64.zopen64_file != NULL)
+return (*(pfilefunc-zfile_func64.zopen64_file))
(pfilefunc-zfile_func64.opaque,filename,mode);
+else
+{
+return
(*(pfilefunc-zopen32_file))(pfilefunc-zfile_func64.opaque,(const
char*)filename,mode);
+}
+}
+
+long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream,
ZPOS64_T offset, int origin)
+{
+if (pfilefunc-zfile_func64.zseek64_file != NULL)
+return (*(pfilefunc-zfile_func64.zseek64_file))
(pfilefunc-zfile_func64.opaque,filestream,offset,origin);
+else
+{
+uLong offsetTruncated = (uLong)offset;
+if (offsetTruncated != offset)
+return -1;
+else
+return
(*(pfilefunc-zseek32_file))(pfilefunc-zfile_func64.opaque,filestream,offsetTruncated,origin);
+}
+}
+
+ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf
filestream)
+{
+if (pfilefunc-zfile_func64.zseek64_file != NULL)
+return (*(pfilefunc-zfile_func64.ztell64_file))
(pfilefunc-zfile_func64.opaque,filestream);
+else
+{
+uLong tell_uLong =
(*(pfilefunc-ztell32_file))(pfilefunc-zfile_func64.opaque,filestream);
+if ((tell_uLong) == MAXU32)
+return (ZPOS64_T)-1;
+else
+return tell_uLong;
+}
+}
+
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def*
p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
+{
+p_filefunc64_32-zfile_func64.zopen64_file = NULL;
+p_filefunc64_32-zopen32_file = p_filefunc32-zopen_file;
+p_filefunc64_32-zfile_func64.zerror_file = p_filefunc32-zerror_file;
+p_filefunc64_32-zfile_func64.zread_file = p_filefunc32-zread_file;
+p_filefunc64_32-zfile_func64.zwrite_file = p_filefunc32-zwrite_file;
+p_filefunc64_32-zfile_func64.ztell64_file = NULL;
+p_filefunc64_32-zfile_func64.zseek64_file = NULL;
+p_filefunc64_32-zfile_func64.zclose_file = p_filefunc32-zclose_file;
+p_filefunc64_32-zfile_func64.zerror_file = p_filefunc32-zerror_file;
+p_filefunc64_32-zfile_func64.opaque = p_filefunc32-opaque;
+p_filefunc64_32-zseek32_file = p_filefunc32-zseek_file;
+p_filefunc64_32-ztell32_file = p_filefunc32-ztell_file;
+}
+
+
+
+static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const char*
filename, int mode));
+static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream,
void* buf, uLong size));
+static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream,
const void* buf,uLong size));
+static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
+static longZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream,
ZPOS64_T offset, int origin));
+static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
+static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
+
+static voidpf
[rbdoom3bfg] 01/06: Fix version mangling in d/watch
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit e6f427260cde34c8d03391e5cb9f7653cbd58f0c Author: Tobias Frost t...@coldtobi.de Date: Wed Mar 11 11:19:39 2015 +0100 Fix version mangling in d/watch --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index 4b41e88..1e25268 100644 --- a/debian/watch +++ b/debian/watch @@ -3,6 +3,6 @@ version=3 # please use get-orig-source; refer to README.source. # this files only purpose is to track new upstream tagged releases. opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/rbdoom3bfg-$1\.tar\.gz/,\ -dversionmangle=s/\~git.*$//,uversionmangle=s/-/~/,\ +dversionmangle=s/\+git.*$//;s/\+repack.*$//,uversionmangle=s/-/~/,\ repacksuffix=+repack \ https://github.com/RobertBeckebans/RBDOOM-3-BFG/tags .*/v?(\d\S*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] annotated tag upstream/1.0.3+repack1 created (now 74bdc23)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to annotated tag upstream/1.0.3+repack1 in repository rbdoom3bfg. at 74bdc23 (tag) tagging 4d8a13b652bee2387137c83d556daa8fa3b55170 (commit) replaces upstream/1.0.3 tagged by Tobias Frost on Wed Mar 11 11:25:15 2015 +0100 - Log - Upstream version 1.0.3+repack1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJVABgLAAoJEJFk+h0XvV02hloQAJ1Yhh4pVKDP/h1fPCZnyakN leY4qUb2aAaZrmqOAQU2rIiV9xcBgB6q1w2j2av2/D4OOmkeDFRSfLBuA9iGQQeH FO0NRX0GArOmwly5s+BQU31TyAJTnp8U5gOu/B+DaxwxHb75VfXBPorvm5KwxHsV CrTWVdd0qmqIGMzinB4ODpOK1NpSpFRhCAXhMVNOZu2wdDH4S/EvE9zBZHdZMo87 WmgSqBEB2v7prlgVcj1slRq/1uTYht5x0FST1NwglREmila6KtA212ocXZLaYny1 UQpom+8mq5AtJ1IbKDg4xx1YymxEXjTB16xupO6gBfRxs/JtTGr7xPwb6xTRg2BC iN8fGvzJ6UTGUGeRqjHtsDWP/qSW2XaHLuo4jW0Z/DxXnFKqUWvKoh6EYOHa87+h fSkj0b1+WBh8Ia1tpAUFjAxLKu0F3WrEDnpcd7VH1pT9JsNV7X8JtD4pK+8Emy/s vg676bEp6K/5Ru0bUJabjTNfnLojpmXl3MB4YsxmzS01IUy8MrlMqgJyjUzU9/gI ZeQDHrnL0lYHUpqp+Dptv5Mq8RE71G/Fu2R6P/zQ1Ysri54yCcj83C4KmQVqbQsc /nFX6p6Kf5DkjsSoE+fvfULpa5WnCMlVhDDZ4brv5jTgpjgTY2HDE9Tdw78YGygH VykVzdtEQisdLFTOx5ar =lqds -END PGP SIGNATURE- Tobias Frost (1): Imported Upstream version 1.0.3+repack1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] 05/06: Add some docs and ensure that the changelog is installed when packaging on release tarballs and not on git
This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository rbdoom3bfg. commit a7fc6b4a8ba0c7b9f030ea73680aa8f29976 Author: Tobias Frost t...@coldtobi.de Date: Wed Mar 11 12:53:34 2015 +0100 Add some docs and ensure that the changelog is installed when packaging on release tarballs and not on git --- debian/changelog | 2 +- debian/docs | 2 ++ debian/rules | 8 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 105f844..56ced61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -rbdoom3bfg (1.0.3+repack-1) UNRELEASED; urgency=medium +rbdoom3bfg (1.0.3+repack1-1) UNRELEASED; urgency=medium * Initial release (Closes: #764200) diff --git a/debian/docs b/debian/docs index 71dfd5b..10cd555 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,3 @@ README.txt +README_SDL_Joystick.txt +RELEASE-NOTES.txt diff --git a/debian/rules b/debian/rules index d19ac74..692e0eb 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,14 @@ override_dh_auto_configure: #-DCMAKE_BUILD_TYPE=RelWithDebInfo +override_dh_installchangelogs: + # We won't have a ChangeLog if packaging from a released tarball. + # In this case, use the RELEASE-NOTES.txt + dh_installchangelogs + if [ ! -e ChangeLog ]; then \ + dh_installchangelogs -k RELEASE-NOTES.txt ; \ + fi + # For get-orig-source UURL = https://github.com/RobertBeckebans/RBDOOM-3-BFG.git PKD = $(abspath $(dir $(MAKEFILE_LIST))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rbdoom3bfg] branch pristine-tar updated (da04f3d - 28b16f3)
This is an automated email from the git hooks/post-receive script. tobi pushed a change to branch pristine-tar in repository rbdoom3bfg. from da04f3d pristine-tar data for rbdoom3bfg_1.0.3.orig.tar.xz new 28b16f3 pristine-tar data for rbdoom3bfg_1.0.3+repack1.orig.tar.xz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: rbdoom3bfg_1.0.3+repack1.orig.tar.xz.delta | Bin 0 - 35912 bytes rbdoom3bfg_1.0.3+repack1.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 rbdoom3bfg_1.0.3+repack1.orig.tar.xz.delta create mode 100644 rbdoom3bfg_1.0.3+repack1.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
