[rbdoom3bfg] 02/02: Merge branch 'master' of ssh://git.debian.org/git/pkg-games/rbdoom3bfg

2015-06-19 Thread Tobias Frost
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)

2015-06-19 Thread Tobias Frost
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

2015-06-19 Thread Tobias Frost
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)

2015-06-19 Thread Tobias Frost
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)

2015-06-19 Thread Tobias Frost
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


[game-data-packager] branch master updated (e3f9133 - 319a1ff)

2015-06-19 Thread Alexandre Detiste
This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a change to branch master
in repository game-data-packager.

  from  e3f9133   babel.py: don't make validator cry
   new  ef4dc6c   zipfile: match on basename for unknown  quircky archives
   new  319a1ff   dreamweb: add French version

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:
 data/dreamweb.yaml | 3510 +---
 game_data_packager/__init__.py |4 +
 2 files changed, 2179 insertions(+), 1335 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/game-data-packager.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


[game-data-packager] 01/02: zipfile: match on basename for unknown quircky archives

2015-06-19 Thread Alexandre Detiste
This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit ef4dc6c7f352144fbe92168535e48aee0ea8d3f6
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date:   Fri Jun 19 13:38:28 2015 +0200

zipfile: match on basename for unknown  quircky archives
---
 game_data_packager/__init__.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 7685488..fbca4d8 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -1207,9 +1207,11 @@ class GameData(object):
 if provider is None:
 try_to_unpack = self.files
 should_provide = set()
+distinctive_dirs = False
 else:
 try_to_unpack = provider.provides
 should_provide = set(try_to_unpack)
+distinctive_dirs = provider.unpack.get('distinctive_dirs', True)
 
 for entry in zf.infolist():
 if not entry.file_size:
@@ -1230,6 +1232,8 @@ class GameData(object):
 match_path = '/' + entry.filename.lower()
 
 for lf in wanted.look_for:
+if not distinctive_dirs:
+lf = os.path.basename(lf)
 if match_path.endswith('/' + lf):
 should_provide.discard(filename)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/game-data-packager.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

2015-06-19 Thread Tobias Frost
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)

2015-06-19 Thread Tobias Frost
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
+ .
+ On 

[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

2015-06-19 Thread Tobias Frost
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

2015-06-19 Thread Tobias Frost
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)

2015-06-19 Thread Tobias Frost
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

2015-06-19 Thread Tobias Frost
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

2015-06-19 Thread Tobias Frost
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)

2015-06-19 Thread Tobias Frost
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

2015-06-19 Thread Tobias Frost
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