[openal-soft] 01/02: Add an explicit 'build' rule

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag debian/1%1.18.2-2
in repository openal-soft.

commit a12165566d65b15016677116d93db548861b5479
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 22 07:57:41 2018 +

Add an explicit 'build' rule

.PHONY is ignored for implicit rules like the one for %, but this
was previously masked by debhelper bug #880840, which resulted in the
actual build being done during the binary target. This fixes FTBFS with
dpkg-buildpackage --build=any,all.

Closes: #887664
---
 debian/changelog | 10 ++
 debian/rules |  4 
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 36152a9..a0b7fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openal-soft (1:1.18.2-2) UNRELEASED; urgency=medium
+
+  * d/rules: Add an explicit 'build' rule. .PHONY is ignored for implicit
+rules like the one for %, but this was previously masked by debhelper
+bug #880840, which resulted in the actual build being done during the
+binary target. This fixes FTBFS with dpkg-buildpackage --build=any,all
+(Closes: #887664)
+
+ -- Simon McVittie <s...@debian.org>  Mon, 22 Jan 2018 07:54:44 +
+
 openal-soft (1:1.18.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 8830dff..db59fa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,10 @@ endif
 DLOPENED_SUGGESTS_LIBS = -lportaudio -lsndio
 
 .PHONY: build
+# This looks redundant with the implicit rule for %, but it isn't: .PHONY
+# is ignored for implicit rules, so we need a separate rule for build.
+build:
+   dh $@ --builddirectory=$(BUILD_TREE)
 %:
dh $@ --builddirectory=$(BUILD_TREE)
 

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

[openal-soft] annotated tag debian/1%1.18.2-2 created (now 49fbc91)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to annotated tag debian/1%1.18.2-2
in repository openal-soft.

at  49fbc91   (tag)
   tagging  54addbe741fb6865a505605d190827980a5326d4 (commit)
  replaces  debian/1%1.18.2-1
 tagged by  Simon McVittie
on  Mon Jan 22 08:51:17 2018 +

- Log -
openal-soft Debian release 1:1.18.2-2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAlplpgUACgkQ4FrhR4+B
TE8VxxAAjBv12Gq6IGrCo1kuv9GjNl3XXkoajBbiFKmha0fg08BynEr5JMs6Apow
jimf2lKm2xl7gP3d72yqyHqVmK+Mr6Z6aTrDNU8FbnXfBBN05iV6L7fbqp88B7ko
2MTzZROJMbd2TVgeDNOPGSurbjBB72+dkM2uTj9tnRyLbLZKkV7P/1DYSEJPoXbG
rrcJWsiIxi3QtkcGGz1ITfke9a5rw8/lbqYrN27h29tY/482aSXc48ZMVi7pb0ZZ
0QIC8rIQBcjgoXWLKrn50Cgt5IWxGKOF8fdENnYmQhrND6frRfF8nBMGl9cu2Vrb
DAsoRZ0OEjtfZ5iJi/EBA1qYjc7kuX8YZhfhJ1ItG/MR5e25d//QKSV04utL6Hhm
5UgHNJUcLe/UqVI+t6ySNbP8IPoz9HwLaQcLAcPCsy5sl2vcTcCX+upBIvlEwK+k
odYQ4sl6DW8Picr94UIpCs0v2XD+hT1aWVT231HhIPRMJf31B+i8aQTp1lnqsJhn
crre6rRn6mBkIK5/BY5DDs73A+BECmvB1WQQI3xZO6YC+++RKQDZ928HmJ4tPBpR
yefQYTRVjy2TFJPeTPU3SD++I5xPK9KW/+JQSfWxGdVPC6QGepy1HSqeE5Pg9Ame
C7OqqSLYLd2oFtK1KACAbGKF9vyjrfj6vW5pmBjiP2ruBGZxHuU=
=fGLU
-END PGP SIGNATURE-

Simon McVittie (2):
  Add an explicit 'build' rule
  Team upload

---

This annotated tag includes the following new commits:

   new  a121655   Add an explicit 'build' rule
   new  54addbe   Team upload

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.


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

[openal-soft] branch master updated (2664015 -> 54addbe)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch master
in repository openal-soft.

  from  2664015   Update changelog
  adds  a121655   Add an explicit 'build' rule
  adds  54addbe   Team upload

No new revisions were added by this update.

Summary of changes:
 debian/changelog | 11 +++
 debian/rules |  4 
 2 files changed, 15 insertions(+)

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

[openal-soft] 02/02: Team upload

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag debian/1%1.18.2-2
in repository openal-soft.

commit 54addbe741fb6865a505605d190827980a5326d4
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 22 08:07:36 2018 +

Team upload
---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0b7fe6..b114a14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-openal-soft (1:1.18.2-2) UNRELEASED; urgency=medium
+openal-soft (1:1.18.2-2) unstable; urgency=medium
 
+  * Team upload
   * d/rules: Add an explicit 'build' rule. .PHONY is ignored for implicit
 rules like the one for %, but this was previously masked by debhelper
 bug #880840, which resulted in the actual build being done during the
 binary target. This fixes FTBFS with dpkg-buildpackage --build=any,all
 (Closes: #887664)
 
- -- Simon McVittie <s...@debian.org>  Mon, 22 Jan 2018 07:54:44 +0000
+ -- Simon McVittie <s...@debian.org>  Mon, 22 Jan 2018 08:07:28 +
 
 openal-soft (1:1.18.2-1) unstable; urgency=medium
 

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

[openarena-data] 01/02: Merge branch 'openarena-data' into openarena-textures

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-textures
in repository openarena-data.

commit 151eb186a8cc84160ed782de39c59821bc7e1c1b
Merge: ec428de 77f1c48
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:48:50 2018 +

Merge branch 'openarena-data' into openarena-textures

 debian/README.source | 30 +++---
 debian/changelog |  9 +
 debian/control   |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index a19d1ac,736c6c5..351c825
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-textures (0.8.5split-11) UNRELEASED; urgency=medium
+ 
+   * Declare compliance with Debian Policy v4.1.3
+   * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+   * Update Vcs-* for move to salsa.debian.org
+ 
+  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
+ 
 -openarena-data (0.8.5split-10) unstable; urgency=medium
 +openarena-textures (0.8.5split-10) unstable; urgency=medium
  
 +  * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index 4ac2747,14f88cd..726fc99
--- a/debian/control
+++ b/debian/control
@@@ -12,16 -12,25 +12,16 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
- Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b 
openarena-textures
- Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-textures
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-textures
++Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-textures
  
 -Package: openarena-data
 +Package: openarena-081-textures
  Architecture: all
 -Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
 - ${misc:Depends},
 -Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Depends: ${misc:Depends}
 +Replaces: openarena-data (<< 0.8.5split)
 +Description: OpenArena game data - textures from 0.8.1
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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

[openarena-data] 02/02: Merge branch 'openarena-data' into openarena-textures

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-textures
in repository openarena-data.

commit 7eadda89de648d2a49ec95af46283b0f32d71d1c
Merge: 151eb18 1834bc6
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 09:08:48 2018 +

Merge branch 'openarena-data' into openarena-textures

 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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

[openarena-data] branch openarena-085-data updated (5662b3d -> 12c6757)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch openarena-085-data
in repository openarena-data.

  from  5662b3d   Merge from openarena-data/0.8.5split-10:
  adds  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  a4ff3a4   Merge branch 'openarena-data' into openarena-085-data
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  6ead599   Merge branch 'openarena-data' into openarena-085-data
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data
   new  12c6757   Remove empty d/watch

The 8 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/README.source | 30 +++---
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/watch |  3 ---
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 debian/watch

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

[openarena-data] branch openarena-players-mature updated (733625c -> d9b28fb)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch openarena-players-mature
in repository openarena-data.

  from  733625c   Merge from openarena-data/0.8.5split-10:
  adds  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  15b55e0   Merge branch 'openarena-data' into 
openarena-players-mature
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data
   new  d9b28fb   Merge branch 'openarena-data' into 
openarena-players-mature

The 7 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/README.source | 30 +++---
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/watch |  3 ---
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 debian/watch

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

[openarena-data] branch openarena-misc updated (0a0ea1b -> 342dfe5)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch openarena-misc
in repository openarena-data.

  from  0a0ea1b   Merge from openarena-data/0.8.5split-10:
  adds  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  76d613e   Merge branch 'openarena-data' into openarena-misc
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data
   new  342dfe5   Merge branch 'openarena-data' into openarena-misc

The 7 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/README.source | 30 +++---
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/watch |  3 ---
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 debian/watch

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

[openarena-data] 02/02: Merge branch 'openarena-data' into openarena-players-mature

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-players-mature
in repository openarena-data.

commit d9b28fb56369486f9e179b837a4ec208a8aa9134
Merge: 15b55e0 1834bc6
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 09:08:24 2018 +

Merge branch 'openarena-data' into openarena-players-mature

 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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

[openarena-data] 02/02: Merge branch 'openarena-data' into openarena-oacmp1

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-oacmp1
in repository openarena-data.

commit 1a238d9d4efe1c0bd92703b0db1d5417d3189455
Merge: c2932ba 1834bc6
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 09:07:35 2018 +

Merge branch 'openarena-data' into openarena-oacmp1

 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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

[openarena-data] 02/02: Merge branch 'openarena-data' into openarena-misc

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-misc
in repository openarena-data.

commit 342dfe5e7027d0f88b302b8448f9ba378eef2795
Merge: 76d613e 1834bc6
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 09:06:51 2018 +

Merge branch 'openarena-data' into openarena-misc

 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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

[openarena-data] 02/02: Merge branch 'openarena-data' into openarena-088-data

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-088-data
in repository openarena-data.

commit 37d2fa0ce374065819601d8b23fd7a11ac7acb8f
Merge: 438c40a 1834bc6
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 09:05:59 2018 +

Merge branch 'openarena-data' into openarena-088-data

 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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

[openarena-data] 01/02: Merge branch 'openarena-data' into openarena-oacmp1

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-oacmp1
in repository openarena-data.

commit c2932baddbe6b57124330ebaf9adcbc1147f913a
Merge: 119fcb3 77f1c48
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:46:55 2018 +

Merge branch 'openarena-data' into openarena-oacmp1

 debian/README.source | 30 +++---
 debian/changelog |  9 +
 debian/control   |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 16fa798,736c6c5..a2a361b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-oacmp1 (3-4) UNRELEASED; urgency=medium
+ 
+   * Declare compliance with Debian Policy v4.1.3
+   * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+   * Update Vcs-* for move to salsa.debian.org
+ 
+  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
+ 
 -openarena-data (0.8.5split-10) unstable; urgency=medium
 +openarena-oacmp1 (3-3) unstable; urgency=medium
  
 +  * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index 559a914,14f88cd..2921784
--- a/debian/control
+++ b/debian/control
@@@ -12,23 -12,25 +12,23 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
- Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b 
openarena-oacmp1
- Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-oacmp1
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-oacmp1
++Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-oacmp1
  
 -Package: openarena-data
 +Package: openarena-oacmp1
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
 + openarena-088-data,
   ${misc:Depends},
 +Enhances:
 + openarena,
 + openarena-server,
  Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 + openarena (<< 0.8.8),
 + openarena-server (<< 0.8.8),
 +Description: OpenArena Community Map Pack 1
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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

[openarena-data] 02/02: Merge branch 'openarena-data' into openarena-players

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-players
in repository openarena-data.

commit 5d5a362981ba52f3f80387e572c2ca17fdb6a382
Merge: 3370d31 1834bc6
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 09:08:00 2018 +

Merge branch 'openarena-data' into openarena-players

 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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

[openarena-data] branch openarena-textures updated (ec428de -> 7eadda8)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch openarena-textures
in repository openarena-data.

  from  ec428de   Merge from openarena-data/0.8.5split-10:
  adds  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  151eb18   Merge branch 'openarena-data' into openarena-textures
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data
   new  7eadda8   Merge branch 'openarena-data' into openarena-textures

The 7 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/README.source | 30 +++---
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/watch |  3 ---
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 debian/watch

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

[openarena-data] 01/03: Merge branch 'openarena-data' into openarena-085-data

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-085-data
in repository openarena-data.

commit a4ff3a4e3753b3fdd7374c830ecb18e08a0c7e69
Merge: 5662b3d f896e04
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:41:35 2018 +

Merge branch 'openarena-data' into openarena-085-data

 debian/README.source | 30 +++---
 debian/changelog |  9 +
 debian/control   |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index ab08439,cf344bc..44320bb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-085-data (0.8.5split-11) UNRELEASED; urgency=medium
+ 
+   * Declare compliance with Debian Policy v4.1.2
+   * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+   * Update Vcs-* for move to salsa.debian.org
+ 
+  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
+ 
 -openarena-data (0.8.5split-10) unstable; urgency=medium
 +openarena-085-data (0.8.5split-10) unstable; urgency=medium
  
 +  * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index d624479,2e08ba9..62b84bb
--- a/debian/control
+++ b/debian/control
@@@ -12,18 -12,25 +12,18 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.2
  Homepage: http://www.openarena.ws/
- Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b 
openarena-085-data
- Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-085-data
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-085-data
++Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-085-data
  
 -Package: openarena-data
 +Package: openarena-085-data
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
 -Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Replaces:
 + openarena-data (<< 0.8.5split),
 +Description: OpenArena game data - 0.8.5 update
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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

[openarena-data] branch openarena-oacmp1 updated (119fcb3 -> 1a238d9)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch openarena-oacmp1
in repository openarena-data.

  from  119fcb3   Merge from openarena-data/0.8.5split-10:
  adds  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  c2932ba   Merge branch 'openarena-data' into openarena-oacmp1
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data
   new  1a238d9   Merge branch 'openarena-data' into openarena-oacmp1

The 7 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/README.source | 30 +++---
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/watch |  3 ---
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 debian/watch

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

[openarena-data] branch openarena-players updated (b65f3a6 -> 5d5a362)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch openarena-players
in repository openarena-data.

  from  b65f3a6   Merge from openarena-data/0.8.5split-10:
  adds  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  3370d31   Merge branch 'openarena-data' into openarena-players
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data
   new  5d5a362   Merge branch 'openarena-data' into openarena-players

The 7 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/README.source | 30 +++---
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/watch |  3 ---
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 debian/watch

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

[openarena-data] 01/02: Merge branch 'openarena-data' into openarena-players

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-players
in repository openarena-data.

commit 3370d3184e4d752d6875a514a1439b00d4b73ec0
Merge: b65f3a6 77f1c48
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:47:31 2018 +

Merge branch 'openarena-data' into openarena-players

 debian/README.source | 30 +++---
 debian/changelog |  9 +
 debian/control   |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 1c7338e,736c6c5..d43dd7a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-players (0.8.5split-11) UNRELEASED; urgency=medium
+ 
+   * Declare compliance with Debian Policy v4.1.3
+   * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+   * Update Vcs-* for move to salsa.debian.org
+ 
+  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
+ 
 -openarena-data (0.8.5split-10) unstable; urgency=medium
 +openarena-players (0.8.5split-10) unstable; urgency=medium
  
 +  * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index 5b4163f,14f88cd..e35d0c1
--- a/debian/control
+++ b/debian/control
@@@ -12,18 -12,25 +12,18 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
- Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b 
openarena-players
- Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-players
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-players
++Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-players
  
 -Package: openarena-data
 +Package: openarena-081-players
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
 -Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Replaces:
 + openarena-data (<< 0.8.5split),
 +Description: OpenArena game data - player graphics from 0.8.1
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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

[openarena-data] 01/02: Merge branch 'openarena-data' into openarena-players-mature

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-players-mature
in repository openarena-data.

commit 15b55e06fefc63877d18a2b0e85b3451a78b1e77
Merge: 733625c 77f1c48
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:48:08 2018 +

Merge branch 'openarena-data' into openarena-players-mature

 debian/README.source | 30 +++---
 debian/changelog |  9 +
 debian/control   |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index a6df1b3,736c6c5..4c8061b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-players-mature (0.8.5split-11) UNRELEASED; urgency=medium
+ 
+   * Declare compliance with Debian Policy v4.1.3
+   * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+   * Update Vcs-* for move to salsa.debian.org
+ 
+  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
+ 
 -openarena-data (0.8.5split-10) unstable; urgency=medium
 +openarena-players-mature (0.8.5split-10) unstable; urgency=medium
  
 +  * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index 8a9ac10,14f88cd..f3cb2fc
--- a/debian/control
+++ b/debian/control
@@@ -12,18 -12,25 +12,18 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
- Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b 
openarena-players-mature
- Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-players-mature
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-players-mature
++Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-players-mature
  
 -Package: openarena-data
 +Package: openarena-081-players-mature
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
 -Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Replaces:
 + openarena-data (<< 0.8.5split),
 +Description: OpenArena game data - "mature" player graphics from 0.8.1
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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

[openarena-data] 01/02: Merge branch 'openarena-data' into openarena-maps

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-maps
in repository openarena-data.

commit d3cbaea85f52ed950fe53b60de2f47227dd20017
Merge: ebfefd2 77f1c48
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:45:13 2018 +

Merge branch 'openarena-data' into openarena-maps

 debian/README.source | 30 +++---
 debian/changelog |  9 +
 debian/control   |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 142d320,736c6c5..7bee22f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-maps (0.8.5split-11) UNRELEASED; urgency=medium
+ 
+   * Declare compliance with Debian Policy v4.1.3
+   * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+   * Update Vcs-* for move to salsa.debian.org
+ 
+  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
+ 
 -openarena-data (0.8.5split-10) unstable; urgency=medium
 +openarena-maps (0.8.5split-10) unstable; urgency=medium
  
 +  * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index 218a4c1,14f88cd..65121fd
--- a/debian/control
+++ b/debian/control
@@@ -12,18 -12,25 +12,18 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
- Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b 
openarena-maps
- Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-maps
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-maps
++Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-maps
  
 -Package: openarena-data
 +Package: openarena-081-maps
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
 -Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Replaces:
 + openarena-data (<< 0.8.5split),
 +Description: OpenArena game data - maps from 0.8.1
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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

[openarena-data] 01/02: Merge branch 'openarena-data' into openarena-088-data

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-088-data
in repository openarena-data.

commit 438c40a9e5b257a4ecc23224befc6a2606eae27c
Merge: 148eb02 77f1c48
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:43:44 2018 +

Merge branch 'openarena-data' into openarena-088-data

 debian/README.source | 30 +++---
 debian/changelog |  9 +
 debian/control   |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 0b79edf,736c6c5..e33dab6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-088-data (0.8.8-9) UNRELEASED; urgency=medium
+ 
+   * Declare compliance with Debian Policy v4.1.3
+   * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+   * Update Vcs-* for move to salsa.debian.org
+ 
+  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
+ 
 -openarena-data (0.8.5split-10) unstable; urgency=medium
 +openarena-088-data (0.8.8-8) unstable; urgency=medium
  
 +  * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index 66bfe55,14f88cd..9efb132
--- a/debian/control
+++ b/debian/control
@@@ -12,14 -12,20 +12,14 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
- Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b 
openarena-088-data
- Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-088-data
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-088-data
++Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-088-data
  
 -Package: openarena-data
 +Package: openarena-088-data
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
  Breaks:
   openarena (<< 0.8.1-8~),

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

[openarena-data] 01/02: Merge branch 'openarena-data' into openarena-misc

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-misc
in repository openarena-data.

commit 76d613e28e2f93ea69eaa108b597b99e727e149e
Merge: 0a0ea1b 77f1c48
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:45:42 2018 +

Merge branch 'openarena-data' into openarena-misc

 debian/README.source | 30 +++---
 debian/changelog |  9 +
 debian/control   |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index e8475dc,736c6c5..c491093
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-misc (0.8.5split-11) UNRELEASED; urgency=medium
+ 
+   * Declare compliance with Debian Policy v4.1.3
+   * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+   * Update Vcs-* for move to salsa.debian.org
+ 
+  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
+ 
 -openarena-data (0.8.5split-10) unstable; urgency=medium
 +openarena-misc (0.8.5split-10) unstable; urgency=medium
  
 +  * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index 1007bfe,14f88cd..9bcabf1
--- a/debian/control
+++ b/debian/control
@@@ -12,18 -12,25 +12,18 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
- Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b 
openarena-misc
- Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-misc
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-misc
++Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-misc
  
 -Package: openarena-data
 +Package: openarena-081-misc
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
 -Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Replaces:
 + openarena-data (<< 0.8.5split),
 +Description: OpenArena game data - miscellaneous files from 0.8.1
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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

[openarena-data] 03/03: Remove empty d/watch

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-085-data
in repository openarena-data.

commit 12c6757e03395a820b2c231e2bb32655614b9c5e
Merge: 6ead599 1834bc6
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 09:05:01 2018 +

Remove empty d/watch

 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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

[openarena-data] branch openarena-maps updated (ebfefd2 -> 7a00252)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch openarena-maps
in repository openarena-data.

  from  ebfefd2   Merge from openarena-data/0.8.5split-10:
  adds  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  d3cbaea   Merge branch 'openarena-data' into openarena-maps
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data
   new  7a00252   Merge branch 'openarena-data' into openarena-maps

The 7 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/README.source | 30 +++---
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/watch |  3 ---
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 debian/watch

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

[openarena-data] 02/02: Merge branch 'openarena-data' into openarena-maps

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-maps
in repository openarena-data.

commit 7a00252c7f7d58a626b1cd55c9e5413f0f2a5eab
Merge: d3cbaea 1834bc6
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 09:06:26 2018 +

Merge branch 'openarena-data' into openarena-maps

 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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

[openarena-data] 02/03: Merge branch 'openarena-data' into openarena-085-data

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-085-data
in repository openarena-data.

commit 6ead599b8c339f9c6e6b0d2740647cf91f4d81f3
Merge: a4ff3a4 77f1c48
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:42:05 2018 +

Merge branch 'openarena-data' into openarena-085-data

 debian/changelog | 2 +-
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 44320bb,736c6c5..e10d47a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,6 +1,6 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
 +openarena-085-data (0.8.5split-11) UNRELEASED; urgency=medium
  
-   * Declare compliance with Debian Policy v4.1.2
+   * Declare compliance with Debian Policy v4.1.3
* d/README.source: Document non-DEP-14 Debian packaging repository
  layout
* Update Vcs-* for move to salsa.debian.org
diff --cc debian/control
index 62b84bb,14f88cd..4f2c218
--- a/debian/control
+++ b/debian/control
@@@ -12,18 -12,25 +12,18 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.2
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 -Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
 +Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-085-data
 +Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-085-data
  
 -Package: openarena-data
 +Package: openarena-085-data
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
 -Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Replaces:
 + openarena-data (<< 0.8.5split),
 +Description: OpenArena game data - 0.8.5 update
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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

[openarena-data] branch openarena-088-data updated (148eb02 -> 37d2fa0)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch openarena-088-data
in repository openarena-data.

  from  148eb02   Merge from openarena-data/0.8.5split-10:
  adds  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  438c40a   Merge branch 'openarena-data' into openarena-088-data
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data
   new  37d2fa0   Merge branch 'openarena-data' into openarena-088-data

The 7 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/README.source | 30 +++---
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/watch |  3 ---
 4 files changed, 40 insertions(+), 9 deletions(-)
 delete mode 100644 debian/watch

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

[openarena-data] 05/05: d/gbp.conf: Adjust for rename of master branch to openarena-data

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openarena-data.

commit 1834bc611a2551e869cfddbddd6fe91db746286c
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:52:29 2018 +

d/gbp.conf: Adjust for rename of master branch to openarena-data
---
 debian/gbp.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 52956a4..8617e7e 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,4 +3,5 @@ pristine-tar = False
 upstream-branch = there-is-no-upstream-branch
 overlay = True
 compression = bzip2
+debian-branch = openarena-data
 debian-tag = debian/openarena-data/%(version)s

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

[openarena-data] 04/05: Remove empty d/watch

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openarena-data.

commit 6fa2d777de765c00f2f8b54859c1376251b22a5f
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:51:56 2018 +

Remove empty d/watch
---
 debian/changelog | 1 +
 debian/watch | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 736c6c5..7233dee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
   * d/README.source: Document non-DEP-14 Debian packaging repository
 layout
   * Update Vcs-* for move to salsa.debian.org
+  * Remove empty d/watch
 
  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
 
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index de8fa45..000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Upstream releases are available from http://www.openarena.ws/download.php
-# but that page isn't really susceptible to uscan, so this watch file
-# does nothing.

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

[openarena-data] 02/05: Update Vcs-* for move to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openarena-data.

commit f896e0434934e494f2247de34fb39a9496be55e5
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:39:27 2018 +

Update Vcs-* for move to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d618b0a..cf344bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
   * Declare compliance with Debian Policy v4.1.2
   * d/README.source: Document non-DEP-14 Debian packaging repository
 layout
+  * Update Vcs-* for move to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
 
diff --git a/debian/control b/debian/control
index 67cd7f8..2e08ba9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends-Indep:
 Rules-Requires-Root: no
 Standards-Version: 4.1.2
 Homepage: http://www.openarena.ws/
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/
+Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
+Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
 
 Package: openarena-data
 Architecture: all

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

[openarena-data] 03/05: Declare compliance with Debian Policy v4.1.3

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openarena-data.

commit 77f1c489fe2c959812746da6b38e2af9bac61f16
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:41:56 2018 +

Declare compliance with Debian Policy v4.1.3
---
 debian/changelog | 2 +-
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf344bc..736c6c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
 
-  * Declare compliance with Debian Policy v4.1.2
+  * Declare compliance with Debian Policy v4.1.3
   * d/README.source: Document non-DEP-14 Debian packaging repository
 layout
   * Update Vcs-* for move to salsa.debian.org
diff --git a/debian/control b/debian/control
index 2e08ba9..14f88cd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends-Indep:
  zip,
  zlib1g-dev,
 Rules-Requires-Root: no
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Homepage: http://www.openarena.ws/
 Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b 
openarena-data
 Vcs-Browser: 
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data

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

[openarena-data] 01/05: d/README.source: Document non-DEP-14 Debian packaging repository layout

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openarena-data.

commit 4a202f6eca05d7217da94bae6d2a586b5d27bee1
Author: Simon McVittie <s...@debian.org>
Date:   Tue Jan 16 08:37:28 2018 +

d/README.source: Document non-DEP-14 Debian packaging repository layout
---
 debian/README.source | 30 +++---
 debian/changelog |  2 ++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index e82536c..c9f6be6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -58,8 +58,8 @@ chosen so that its CRC32 matches the one supplied by 
upstream. Debian's
 modified openarena engine detects the magic number 'NTVE' and loads a
 native-code equivalent of the original QVM file.
 
-Source code/build system (or lack of)
--
+Upstream source code/build system (or lack of)
+--
 
 Upstream do not have an official source code release or build system for the
 assets. For some files (scripts, most sounds and some textures), the data in
@@ -78,8 +78,32 @@ It appears that upstream svn revision 901 corresponds to 
0.8.1, revision
 but that's not relevant to obtaining sources), and revision 947 corresponds
 to 0.8.8.
 
+Debian packaging git repository
+---
+
+This git repository deliberately does not follow the DEP-14 repository
+layout recommendation, because it contains multiple Debian source packages.
+Instead, packaging branches are named for the source package in question:
+
+openarena-085-data
+openarena-088-data
+openarena-data
+openarena-maps
+openarena-misc
+openarena-oacmp1
+openarena-players
+openarena-players-mature
+openarena-textures
+
+and tags include the package name between "debian/" and the version:
+
+debian/openarena-data/0.8.5split-11 (etc.)
+
+Changes that affect all source packages are made on the openarena-data
+branch and merged to all other branches.
+
 Assets from the PK3 files, and the source files for them, are not included in
-the pkg-games git repository due to their size; please obtain them from the
+the games team git repository due to their size; please obtain them from the
 orig tarball, or as described below, before building.
 
 How the orig.tar.* is constructed
diff --git a/debian/changelog b/debian/changelog
index 18d43ff..d618b0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
 
   * Declare compliance with Debian Policy v4.1.2
+  * d/README.source: Document non-DEP-14 Debian packaging repository
+    layout
 
  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:58:10 +
 

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

[openarena-data] branch master updated (f940527 -> 1834bc6)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch master
in repository openarena-data.

  from  f940527   Declare compliance with Debian Policy v4.1.2
   new  4a202f6   d/README.source: Document non-DEP-14 Debian packaging 
repository layout
   new  f896e04   Update Vcs-* for move to salsa.debian.org
   new  77f1c48   Declare compliance with Debian Policy v4.1.3
   new  6fa2d77   Remove empty d/watch
   new  1834bc6   d/gbp.conf: Adjust for rename of master branch to 
openarena-data

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/README.source | 30 +++---
 debian/changelog |  6 +-
 debian/control   |  6 +++---
 debian/gbp.conf  |  1 +
 debian/watch |  3 ---
 5 files changed, 36 insertions(+), 10 deletions(-)
 delete mode 100644 debian/watch

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

[opentyrian] branch master updated (b1408b7 -> b38f416)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch master
in repository opentyrian.

  from  b1408b7   Replace kde-baseapps-bin dependency with kdialog (see 
#885839)
   new  b38f416   Set Vcs-* to point to salsa.debian.org

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 | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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

[opentyrian] 01/01: Set Vcs-* to point to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository opentyrian.

commit b38f41686de23ea8d48ab0d71c6dad23a60a8e95
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 15 09:33:02 2018 +

Set Vcs-* to point to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de3e53d..10350d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 opentyrian (2.1.20130907+dfsg-3) UNRELEASED; urgency=medium
 
   * Replace kde-baseapps-bin dependency with kdialog (see #885839)
+  * Set Vcs-* to point to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Sat, 30 Dec 2017 21:29:54 +
 
diff --git a/debian/control b/debian/control
index 48c9400..4a8b481 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
  libsdl-net1.2-dev,
 Standards-Version: 3.9.6
 Homepage: https://bitbucket.org/opentyrian/opentyrian/
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/opentyrian.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/opentyrian.git
+Vcs-Git: https://salsa.debian.org/games-team/opentyrian.git
+Vcs-Browser: https://salsa.debian.org/games-team/opentyrian
 
 Package: opentyrian
 Architecture: any

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

[rott] branch master updated (13ac014 -> e259306)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch master
in repository rott.

  from  13ac014   Suggest kdialog instead of kde-baseapps-bin (see #885839)
   new  e259306   Update Vcs-* to point to salsa.debian.org

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 | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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

[rott] 01/01: Update Vcs-* to point to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository rott.

commit e259306ece2f873f9de54521ea918d95154d78f9
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 15 09:30:46 2018 +

Update Vcs-* to point to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8739ecc..7cbabce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rott (1.1.2+svn287-3) UNRELEASED; urgency=medium
 
   * Suggest kdialog instead of kde-baseapps-bin (see #885839)
+  * Update Vcs-* to point to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Sat, 30 Dec 2017 21:37:32 +
 
diff --git a/debian/control b/debian/control
index c268b94..08787da 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends:
  libsdl1.2-dev
 Standards-Version: 3.9.6
 Homepage: http://icculus.org/rott/
-Vcs-Git: git://anonscm.debian.org/pkg-games/rott.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/rott.git
+Vcs-Git: https://salsa.debian.org/games-team/rott.git
+Vcs-Browser: https://salsa.debian.org/games-team/rott
 
 Package: rott
 Architecture: any

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

[openarena] 03/04: Update Vcs-* to point to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openarena.

commit 79a60fdb8f86df415dd59340ffa1503d0974bdbb
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 15 08:40:23 2018 +

Update Vcs-* to point to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 854bea0..60340d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ openarena (0.8.8-21) UNRELEASED; urgency=medium
 CPUs. Thanks to GitHub user casey-ac for testing a version of this
 change in ioquake3. This should also work on powerpcspe
 (Closes: #701630)
+  * Update Vcs-* to point to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Fri, 08 Dec 2017 19:12:02 +
 
diff --git a/debian/control b/debian/control
index cff2d19..ed02581 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends:
  dpkg-dev (>= 1.16.1),
  ioquake3-server (>= 1.36+u20150730+dfsg1-1~),
 Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena.git/
+Vcs-Git: https://salsa.debian.org/games-team/openarena.git
+Vcs-Browser: https://salsa.debian.org/games-team/openarena
 Homepage: http://openarena.ws/
 Rules-Requires-Root: no
 

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

[openarena] 01/04: Compile without Altivec for baseline PowerPC CPUs

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openarena.

commit c2438063698e14dc27b453f735b2f8246ff0d592
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 08:49:03 2018 +

Compile without Altivec for baseline PowerPC CPUs

Closes: #701630
---
 debian/changelog   |   3 +
 ...-instructions-on-PowerPC-unless-requested.patch | 105 +
 ...NA_081_COMPATIBLE-define-for-network-comp.patch |   4 +-
 ...acro-for-the-game-code-version-so-package.patch |   7 +-
 debian/patches/series  |   1 +
 5 files changed, 115 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38a37e8..8ad1b1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 openarena (0.8.8-21) UNRELEASED; urgency=medium
 
   * Standards-Version: 4.1.3 (no changes required)
+  * d/p/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch:
+Add patch to compile without Altivec to support baseline powerpc
+CPUs. This should also work on powerpcspe (Closes: #701630)
 
  -- Simon McVittie <s...@debian.org>  Fri, 08 Dec 2017 19:12:02 +
 
diff --git 
a/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch 
b/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch
new file mode 100644
index 000..0a7bb19
--- /dev/null
+++ 
b/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch
@@ -0,0 +1,105 @@
+From: Simon McVittie <s...@debian.org>
+Date: Wed, 4 Oct 2017 08:38:36 +0100
+Subject: Disable Altivec instructions on PowerPC unless requested
+
+Baseline PowerPC CPUs are not guaranteed to have Altivec instructions
+available, even if they are 64-bit.
+
+Unlike SSE and similar extensions on x86, there does not seem to be
+a way to enable conditional, targeted use of Altivec based on runtime
+detection (which is what ioquake3 wants to do) without also giving the
+compiler permission to use Altivec in code generation; so to not crash
+on the affected CPUs, we'll have to turn it off altogether.
+
+At one point Altivec was an important optimization, because the
+most commonly available PowerPC CPUs (in Apple G4/G5 hardware)
+had the Altivec instructions, and they were a significant benefit
+there. However, Apple haven't sold PowerPC devices for over 10 years,
+some more recently-manufactured PowerPC CPUs like the (64-bit) Freescale
+e5500 omit Altivec, and CPUs in general are a lot faster now than they
+were when the idTech3 engine was first released, hopefully making the
+optimization unnecessary.
+
+This commit uses -mno-altivec to force Altivec instructions not to be
+emitted, unless Altivec is requested via "make USE_ALTIVEC=1". The Apple
+fork of gcc doesn't document the corresponding -fno-altivec option, so
+we'll have to assume that omitting -faltivec is enough (but non-Altivec
+PowerPC Macs haven't been sold for a long time anyway).
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701630
+---
+ Makefile  | 27 +++
+ code/qcommon/q_platform.h |  2 +-
+ 2 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4f9a310..569c44d 100644
+--- a/Makefile
 b/Makefile
+@@ -135,6 +135,10 @@ ifndef USE_LOCAL_HEADERS
+ USE_LOCAL_HEADERS=1
+ endif
+ 
++ifndef USE_ALTIVEC
++USE_ALTIVEC=0
++endif
++
+ #
+ 
+ BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
+@@ -258,11 +262,19 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" 
"gnu_kfreebsd" "kfreebsd-gnu" "gnu")
+ HAVE_VM_COMPILED=true
+   else
+   ifeq ($(ARCH),ppc)
+-BASE_CFLAGS += -maltivec
++ifeq ($(USE_ALTIVEC),1)
++  BASE_CFLAGS += -maltivec -DUSE_ALTIVEC
++else
++  BASE_CFLAGS += -mno-altivec
++endif
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),ppc64)
+-BASE_CFLAGS += -maltivec
++ifeq ($(USE_ALTIVEC),1)
++  BASE_CFLAGS += -maltivec -DUSE_ALTIVEC
++else
++  BASE_CFLAGS += -mno-altivec
++endif
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),sparc)
+@@ -335,11 +347,18 @@ ifeq ($(PLATFORM),darwin)
+   BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
+ 
+   ifeq ($(ARCH),ppc)
+-BASE_CFLAGS += -faltivec
++ifeq ($(USE_ALTIVEC),1)
++  # -fno-altivec doesn't seem to exist according to
++  # http://www.manpages.info/macosx/gcc.1.html so we'll just have to
++  # hope that the default is no Altivec
++  BASE_CFLAGS += -faltivec -DUSE_ALTIVEC
++endif
+ OPTIMIZE += -O3
+   endif
+   ifeq ($(ARCH),ppc64)
+-BASE_CFLAGS += -faltivec
++ifeq ($(USE_ALTIVEC),1)
++  BASE_CFLAGS += -faltivec -DUSE_ALTIVEC
++endif
+   endif
+   ifeq ($(ARCH),i386)
+ OPTIMIZE += -marc

[openarena] 02/04: Adjust changelog and patch tagging

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openarena.

commit 506394f1464491ba39a3e92cee79655ba7e707db
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 15 08:38:26 2018 +

Adjust changelog and patch tagging
---
 debian/changelog  | 4 +++-
 .../Disable-Altivec-instructions-on-PowerPC-unless-requested.patch| 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8ad1b1f..854bea0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ openarena (0.8.8-21) UNRELEASED; urgency=medium
   * Standards-Version: 4.1.3 (no changes required)
   * d/p/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch:
 Add patch to compile without Altivec to support baseline powerpc
-CPUs. This should also work on powerpcspe (Closes: #701630)
+CPUs. Thanks to GitHub user casey-ac for testing a version of this
+change in ioquake3. This should also work on powerpcspe
+(Closes: #701630)
 
  -- Simon McVittie <s...@debian.org>  Fri, 08 Dec 2017 19:12:02 +
 
diff --git 
a/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch 
b/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch
index 0a7bb19..51f1693 100644
--- 
a/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch
+++ 
b/debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch
@@ -26,7 +26,10 @@ fork of gcc doesn't document the corresponding -fno-altivec 
option, so
 we'll have to assume that omitting -faltivec is enough (but non-Altivec
 PowerPC Macs haven't been sold for a long time anyway).
 
+Similar to https://github.com/ioquake/ioq3/pull/337 in ioquake3.
+
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701630
+Forwarded: no
 ---
  Makefile  | 27 +++
  code/qcommon/q_platform.h |  2 +-

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

[openarena] branch debian/master updated (0bf8d46 -> a119e32)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository openarena.

  from  0bf8d46   Standards-Version: 4.1.3 (no changes required)
   new  c243806   Compile without Altivec for baseline PowerPC CPUs
   new  506394f   Adjust changelog and patch tagging
   new  79a60fd   Update Vcs-* to point to salsa.debian.org
   new  a119e32   0.8.8-21

The 4 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   |  12 ++-
 debian/control |   4 +-
 ...-instructions-on-PowerPC-unless-requested.patch | 108 +
 ...NA_081_COMPATIBLE-define-for-network-comp.patch |   4 +-
 ...acro-for-the-game-code-version-so-package.patch |   7 +-
 debian/patches/series  |   1 +
 6 files changed, 126 insertions(+), 10 deletions(-)
 create mode 100644 
debian/patches/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch

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

[openarena] 04/04: 0.8.8-21

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openarena.

commit a119e3209eaf1864c3427a6e760556288036be1a
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 15 08:40:33 2018 +

0.8.8-21
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60340d4..76bf4be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openarena (0.8.8-21) UNRELEASED; urgency=medium
+openarena (0.8.8-21) unstable; urgency=medium
 
   * Standards-Version: 4.1.3 (no changes required)
   * d/p/Disable-Altivec-instructions-on-PowerPC-unless-requested.patch:
@@ -8,7 +8,7 @@ openarena (0.8.8-21) UNRELEASED; urgency=medium
 (Closes: #701630)
   * Update Vcs-* to point to salsa.debian.org
 
- -- Simon McVittie <s...@debian.org>  Fri, 08 Dec 2017 19:12:02 +0000
+ -- Simon McVittie <s...@debian.org>  Mon, 15 Jan 2018 08:40:26 +
 
 openarena (0.8.8-20) unstable; urgency=medium
 

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

[yquake2] branch debian/master updated (2b5caff -> 420a931)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository yquake2.

  from  2b5caff   Use https URL for Homepage
   new  420a931   Move packaging to salsa.debian.org

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 | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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

[yquake2] 01/01: Move packaging to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository yquake2.

commit 420a9314dd006c7295de5f1a54769db605061dd4
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 15 01:12:46 2018 +

Move packaging to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2441e12..0d0294d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ yquake2 (7.10+ctf1.05~dfsg-2) UNRELEASED; urgency=medium
 
   * Standards-Version: 4.1.3 (no changes required)
   * Use https URL for Homepage
+  * Move packaging to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Sun, 31 Dec 2017 11:40:42 +
 
diff --git a/debian/control b/debian/control
index 2d607ec..806c42a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends:
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
 Homepage: https://www.yamagi.org/quake2/
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/yquake2.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/yquake2.git
+Vcs-Git: https://salsa.debian.org/games-team/yquake2.git
+Vcs-Browser: https://salsa.debian.org/games-team/yquake2
 
 Package: yamagi-quake2
 Architecture: linux-any

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

[quakespasm] branch master updated (a490774 -> cf18052)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch master
in repository quakespasm.

  from  a490774   Release
   new  cf18052   Move git hosting to salsa.debian.org

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/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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

[quakespasm] 01/01: Move git hosting to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository quakespasm.

commit cf18052358d58fba54bd47897e20ef342706fb1a
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 15 01:01:20 2018 +

Move git hosting to salsa.debian.org
---
 debian/changelog | 6 ++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6607f59..f9c44c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+quakespasm (0.93.0+dfsg-2) UNRELEASED; urgency=medium
+
+  * Move git hosting to salsa.debian.org
+
+ -- Simon McVittie <s...@debian.org>  Mon, 15 Jan 2018 01:00:45 +
+
 quakespasm (0.93.0+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 209703c..8180883 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends: debhelper (>= 10),
libvorbis-dev
 Rules-Requires-Root: no
 Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/quakespasm.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/quakespasm.git
+Vcs-Browser: https://salsa.debian.org/games-team/quakespasm
+Vcs-Git: https://salsa.debian.org/games-team/quakespasm.git
 Homepage: http://quakespasm.sourceforge.net/
 
 Package: quakespasm

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

[darkplaces] 01/01: Change Vcs-* to point to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository darkplaces.

commit fdef40714ce1ae4b4a13ca91d3ead7ce6eda47a5
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 15 00:55:05 2018 +

Change Vcs-* to point to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39d3965..e4522e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ darkplaces (0~20140513+svn12208-7) UNRELEASED; urgency=medium
   * Standards-Version: 4.1.3 (no changes needed)
   * Use https URL for Homepage
   * d/gbp.conf: Use DEP-14 branch names debian/master, upstream/latest
+  * Change Vcs-* to point to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Fri, 08 Dec 2017 18:56:17 +
 
diff --git a/debian/control b/debian/control
index 9b7a6b6..f2f2c12 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends:
  zlib1g-dev,
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/darkplaces.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/darkplaces.git
+Vcs-Git: https://salsa.debian.org/games-team/darkplaces.git
+Vcs-Browser: https://salsa.debian.org/games-team/darkplaces
 Homepage: https://icculus.org/twilight/darkplaces/
 
 Package: darkplaces

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

[darkplaces] branch debian/master updated (e0462bb -> fdef407)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository darkplaces.

  from  e0462bb   d/gbp.conf: Use DEP-14 branch names debian/master, 
upstream/latest
   new  fdef407   Change Vcs-* to point to salsa.debian.org

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 | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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

[ioquake3] branch debian/master updated (8b02a07 -> 14cd9c1)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository ioquake3.

  from  8b02a07   AppArmor: Allow zenity to read from dconf
   new  14cd9c1   Move packaging to salsa.debian.org

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 | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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

[ioquake3] 01/01: Move packaging to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 14cd9c185299d580e89b075d82d42cfdd23c63d4
Author: Simon McVittie <s...@debian.org>
Date:   Sun Jan 14 12:38:47 2018 +

Move packaging to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e87cf1..f82c035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
 of reinventing it
   * AppArmor: Allow reading EGL vendor configuration
   * AppArmor: Allow zenity to read from dconf
+  * Move packaging to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Thu, 11 Jan 2018 09:48:07 +
 
diff --git a/debian/control b/debian/control
index a5ea91d..379ce7d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends:
  libsdl2-dev (>= 2.0.4),
  libvorbis-dev,
 Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/ioquake3.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/ioquake3.git
+Vcs-Git: https://salsa.debian.org/games-team/ioquake3.git
+Vcs-Browser: https://salsa.debian.org/games-team/ioquake3
 Homepage: https://ioquake3.org/
 Rules-Requires-Root: no
 

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

[iortcw] 03/04: AppArmor: Allow zenity to read from dconf

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository iortcw.

commit ff36a6eedb37eb8cd600c90ddcd751ff9fcffe6b
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 10:14:52 2018 +

AppArmor: Allow zenity to read from dconf
---
 debian/apparmor.d/usr.lib.rtcw | 1 +
 debian/changelog   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/apparmor.d/usr.lib.rtcw b/debian/apparmor.d/usr.lib.rtcw
index f113b80..e350ed2 100644
--- a/debian/apparmor.d/usr.lib.rtcw
+++ b/debian/apparmor.d/usr.lib.rtcw
@@ -67,6 +67,7 @@
   profile popup (complain) {
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/debian/changelog b/debian/changelog
index 6d3aa8b..f72a315 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ iortcw (1.51.b+dfsg1-3) UNRELEASED; urgency=medium
   * AppArmor: Use  from apparmor (>= 2.10.95-5)
 instead of reinventing it
   * AppArmor: Allow reading EGL vendor configuration
+  * AppArmor: Allow zenity to read from dconf
 
  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:55:56 +
 

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

[iortcw] 04/04: Move packaging to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository iortcw.

commit 0a2fefacf74eafb11b78abd87be4f923418c4997
Author: Simon McVittie <s...@debian.org>
Date:   Sun Jan 14 12:36:16 2018 +

Move packaging to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f72a315..fbb5609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ iortcw (1.51.b+dfsg1-3) UNRELEASED; urgency=medium
 instead of reinventing it
   * AppArmor: Allow reading EGL vendor configuration
   * AppArmor: Allow zenity to read from dconf
+  * Move packaging to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:55:56 +
 
diff --git a/debian/control b/debian/control
index 75af7ca..b566b24 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends:
  libvorbis-dev,
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/iortcw.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/iortcw.git
+Vcs-Git: https://salsa.debian.org/games-team/iortcw.git
+Vcs-Browser: https://salsa.debian.org/games-team/iortcw
 Homepage: https://github.com/iortcw/iortcw/
 
 Package: rtcw

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

[iortcw] 01/04: AppArmor: Use from apparmor (>= 2.10.95-5) instead of reinventing it

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository iortcw.

commit 9bbffd02852d1c5eac4c2fca5bdbe02d6cd04e3a
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 10:12:00 2018 +

AppArmor: Use  from apparmor (>= 2.10.95-5) instead 
of reinventing it
---
 debian/apparmor.d/usr.lib.rtcw | 7 ++-
 debian/changelog   | 2 ++
 debian/control | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/apparmor.d/usr.lib.rtcw b/debian/apparmor.d/usr.lib.rtcw
index 170bef1..f68b085 100644
--- a/debian/apparmor.d/usr.lib.rtcw
+++ b/debian/apparmor.d/usr.lib.rtcw
@@ -13,6 +13,7 @@
   #include 
   #include 
   #include 
+  #include 
 
   network inet dgram,
   network inet stream,
@@ -57,9 +58,6 @@
   /sys/devices/pci*/**/uevent r,
   /sys/devices/pci*/**/vendor r,
 
-  # Shared memory buffers used in Wayland
-  owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
-
   # OpenAL resources
   /usr/share/openal/{,**} r,
 
@@ -68,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /etc/X11/app-defaults/Xmessage-color r,
 /usr/bin/kdialog mr,
@@ -77,8 +76,6 @@
 /usr/share/themes/** r,
 /usr/share/zenity/** r,
 owner @{HOME}/.config/gtk-3.0/settings.ini r,
-
-owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
   }
 
   # Site-specific additions and overrides. See local/README for details.
diff --git a/debian/changelog b/debian/changelog
index 42a8615..97eac65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ iortcw (1.51.b+dfsg1-3) UNRELEASED; urgency=medium
 
   * Declare compliance with Debian Policy 4.1.3
   * Replace kde-baseapps-bin dependency with kdialog (see #885839)
+  * AppArmor: Use  from apparmor (>= 2.10.95-5)
+instead of reinventing it
 
  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:55:56 +
 
diff --git a/debian/control b/debian/control
index 2c2fe46..75af7ca 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,8 @@ Depends:
  ${shlibs:Depends},
 Recommends:
  x11-utils | zenity | kdialog,
+Breaks:
+ apparmor (<< 2.10.95-5~),
 Description: game engine for Return to Castle Wolfenstein
  Return to Castle Wolfenstein is a military- and occult-themed first-person
  shooter game in a Second World War setting, originally released in 2001.

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

[iortcw] 02/04: AppArmor: Allow reading EGL vendor configuration

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository iortcw.

commit 3eed38b008080d74edd19fafa2a5a142e68b0db5
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 10:12:28 2018 +

AppArmor: Allow reading EGL vendor configuration
---
 debian/apparmor.d/usr.lib.rtcw | 3 +++
 debian/changelog   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/debian/apparmor.d/usr.lib.rtcw b/debian/apparmor.d/usr.lib.rtcw
index f68b085..f113b80 100644
--- a/debian/apparmor.d/usr.lib.rtcw
+++ b/debian/apparmor.d/usr.lib.rtcw
@@ -58,6 +58,9 @@
   /sys/devices/pci*/**/uevent r,
   /sys/devices/pci*/**/vendor r,
 
+  # EGL with SDL_VIDEODRIVER=wayland
+  /{etc,usr/share}/glvnd/egl_vendor.d/{,**} r,
+
   # OpenAL resources
   /usr/share/openal/{,**} r,
 
diff --git a/debian/changelog b/debian/changelog
index 97eac65..6d3aa8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ iortcw (1.51.b+dfsg1-3) UNRELEASED; urgency=medium
   * Replace kde-baseapps-bin dependency with kdialog (see #885839)
   * AppArmor: Use  from apparmor (>= 2.10.95-5)
 instead of reinventing it
+  * AppArmor: Allow reading EGL vendor configuration
 
  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:55:56 +
 

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

[iortcw] branch debian/master updated (7e22a53 -> 0a2fefa)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository iortcw.

  from  7e22a53   Declare compliance with Debian Policy 4.1.3
   new  9bbffd0   AppArmor: Use  from apparmor (>= 
2.10.95-5) instead of reinventing it
   new  3eed38b   AppArmor: Allow reading EGL vendor configuration
   new  ff36a6e   AppArmor: Allow zenity to read from dconf
   new  0a2fefa   Move packaging to salsa.debian.org

The 4 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/apparmor.d/usr.lib.rtcw | 9 +
 debian/changelog   | 5 +
 debian/control | 6 --
 3 files changed, 14 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.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 (47d3818 -> 8850318)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

  from  47d3818   Add more changelog
   new  8850318   d/control: Change Vcs-* to salsa.debian.org

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 | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 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/01: d/control: Change Vcs-* to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

commit 8850318d9977b5e57d3c60fcc7b6d1b76f507c40
Author: Simon McVittie <s...@debian.org>
Date:   Fri Jan 12 11:59:42 2018 +

d/control: Change Vcs-* to salsa.debian.org

Signed-off-by: Simon McVittie <s...@debian.org>
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90d073d..ad73965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,7 @@ game-data-packager (56) UNRELEASED; urgency=medium
   --fail-missing [smcv]
 - d/control: Wrap and sort Suggests [smcv]
 - d/copyright: Fix some lintian warnings [smcv]
+- d/control: Change Vcs-* to salsa.debian.org [smcv]
 
  -- Simon McVittie <s...@debian.org>  Thu, 21 Dec 2017 22:43:38 +0100
 
diff --git a/debian/control b/debian/control
index 6c47829..1c4991d 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends:
  zip,
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/game-data-packager.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/game-data-packager.git
+Vcs-Git: https://salsa.debian.org/games-team/game-data-packager.git
+Vcs-Browser: https://salsa.debian.org/games-team/game-data-packager
 Homepage: https://wiki.debian.org/Games/GameDataPackager
 
 Package: game-data-packager

-- 
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/01: Add more changelog

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

commit 47d3818d45d22c41d64a93c0a2763861f4c9ddf8
Author: Simon McVittie <s...@debian.org>
Date:   Fri Jan 12 11:44:53 2018 +

Add more changelog

Signed-off-by: Simon McVittie <s...@debian.org>
---
 debian/changelog | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 464d277..90d073d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ game-data-packager (56) UNRELEASED; urgency=medium
 - brokensword25: Mark as a fan-made game [smcv]
 - loom: add support for MT-32 update [Dmitry Eremin-Solenikov]
   (Closes: #886699)
+- maniacmansion: Mark as available on Steam (if you have this game
+  on Steam, please tell us which directory in steamapps/common it
+  uses) [adetiste]
+- morrowind: Normalize case of single-letter directory names, so
+  that files that should be together stay together [smcv]
 - quake3: Drop Recommends for xmessage|zenity|kdialog, no longer
   invoked directly from code in this package [smcv]
 - Fix a typo in previous changelog entry [adetiste]
@@ -33,6 +38,9 @@ game-data-packager (56) UNRELEASED; urgency=medium
   [smcv]
 - Add autopkgtests [smcv]
   * Internal changes:
+- Move GameData object to g_d_p.game to avoid an interpreter
+  warning [smcv]
+- doom, laura-bow2: Reformat data files [smcv, adetiste]
 - Declare compliance with Debian Policy 4.1.3 [smcv]
 - Use debhelper compat level 11 [smcv]
   + Override dh_installsystemd instead of dh_installinit,
@@ -41,8 +49,7 @@ game-data-packager (56) UNRELEASED; urgency=medium
 - d/rules: Use dh_missing --fail-missing instead of dh_install
   --fail-missing [smcv]
 - d/control: Wrap and sort Suggests [smcv]
-- d/copyright: Use Comment for dual-license grant to avoid lintian
-  warnings about a license being redefined [smcv]
+- d/copyright: Fix some lintian warnings [smcv]
 
  -- Simon McVittie <s...@debian.org>  Thu, 21 Dec 2017 22:43:38 +0100
 

-- 
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] branch master updated (33ac3ba -> 47d3818)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

  from  33ac3ba   d/copyright: Break out LGPL-3 into a separate license 
paragraph
   new  47d3818   Add more changelog

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 | 11 +--
 1 file changed, 9 insertions(+), 2 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] branch master updated (6f48144 -> 33ac3ba)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

  from  6f48144   run_command_line: Allow YAML output to be pretty-printed
   new  3113539   GameData.load_file_data: Always update set of packages 
that rip CDs
   new  0760629   GameData.to_data: Include rip_cd_packages in expanded 
output
   new  e6dd7db   Package.to_data: Pretty-print copyright notice and long 
description
   new  33ac3ba   d/copyright: Break out LGPL-3 into a separate license 
paragraph

The 4 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   |  3 +++
 debian/copyright   |  6 --
 game_data_packager/data.py | 12 +---
 game_data_packager/game.py | 15 ++-
 4 files changed, 26 insertions(+), 10 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] 03/04: Package.to_data: Pretty-print copyright notice and long description

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

commit e6dd7db9aea05f0aa7a8cc6e9de3085b086a222b
Author: Simon McVittie <s...@debian.org>
Date:   Fri Jan 12 11:00:30 2018 +

Package.to_data: Pretty-print copyright notice and long description

They're a lot more readable in the output YAML if we represent them
as literals.

Signed-off-by: Simon McVittie <s...@debian.org>
---
 game_data_packager/data.py | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/game_data_packager/data.py b/game_data_packager/data.py
index a1b9312..6d91a12 100644
--- a/game_data_packager/data.py
+++ b/game_data_packager/data.py
@@ -960,14 +960,11 @@ class Package(object):
 
 for k in (
 'copyright',
-'copyright_notice',
-'description',
 'disks',
 'engine',
 'expansion_for',
 'expansion_for_ext',
 'longname',
-'long_description',
 'short_description',
 'url_misc',
 'wiki',
@@ -976,4 +973,13 @@ class Package(object):
 if v is not None:
 ret[k] = v
 
+for k in (
+'copyright_notice',
+'description',
+'long_description',
+):
+v = getattr(self, k)
+if v is not None:
+ret[k] = YamlLiteral(v)
+
 return ret

-- 
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/04: GameData.load_file_data: Always update set of packages that rip CDs

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

commit 3113539c537924409d7f6357ead4420c5e29a685
Author: Simon McVittie <s...@debian.org>
Date:   Fri Jan 12 10:51:56 2018 +

GameData.load_file_data: Always update set of packages that rip CDs

Since commit 10083aed we skip the later part of this function (which
is only meant to contain sanity-checks, not functionally significant
code) when running as a system-wide installation. Updating
rip_cd_packages is functionally significant and so needs to move
above that check.

Closes: #886965
Signed-off-by: Simon McVittie <s...@debian.org>
---
 debian/changelog   |  3 +++
 game_data_packager/game.py | 11 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5e3858..464d277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ game-data-packager (56) UNRELEASED; urgency=medium
 - Fix a typo in previous changelog entry [adetiste]
 - Add missing bug reference for #876321 in previous changelog entry
   [adetiste]
+- Fix a regression where g-d-p could no longer rip CD audio. Thanks
+  to Paul Preuss for locating the relevant commit.
+  (Closes: #886965) [smcv]
 - `g-d-p make-template` now appears in --help output [smcv]
 - Make `g-d-p make-template` able to merge new versions into existing
   games (the result is very rough and will usually need editing, but
diff --git a/game_data_packager/game.py b/game_data_packager/game.py
index 48f0de3..de15f50 100644
--- a/game_data_packager/game.py
+++ b/game_data_packager/game.py
@@ -898,6 +898,12 @@ class GameData(object):
 if f.sha256 is not None:
 self.known_sha256s.setdefault(f.sha256, set()).add(filename)
 
+for package in self.packages.values():
+if package.rip_cd:
+# we only support Ogg Vorbis for now
+assert package.rip_cd['encoding'] == 'vorbis', package.name
+self.rip_cd_packages.add(package)
+
 if not check:
 return
 
@@ -914,11 +920,6 @@ class GameData(object):
 
 # consistency check
 for package in self.packages.values():
-if package.rip_cd:
-# we only support Ogg Vorbis for now
-assert package.rip_cd['encoding'] == 'vorbis', package.name
-self.rip_cd_packages.add(package)
-
 # there had better be something it wants to install, unless
 # specifically marked as empty
 if package.empty:

-- 
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] 04/04: d/copyright: Break out LGPL-3 into a separate license paragraph

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

commit 33ac3bad47a54067dd4a59b746ed3915d7868154
Author: Simon McVittie <s...@debian.org>
Date:   Fri Jan 12 11:14:56 2018 +

d/copyright: Break out LGPL-3 into a separate license paragraph

This makes Lintian happier.

Signed-off-by: Simon McVittie <s...@debian.org>
---
 debian/copyright | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 364c5f2..fc1e549 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -225,8 +225,6 @@ Comment:
  When attributing the artwork, using "GNOME Project" is enough.
  Please link to http://www.gnome.org where available.
  .
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-3'.
  See below for the complete text of the CC-BY-SA-3.0-US license.
 
 #  License text below this point ---
@@ -250,6 +248,10 @@ License: GPL-2+
  You can find the GPL license text on a Debian system under
  /usr/share/common-licenses/GPL-2.
 
+License: LGPL-3
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+
 License: wikimedia-Public-Domain
  I, the copyright holder of this work, release this work into the
  public domain. This applies worldwide.

-- 
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] 02/04: GameData.to_data: Include rip_cd_packages in expanded output

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

commit 0760629b30e9ae053c1ce6591fe798d3ea9b3b3f
Author: Simon McVittie <s...@debian.org>
Date:   Fri Jan 12 10:59:37 2018 +

GameData.to_data: Include rip_cd_packages in expanded output

This would have caught the regression fixed by the previous commit.

Signed-off-by: Simon McVittie <s...@debian.org>
---
 game_data_packager/game.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/game_data_packager/game.py b/game_data_packager/game.py
index de15f50..ed268f9 100644
--- a/game_data_packager/game.py
+++ b/game_data_packager/game.py
@@ -411,6 +411,10 @@ class GameData(object):
 if v:
 ret[k] = sort_set_values(v)
 
+if self.rip_cd_packages:
+names = [p.name for p in self.rip_cd_packages]
+ret['rip_cd_packages'] = sorted(names)
+
 unknown_md5s = set()
 unknown_sha1s = set()
 unknown_sha256s = set()

-- 
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/01: run_command_line: Allow YAML output to be pretty-printed

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

commit 6f48144c93f04a0140e47af8b447866ec66342f5
Author: Simon McVittie <s...@debian.org>
Date:   Fri Jan 12 10:25:53 2018 +

run_command_line: Allow YAML output to be pretty-printed

This regressed when I made to_data() pretty-print the members of groups
as YAML literals. The SafeDumper object is not actually any more safe
than the standard Dumper, but it refuses to dump objects that have a
custom YAML representation (even if that representation is in fact one
that would be safe to load, and even if the object is a subclass of
one with a standard representation) as a conservative way to guarantee
that the result will be loadable by the SafeLoader.

Signed-off-by: Simon McVittie <s...@debian.org>
---
 game_data_packager/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index cbefed6..8aa0b49 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1503,9 +1503,9 @@ class PackagingTask(object):
 def run_command_line(self, args):
 if logging.getLogger().isEnabledFor(logging.DEBUG):
 logger.debug('package description:\n%s',
-yaml.safe_dump(self.game.to_data(expand=False)))
+yaml.dump(self.game.to_data(expand=False)))
 logger.debug('package description after expansion:\n%s',
-yaml.safe_dump(self.game.to_data(expand=True)))
+yaml.dump(self.game.to_data(expand=True)))
 
 self.verbose = getattr(args, 'verbose', False)
 

-- 
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] branch master updated (93c2da8 -> 6f48144)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

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

  from  93c2da8   wikipedia: add 2 url's
   new  6f48144   run_command_line: Allow YAML output to be pretty-printed

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:
 game_data_packager/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 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

[nexuiz-data] 01/01: Change Vcs-* to point to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository nexuiz-data.

commit f0480d351afaaa583165ac845bcb90261a5894bf
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 17:31:45 2018 +

Change Vcs-* to point to salsa.debian.org
---
 debian/changelog | 6 ++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cc24e5..c879b0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nexuiz-data (2.5.2-8) UNRELEASED; urgency=medium
+
+  * Change Vcs-* to point to salsa.debian.org
+
+ -- Simon McVittie <s...@debian.org>  Thu, 11 Jan 2018 17:31:34 +
+
 nexuiz-data (2.5.2-7) unstable; urgency=low
 
   [ Anton Balashov ]
diff --git a/debian/control b/debian/control
index 87c21aa..4fc0629 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends-Indep:
  p7zip-full,
 Standards-Version: 4.1.3
 Homepage: http://www.alientrap.org/games/nexuiz/
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/nexuiz-data.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/nexuiz-data.git
+Vcs-Git: https://salsa.debian.org/games-team/nexuiz-data.git
+Vcs-Browser: https://salsa.debian.org/games-team/nexuiz-data
 
 Package: nexuiz-data
 Architecture: all

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

[nexuiz-data] branch debian/master updated (0b12276 -> f0480d3)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository nexuiz-data.

  from  0b12276   2.5.2-7
   new  f0480d3   Change Vcs-* to point to salsa.debian.org

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/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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

[nexuiz] branch debian/master updated (09b98b1 -> c829200)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository nexuiz.

  from  09b98b1   Configure for DEP-14 git branch names (debian/master, 
upstream/latest)
   new  c829200   Set Vcs-* to point to salsa.debian.org

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 | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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

[nexuiz] 01/01: Set Vcs-* to point to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository nexuiz.

commit c829200e33382019eaf16c23d103669ac688f30f
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 17:29:56 2018 +

Set Vcs-* to point to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a342a93..28568cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ nexuiz (2.5.2+dp-7) UNRELEASED; urgency=medium
   * Use debhelper compat level 11
   * Configure for DEP-14 git branch names (debian/master,
 upstream/latest)
+  * Set Vcs-* to point to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Sun, 10 Dec 2017 18:57:10 +
 
diff --git a/debian/control b/debian/control
index 74929db..b34bbd7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends:
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
 Homepage: http://www.alientrap.org/games/nexuiz
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/nexuiz.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/nexuiz.git
+Vcs-Git: https://salsa.debian.org/games-team/nexuiz.git
+Vcs-Browser: https://salsa.debian.org/games-team/nexuiz
 
 Package: nexuiz
 Architecture: all

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

[openjk] 23/23: Change Vcs-* from debiangames-team to games-team

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 14de5571f290cd2df5d1ae62a752201466494ac5
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 17:27:37 2018 +

Change Vcs-* from debiangames-team to games-team
---
 debian/changelog | 6 ++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b1e743..a07868c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjk (0~20171228~dfsg-2) UNRELEASED; urgency=medium
+
+  * Change Vcs-* from debiangames-team to games-team
+
+ -- Simon McVittie <s...@debian.org>  Thu, 11 Jan 2018 17:26:55 +
+
 openjk (0~20171228~dfsg-1) experimental; urgency=medium
 
   * New upstream snapshot 01dd4909
diff --git a/debian/control b/debian/control
index 5967245..1fc5bd4 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends:
  zip,
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
-Vcs-Git: https://salsa.debian.org/debiangames-team/openjk.git
-Vcs-Browser: https://salsa.debian.org/debiangames-team/openjk
+Vcs-Git: https://salsa.debian.org/games-team/openjk.git
+Vcs-Browser: https://salsa.debian.org/games-team/openjk
 Homepage: https://github.com/JACoders/OpenJK
 
 Package: openjk-academy

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

[openjk] 22/23: 0~20171228~dfsg-1

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 174f4d28e8f023513e6d448cf698edd0cff1aa70
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 1 12:28:33 2018 +

0~20171228~dfsg-1
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fba4094..5b1e743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
+openjk (0~20171228~dfsg-1) experimental; urgency=medium
 
   * New upstream snapshot 01dd4909
   * Build-depend on SDL 2.0.7 so we have at least the version bundled
@@ -7,7 +7,7 @@ openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
   * Move to debhelper compat level 11
   * Move packaging to salsa.debian.org
 
- -- Simon McVittie <s...@debian.org>  Mon, 27 Nov 2017 11:01:17 +0000
+ -- Simon McVittie <s...@debian.org>  Mon, 01 Jan 2018 12:28:22 +
 
 openjk (0~20171104~dfsg-1) experimental; urgency=medium
 

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

[openjk] 20/23: Move to debhelper compat level 11

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 56631c2fc6d9fffcba5488ea38faa28226488b1a
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 1 12:16:22 2018 +

Move to debhelper compat level 11
---
 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 82edc7f..558f639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
   * Build-depend on SDL 2.0.7 so we have at least the version bundled
 by upstream
   * Standards-Version: 4.1.3 (no changes required)
+  * Move to debhelper compat level 11
 
  -- Simon McVittie <s...@debian.org>  Mon, 27 Nov 2017 11:01:17 +
 
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index dc82bde..1adc009 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team 
<pkg-games-de...@lists.alioth.debian.org>
 Uploaders: Simon McVittie <s...@debian.org>
 Build-Depends:
  cmake,
- debhelper (>= 10),
+ debhelper (>= 11~),
  dh-apparmor [linux-any],
  dh-exec,
  dpkg-dev (>= 1.16.1),

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

[openjk] 19/23: Standards-Version: 4.1.3 (no changes required)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit af933f7a2f99a11541f3c7f618d7d5dd8295138d
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 1 12:15:12 2018 +

Standards-Version: 4.1.3 (no changes required)
---
 debian/changelog | 2 +-
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e979f3e..82edc7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
   * New upstream snapshot 01dd4909
   * Build-depend on SDL 2.0.7 so we have at least the version bundled
 by upstream
-  * Standards-Version: 4.1.2 (no changes required)
+  * Standards-Version: 4.1.3 (no changes required)
 
  -- Simon McVittie <s...@debian.org>  Mon, 27 Nov 2017 11:01:17 +
 
diff --git a/debian/control b/debian/control
index f8d56e1..dc82bde 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  libsdl2-dev (>= 2.0.7~),
  zip,
 Rules-Requires-Root: no
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/openjk.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openjk.git
 Homepage: https://github.com/JACoders/OpenJK

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

[openjk] 15/23: Use ${CMAKE_C_COMPILER_ID}" MATCHES "Clang"

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 01dd4909e87ec524f0eef64f0f1fc1ceb750516a
Author: Ken <21211439+ke...@users.noreply.github.com>
Date:   Sat Dec 16 00:23:07 2017 -0800

Use ${CMAKE_C_COMPILER_ID}" MATCHES "Clang"

This allows the test to match to both Clang and AppleClang, which fixes the 
build on MacOS systems that use the built in Apple clang compiler.
---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3e4798..3fc405b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ if(MSVC)
# We don't try to control symbol visibility under MSVC.
set(OPENJK_VISIBILITY_FLAGS "")
 
-elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" 
STREQUAL "Clang"))
+elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" 
MATCHES "Clang"))
# I hope this doesn't come back to bite me in the butt later on.
# Realistically though, can the C and CXX compilers be different?
 
@@ -260,7 +260,7 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR 
("${CMAKE_C_COMPILER_ID}" S
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
-static-libstdc++")
endif()
-   elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+   elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-comment")
endif()
@@ -275,7 +275,7 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR 
("${CMAKE_C_COMPILER_ID}" S
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
endif()
-   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+   elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
-Wno-deprecated-writable-strings")

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

[openjk] 16/23: New upstream version 0~20171228~dfsg

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 2c2847abdbb910ab18ba00c56f346fd8741d6429
Merge: 6543521 01dd490
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 1 11:47:43 2018 +

New upstream version 0~20171228~dfsg

 CMakeLists.txt  |   6 +-
 code/CMakeLists.txt |   8 -
 code/cgame/cg_consolecmds.cpp   |  14 +-
 code/cgame/cg_local.h   |   2 -
 code/game/bg_panimate.cpp   |   8 +-
 codeJK2/cgame/cg_local.h|   2 -
 codeJK2/game/bg_panimate.cpp|   6 +-
 codemp/CMakeLists.txt   |   8 -
 codemp/cgame/cg_consolecmds.c   |  13 +
 codemp/cgame/cg_event.c |   2 +-
 codemp/cgame/cg_local.h |   2 -
 codemp/cgame/cg_players.c   |   1 +
 codemp/cgame/cg_saga.c  |   7 +-
 codemp/client/cl_main.cpp   |   4 +-
 codemp/game/NPC_stats.c |   1 +
 codemp/game/ai_util.c   |   1 +
 codemp/game/ai_wpnav.c  |   7 +-
 codemp/game/bg_misc.c   |  28 +-
 codemp/game/bg_panimate.c   |  21 +-
 codemp/game/bg_saberLoad.c  |   3 +-
 codemp/game/bg_saga.c   |  14 +-
 codemp/game/bg_vehicleLoad.c|   2 +
 codemp/game/g_cmds.c|   1 +
 codemp/game/g_saga.c|   7 +-
 codemp/game/g_utils.c   |  11 +-
 codemp/game/w_force.c   |  14 +
 codemp/ghoul2/G2_gore.cpp   |   2 +-
 codemp/qcommon/q_shared.c   |   2 +-
 codemp/rd-common/tr_common.h|   2 +-
 codemp/rd-common/tr_font.cpp|  40 +--
 codemp/rd-common/tr_image_jpg.cpp   |   8 +-
 codemp/rd-common/tr_image_load.cpp  |   4 +-
 codemp/rd-common/tr_image_png.cpp   |  40 +--
 codemp/rd-common/tr_image_tga.cpp   |   4 +-
 codemp/rd-dedicated/G2_API.cpp  |  20 +-
 codemp/rd-dedicated/G2_bones.cpp|   6 +-
 codemp/rd-dedicated/G2_misc.cpp |   4 +-
 codemp/rd-dedicated/tr_ghoul2.cpp   |   6 +-
 codemp/rd-dedicated/tr_init.cpp | 274 
 codemp/rd-dedicated/tr_local.h  |   3 +-
 codemp/rd-dedicated/tr_main.cpp |   2 +-
 codemp/rd-dedicated/tr_model.cpp|  42 +--
 codemp/rd-dedicated/tr_shader.cpp   |   8 +-
 codemp/rd-dedicated/tr_skin.cpp |  12 +-
 codemp/rd-vanilla/G2_API.cpp|  50 +--
 codemp/rd-vanilla/G2_bolts.cpp  |   2 +-
 codemp/rd-vanilla/G2_bones.cpp  |  72 ++---
 codemp/rd-vanilla/G2_misc.cpp   |  20 +-
 codemp/rd-vanilla/glext.h   |   2 +-
 codemp/rd-vanilla/tr_WorldEffects.cpp   |  60 ++--
 codemp/rd-vanilla/tr_backend.cpp|  22 +-
 codemp/rd-vanilla/tr_bsp.cpp|  50 +--
 codemp/rd-vanilla/tr_cmds.cpp   |  24 +-
 codemp/rd-vanilla/tr_ghoul2.cpp |  24 +-
 codemp/rd-vanilla/tr_image.cpp  |  94 +++---
 codemp/rd-vanilla/tr_init.cpp   | 554 
 codemp/rd-vanilla/tr_light.cpp  |   2 +-
 codemp/rd-vanilla/tr_local.h|   2 -
 codemp/rd-vanilla/tr_main.cpp   |   8 +-
 codemp/rd-vanilla/tr_mesh.cpp   |   6 +-
 codemp/rd-vanilla/tr_model.cpp  |  74 ++---
 codemp/rd-vanilla/tr_scene.cpp  |  14 +-
 codemp/rd-vanilla/tr_shade.cpp  |   4 +-
 codemp/rd-vanilla/tr_shade_calc.cpp |   8 +-
 codemp/rd-vanilla/tr_shader.cpp | 334 +--
 codemp/rd-vanilla/tr_skin.cpp   |  30 +-
 codemp/rd-vanilla/tr_subs.cpp   |  22 +-
 codemp/rd-vanilla/tr_surface.cpp|   2 +-
 codemp/rd-vanilla/tr_surfacesprites.cpp |   2 +-
 codemp/rd-vanilla/tr_terrain.cpp|  28 +-
 codemp/rd-vanilla/tr_world.cpp  |  32 +-
 codemp/server/server.h  |   5 +-
 codemp/server/sv_client.cpp |  42 ++-
 codemp/server/sv_gameapi.cpp|   3 +
 codemp/server/sv_init.cpp   |   9 +-
 codemp/server/sv_main.cpp   |   5 +-
 codemp/ui/ui_force.c|   1 +
 codemp/ui/ui_main.c |  19 +-
 shared/sys/win_manifest.xml |  37 ---
 79 files changed, 1161 insertions(+), 1174 deletions(-)

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

[openjk] 18/23: New upstream snapshot 01dd4909

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 2163872ac87197e8febe36b27833613fde93b9ef
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 1 11:49:17 2018 +

New upstream snapshot 01dd4909
---
 debian/changelog | 3 ++-
 debian/rules | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8863a92..e979f3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-openjk (0~20171104~dfsg-2) UNRELEASED; urgency=medium
+openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot 01dd4909
   * Build-depend on SDL 2.0.7 so we have at least the version bundled
 by upstream
   * Standards-Version: 4.1.2 (no changes required)
diff --git a/debian/rules b/debian/rules
index db57fc3..02d7ce4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -161,10 +161,10 @@ ORIG_SOURCE = openjk
 ORIG_REPO ?= https://github.com/JACoders/OpenJK
 ORIG_REL =
 # Empty if it's a release
-ORIG_REV = d60340bb827318e9717607f82773cb74f9181a3d
+ORIG_REV = 01dd4909e87ec524f0eef64f0f1fc1ceb750516a
 # Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
 # or empty if ORIG_REV is
-ORIG_DATE = 20171104
+ORIG_DATE = 20171228
 ORIG_SUFFIX = ~dfsg
 
 ifeq (${ORIG_REV},)

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

[openjk] 14/23: [MP] Properly close file handles in the case of errors. Also fixed some flag unsetting (EF_SOUNDTRACKER, WPFLAG_GOALPOINT)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit efbeb7cbbee591620932d053bb4a4f0131846538
Author: Razish 
Date:   Mon Dec 25 10:41:08 2017 +1100

[MP] Properly close file handles in the case of errors. Also fixed some 
flag unsetting (EF_SOUNDTRACKER, WPFLAG_GOALPOINT)
---
 codemp/cgame/cg_event.c  |  2 +-
 codemp/cgame/cg_players.c|  1 +
 codemp/cgame/cg_saga.c   |  7 +--
 codemp/game/NPC_stats.c  |  1 +
 codemp/game/ai_util.c|  1 +
 codemp/game/ai_wpnav.c   |  7 ---
 codemp/game/bg_misc.c| 28 ++--
 codemp/game/bg_panimate.c|  1 +
 codemp/game/bg_saberLoad.c   |  3 ++-
 codemp/game/bg_saga.c| 14 ++
 codemp/game/bg_vehicleLoad.c |  2 ++
 codemp/game/g_saga.c |  7 +--
 codemp/game/g_utils.c| 11 ---
 codemp/ui/ui_force.c |  1 +
 codemp/ui/ui_main.c  | 19 +++
 15 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/codemp/cgame/cg_event.c b/codemp/cgame/cg_event.c
index bd10465..98d3992 100644
--- a/codemp/cgame/cg_event.c
+++ b/codemp/cgame/cg_event.c
@@ -3121,7 +3121,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
DEBUGNAME("EV_MUTE_SOUND");
if (cg_entities[es->trickedentindex2].currentState.eFlags & 
EF_SOUNDTRACKER)
{
-   cg_entities[es->trickedentindex2].currentState.eFlags 
-= EF_SOUNDTRACKER;
+   cg_entities[es->trickedentindex2].currentState.eFlags 
&= ~EF_SOUNDTRACKER;
}
trap->S_MuteSound(es->trickedentindex2, es->trickedentindex);
CG_S_StopLoopingSound(es->trickedentindex2, -1);
diff --git a/codemp/cgame/cg_players.c b/codemp/cgame/cg_players.c
index 1289716..6eac153 100644
--- a/codemp/cgame/cg_players.c
+++ b/codemp/cgame/cg_players.c
@@ -366,6 +366,7 @@ qboolean CG_ParseSurfsFile( const char *modelName, const 
char *skinName, char *s
if ( len >= sizeof( text ) - 1 )
{
Com_Printf( "File %s too long\n", sfilename );
+   trap->FS_Close( f );
return qfalse;
}
 
diff --git a/codemp/cgame/cg_saga.c b/codemp/cgame/cg_saga.c
index 7f3ebde..9d688fb 100644
--- a/codemp/cgame/cg_saga.c
+++ b/codemp/cgame/cg_saga.c
@@ -188,8 +188,11 @@ void CG_InitSiegeMode(void)
 
len = trap->FS_Open(levelname, , FS_READ);
 
-   if (!f || len >= MAX_SIEGE_INFO_SIZE)
-   {
+   if ( !f ) {
+   goto failure;
+   }
+   if ( len >= MAX_SIEGE_INFO_SIZE ) {
+   trap->FS_Close( f );
goto failure;
}
 
diff --git a/codemp/game/NPC_stats.c b/codemp/game/NPC_stats.c
index 0478405..4920ad8 100644
--- a/codemp/game/NPC_stats.c
+++ b/codemp/game/NPC_stats.c
@@ -3591,6 +3591,7 @@ void NPC_LoadParms( void )
else
{
if ( totallen + len >= MAX_NPC_DATA_SIZE ) {
+   trap->FS_Close( f );
trap->Error( ERR_DROP, "NPC extensions (*.npc) 
are too large" );
}
trap->FS_Read(npcParseBuffer, len, f);
diff --git a/codemp/game/ai_util.c b/codemp/game/ai_util.c
index 44bd157..03dc9bb 100644
--- a/codemp/game/ai_util.c
+++ b/codemp/game/ai_util.c
@@ -656,6 +656,7 @@ void BotUtilizePersonality(bot_state_t *bs)
{
trap->Print(S_COLOR_RED "Personality file exceeds maximum 
length\n");
B_TempFree(131072); //buf
+   trap->FS_Close( f );
return;
}
 
diff --git a/codemp/game/ai_wpnav.c b/codemp/game/ai_wpnav.c
index 992060f..562fe75 100644
--- a/codemp/game/ai_wpnav.c
+++ b/codemp/game/ai_wpnav.c
@@ -1886,7 +1886,7 @@ void CalculateWeightGoals(void)
 
if (gWPArray[i]->flags & WPFLAG_GOALPOINT)
{
-   gWPArray[i]->flags -= WPFLAG_GOALPOINT;
+   gWPArray[i]->flags &= ~WPFLAG_GOALPOINT;
}
}
 
@@ -2047,6 +2047,7 @@ int LoadPathData(const char *filename)
if (len >= 524288)
{
trap->Print(S_COLOR_RED "Route file exceeds maximum length\n");
+   trap->FS_Close( f );
return 0;
}
 
@@ -3709,11 +3710,11 @@ int AcceptBotCommand(char *cmd, gentity_t *pl)
{
if (gWPArray[i]->flags & WPFLAG_ONEWAY_FWD)
{
-   gWPArray[i]->flags -= WPFLAG_ONEWAY_FWD;
+   gWPArray[i]->flags &= 
~WPFLAG_ONEWAY_FWD;
}
if 

[openjk] 13/23: [MP] Fix ghoul2 crash found by changing from FFA->Siege and restarting map on local server

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 41bd4d8f5eabf0a24ffdb8cc3d9071d857cda532
Author: Razish 
Date:   Mon Dec 25 10:38:21 2017 +1100

[MP] Fix ghoul2 crash found by changing from FFA->Siege and restarting map 
on local server
---
 codemp/server/sv_gameapi.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/codemp/server/sv_gameapi.cpp b/codemp/server/sv_gameapi.cpp
index 8879f7b..ea7135c 100644
--- a/codemp/server/sv_gameapi.cpp
+++ b/codemp/server/sv_gameapi.cpp
@@ -1542,6 +1542,9 @@ static int SV_G2API_CopyGhoul2Instance( void *g2From, 
void *g2To, int modelIndex
 }
 
 static void SV_G2API_CopySpecificGhoul2Model( void *g2From, int modelFrom, 
void *g2To, int modelTo ) {
+   if ( !g2From || !g2To ) {
+   return;
+   }
re->G2API_CopySpecificG2Model( *((CGhoul2Info_v *)g2From), modelFrom, 
*((CGhoul2Info_v *)g2To), modelTo );
 }
 

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

[openjk] 21/23: Move packaging to salsa.debian.org

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit ba01e3aa066019ffb5e781145048b9ec8129
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 1 12:28:21 2018 +

Move packaging to salsa.debian.org
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 558f639..fba4094 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openjk (0~20171228~dfsg-1) UNRELEASED; urgency=medium
 by upstream
   * Standards-Version: 4.1.3 (no changes required)
   * Move to debhelper compat level 11
+  * Move packaging to salsa.debian.org
 
  -- Simon McVittie <s...@debian.org>  Mon, 27 Nov 2017 11:01:17 +
 
diff --git a/debian/control b/debian/control
index 1adc009..5967245 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends:
  zip,
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/openjk.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openjk.git
+Vcs-Git: https://salsa.debian.org/debiangames-team/openjk.git
+Vcs-Browser: https://salsa.debian.org/debiangames-team/openjk
 Homepage: https://github.com/JACoders/OpenJK
 
 Package: openjk-academy

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

[openjk] 11/23: [MP] Fix for holocron mode to disallow saber styles that aren't known

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 18f20494dffbf12c2167a1c92dbea4aae70fdeb9
Author: Razish 
Date:   Mon Dec 25 10:34:06 2017 +1100

[MP] Fix for holocron mode to disallow saber styles that aren't known
---
 codemp/game/w_force.c | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/codemp/game/w_force.c b/codemp/game/w_force.c
index 64e4f87..034df35 100644
--- a/codemp/game/w_force.c
+++ b/codemp/game/w_force.c
@@ -4793,6 +4793,20 @@ void HolocronUpdate(gentity_t *self)
{
self->client->ps.fd.forcePowerLevel[i] 
= FORCE_LEVEL_1;
}
+
+   //make sure that the player's saber stance is 
reset so they can't continue to use that stance when they don't have the skill 
for it anymore.
+   if ( self->client->saber[0].model[0] && 
self->client->saber[1].model[0] )
+   { //dual
+   self->client->ps.fd.saberAnimLevelBase 
= self->client->ps.fd.saberAnimLevel = self->client->ps.fd.saberDrawAnimLevel = 
SS_DUAL;
+   }
+   else if ( (self->client->saber[0].saberFlags & 
SFL_TWO_HANDED) )
+   { //staff
+   self->client->ps.fd.saberAnimLevel = 
self->client->ps.fd.saberDrawAnimLevel = SS_STAFF;
+   }
+   else
+   {
+   self->client->ps.fd.saberAnimLevelBase 
= self->client->ps.fd.saberAnimLevel = self->client->ps.fd.saberDrawAnimLevel = 
SS_MEDIUM;
+   }
}
else
{

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

[openjk] 08/23: [MP] Added sv_floodProtectSlow (0 = don't reset timer on rejected commands). Allowed sv_floodProtect to specify flood time in ms

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 9bbba0a4de24e9f3be1c0c4f1b4144ba6b0487a0
Author: Razish 
Date:   Tue Dec 12 17:03:13 2017 +1100

[MP] Added sv_floodProtectSlow (0 = don't reset timer on rejected 
commands). Allowed sv_floodProtect to specify flood time in ms
---
 codemp/server/server.h  |  3 ++-
 codemp/server/sv_client.cpp | 22 ++
 codemp/server/sv_init.cpp   |  1 +
 codemp/server/sv_main.cpp   |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/codemp/server/server.h b/codemp/server/server.h
index e64b97e..78a2617 100644
--- a/codemp/server/server.h
+++ b/codemp/server/server.h
@@ -168,7 +168,7 @@ typedef struct client_s {
int downloadSendTime;   // time we last 
got an ack from the client
 
int deltaMessage;   // frame last 
client usercmd message
-   int nextReliableTime;   // svs.time 
when another reliable command will be allowed
+   int lastReliableTime;   // svs.time 
when reliable command was last received
int lastPacketTime; // svs.time 
when packet was last received
int lastConnectTime;// svs.time 
when connection started
int nextSnapshotTime;   // send another 
snapshot when svs.time >= nextSnapshotTime
@@ -264,6 +264,7 @@ extern  cvar_t  *sv_maxPing;
 extern cvar_t  *sv_gametype;
 extern cvar_t  *sv_pure;
 extern cvar_t  *sv_floodProtect;
+extern cvar_t  *sv_floodProtectSlow;
 extern cvar_t  *sv_lanForceRate;
 extern cvar_t  *sv_needpass;
 extern cvar_t  *sv_filterCommands;
diff --git a/codemp/server/sv_client.cpp b/codemp/server/sv_client.cpp
index d88ed6e..bb8bf8d 100644
--- a/codemp/server/sv_client.cpp
+++ b/codemp/server/sv_client.cpp
@@ -1336,16 +1336,22 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t 
*msg ) {
// normal to spam a lot of commands when downloading
if ( !com_cl_running->integer &&
cl->state >= CS_ACTIVE &&
-   sv_floodProtect->integer &&
-   svs.time < cl->nextReliableTime ) {
-   // ignore any other text messages from this client but let them 
keep playing
-   // TTimo - moved the ignored verbose to the actual processing 
in SV_ExecuteClientCommand, only printing if the core doesn't intercept
-   clientOk = qfalse;
+   sv_floodProtect->integer )
+   {
+   const int floodTime = (sv_floodProtect->integer == 1) ? 1000 : 
sv_floodProtect->integer;
+   if ( svs.time < (cl->lastReliableTime + floodTime) ) {
+   // ignore any other text messages from this client but 
let them keep playing
+   // TTimo - moved the ignored verbose to the actual 
processing in SV_ExecuteClientCommand, only printing if the core doesn't 
intercept
+   clientOk = qfalse;
+   }
+   else {
+   cl->lastReliableTime = svs.time;
+   }
+   if ( sv_floodProtectSlow->integer ) {
+   cl->lastReliableTime = svs.time;
+   }
}
 
-   // don't allow another command for one second
-   cl->nextReliableTime = svs.time + 1000;
-
SV_ExecuteClientCommand( cl, s, clientOk );
 
cl->lastClientCommand = seq;
diff --git a/codemp/server/sv_init.cpp b/codemp/server/sv_init.cpp
index 0a29a43..11ec030 100644
--- a/codemp/server/sv_init.cpp
+++ b/codemp/server/sv_init.cpp
@@ -963,6 +963,7 @@ void SV_Init (void) {
sv_minPing = Cvar_Get ("sv_minPing", "0", CVAR_ARCHIVE_ND | 
CVAR_SERVERINFO );
sv_maxPing = Cvar_Get ("sv_maxPing", "0", CVAR_ARCHIVE_ND | 
CVAR_SERVERINFO );
sv_floodProtect = Cvar_Get ("sv_floodProtect", "1", CVAR_ARCHIVE | 
CVAR_SERVERINFO, "Protect against flooding of server commands" );
+   sv_floodProtectSlow = Cvar_Get ("sv_floodProtectSlow", "1", 
CVAR_ARCHIVE | CVAR_SERVERINFO, "Use original method of delaying commands with 
flood protection" );
// systeminfo
Cvar_Get ("sv_cheats", "1", CVAR_SYSTEMINFO | CVAR_ROM, "Allow cheats 
on server if set to 1" );
sv_serverid = Cvar_Get ("sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM 
);
diff --git a/codemp/server/sv_main.cpp b/codemp/server/sv_main.cpp
index a968c4d..64f593c 100644
--- a/codemp/server/sv_main.cpp
+++ b/codemp/server/sv_main.cpp
@@ -60,6 +60,7 @@ cvar_t*sv_maxPing;
 cvar_t *sv_gametype;
 cvar_t *sv_pure;
 cvar_t *sv_floodProtect;
+cvar_t *sv_floodProtectSlow;
 cvar_t *sv_lanForceRate; // dedicated 1 (LAN) server forces local client rates 
to 9 (bug #491)
 cvar_t *sv_needpass;
 cvar_t *sv_filterCommands; // 

[openjk] 09/23: [Shared] Remove unused (conflicting) defines causing compiler warnings (gcc, clang)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 58e5a2002ae8b3d3dbd003d1fb494c0c737c2397
Author: Razish 
Date:   Sun Dec 24 13:32:43 2017 +1100

[Shared] Remove unused (conflicting) defines causing compiler warnings 
(gcc, clang)
---
 code/cgame/cg_local.h| 2 --
 codeJK2/cgame/cg_local.h | 2 --
 codemp/cgame/cg_local.h  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index aea6040..3a1f7e8 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -73,8 +73,6 @@ along with this program; if not, see 
.
 #define STAT_MINUS 10  // num frame for '-' stats digit
 
 #defineICON_SIZE   48
-#defineCHAR_WIDTH  32
-#defineCHAR_HEIGHT 48
 #defineTEXT_ICON_SPACE 4
 
 #defineCHARSMALL_WIDTH 16
diff --git a/codeJK2/cgame/cg_local.h b/codeJK2/cgame/cg_local.h
index 57e6ddb..fa696e1 100644
--- a/codeJK2/cgame/cg_local.h
+++ b/codeJK2/cgame/cg_local.h
@@ -73,8 +73,6 @@ along with this program; if not, see 
.
 #define STAT_MINUS 10  // num frame for '-' stats digit
 
 #defineICON_SIZE   48
-#defineCHAR_WIDTH  32
-#defineCHAR_HEIGHT 48
 #defineTEXT_ICON_SPACE 4
 
 #defineCHARSMALL_WIDTH 16
diff --git a/codemp/cgame/cg_local.h b/codemp/cgame/cg_local.h
index 4c7775d..f4be1d3 100644
--- a/codemp/cgame/cg_local.h
+++ b/codemp/cgame/cg_local.h
@@ -73,8 +73,6 @@ along with this program; if not, see 
.
 #define STAT_MINUS 10  // num frame for '-' stats digit
 
 #defineICON_SIZE   48
-#defineCHAR_WIDTH  32
-#defineCHAR_HEIGHT 48
 #defineTEXT_ICON_SPACE 4
 
 // very large characters

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

[openjk] 10/23: [MP] Show infostring overflow reason

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit b5d4273c387cf5c51e4af6dc0a4174bc6dcbe026
Author: Razish 
Date:   Sun Dec 24 15:29:54 2017 +1100

[MP] Show infostring overflow reason
---
 codemp/qcommon/q_shared.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codemp/qcommon/q_shared.c b/codemp/qcommon/q_shared.c
index 439ea62..74e3cca 100644
--- a/codemp/qcommon/q_shared.c
+++ b/codemp/qcommon/q_shared.c
@@ -1009,7 +1009,7 @@ void Info_SetValueForKey( char *s, const char *key, const 
char *value ) {
 
if (strlen(newi) + strlen(s) >= MAX_INFO_STRING)
{
-   Com_Printf ("Info string length exceeded\n");
+   Com_Printf ("Info string length exceeded: %s\n", s);
return;
}
 

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

[openjk] 17/23: Update upstream source from tag 'upstream/0_20171228_dfsg'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 0e065d805892b5ed8e0690d9ddf93db7dfe8d192
Merge: d024656 2c2847a
Author: Simon McVittie <s...@debian.org>
Date:   Mon Jan 1 11:48:03 2018 +

Update upstream source from tag 'upstream/0_20171228_dfsg'

Update to upstream version '0~20171228~dfsg'
with Debian dir 097bc7cb739272e70dc00cefabd8fc68dd0a2854

 CMakeLists.txt  |   6 +-
 code/CMakeLists.txt |   8 -
 code/cgame/cg_consolecmds.cpp   |  14 +-
 code/cgame/cg_local.h   |   2 -
 code/game/bg_panimate.cpp   |   8 +-
 codeJK2/cgame/cg_local.h|   2 -
 codeJK2/game/bg_panimate.cpp|   6 +-
 codemp/CMakeLists.txt   |   8 -
 codemp/cgame/cg_consolecmds.c   |  13 +
 codemp/cgame/cg_event.c |   2 +-
 codemp/cgame/cg_local.h |   2 -
 codemp/cgame/cg_players.c   |   1 +
 codemp/cgame/cg_saga.c  |   7 +-
 codemp/client/cl_main.cpp   |   4 +-
 codemp/game/NPC_stats.c |   1 +
 codemp/game/ai_util.c   |   1 +
 codemp/game/ai_wpnav.c  |   7 +-
 codemp/game/bg_misc.c   |  28 +-
 codemp/game/bg_panimate.c   |  21 +-
 codemp/game/bg_saberLoad.c  |   3 +-
 codemp/game/bg_saga.c   |  14 +-
 codemp/game/bg_vehicleLoad.c|   2 +
 codemp/game/g_cmds.c|   1 +
 codemp/game/g_saga.c|   7 +-
 codemp/game/g_utils.c   |  11 +-
 codemp/game/w_force.c   |  14 +
 codemp/ghoul2/G2_gore.cpp   |   2 +-
 codemp/qcommon/q_shared.c   |   2 +-
 codemp/rd-common/tr_common.h|   2 +-
 codemp/rd-common/tr_font.cpp|  40 +--
 codemp/rd-common/tr_image_jpg.cpp   |   8 +-
 codemp/rd-common/tr_image_load.cpp  |   4 +-
 codemp/rd-common/tr_image_png.cpp   |  40 +--
 codemp/rd-common/tr_image_tga.cpp   |   4 +-
 codemp/rd-dedicated/G2_API.cpp  |  20 +-
 codemp/rd-dedicated/G2_bones.cpp|   6 +-
 codemp/rd-dedicated/G2_misc.cpp |   4 +-
 codemp/rd-dedicated/tr_ghoul2.cpp   |   6 +-
 codemp/rd-dedicated/tr_init.cpp | 274 
 codemp/rd-dedicated/tr_local.h  |   3 +-
 codemp/rd-dedicated/tr_main.cpp |   2 +-
 codemp/rd-dedicated/tr_model.cpp|  42 +--
 codemp/rd-dedicated/tr_shader.cpp   |   8 +-
 codemp/rd-dedicated/tr_skin.cpp |  12 +-
 codemp/rd-vanilla/G2_API.cpp|  50 +--
 codemp/rd-vanilla/G2_bolts.cpp  |   2 +-
 codemp/rd-vanilla/G2_bones.cpp  |  72 ++---
 codemp/rd-vanilla/G2_misc.cpp   |  20 +-
 codemp/rd-vanilla/glext.h   |   2 +-
 codemp/rd-vanilla/tr_WorldEffects.cpp   |  60 ++--
 codemp/rd-vanilla/tr_backend.cpp|  22 +-
 codemp/rd-vanilla/tr_bsp.cpp|  50 +--
 codemp/rd-vanilla/tr_cmds.cpp   |  24 +-
 codemp/rd-vanilla/tr_ghoul2.cpp |  24 +-
 codemp/rd-vanilla/tr_image.cpp  |  94 +++---
 codemp/rd-vanilla/tr_init.cpp   | 554 
 codemp/rd-vanilla/tr_light.cpp  |   2 +-
 codemp/rd-vanilla/tr_local.h|   2 -
 codemp/rd-vanilla/tr_main.cpp   |   8 +-
 codemp/rd-vanilla/tr_mesh.cpp   |   6 +-
 codemp/rd-vanilla/tr_model.cpp  |  74 ++---
 codemp/rd-vanilla/tr_scene.cpp  |  14 +-
 codemp/rd-vanilla/tr_shade.cpp  |   4 +-
 codemp/rd-vanilla/tr_shade_calc.cpp |   8 +-
 codemp/rd-vanilla/tr_shader.cpp | 334 +--
 codemp/rd-vanilla/tr_skin.cpp   |  30 +-
 codemp/rd-vanilla/tr_subs.cpp   |  22 +-
 codemp/rd-vanilla/tr_surface.cpp|   2 +-
 codemp/rd-vanilla/tr_surfacesprites.cpp |   2 +-
 codemp/rd-vanilla/tr_terrain.cpp|  28 +-
 codemp/rd-vanilla/tr_world.cpp  |  32 +-
 codemp/server/server.h  |   5 +-
 codemp/server/sv_client.cpp |  42 ++-
 codemp/server/sv_gameapi.cpp|   3 +
 codemp/server/sv_init.cpp   |   9 +-
 codemp/server/sv_main.cpp   |   5 +-
 codemp/ui/ui_force.c|   1 +
 codemp/ui/ui_main.c |  19 +-
 shared/sys/win_manifest.xml |  37 ---
 79 files changed, 1161 insertions(+), 1174 deletions(-)

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

[openjk] 12/23: [MP] Mindtrick users now decloak when they attempt to melee grapple someone

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 5dedb33968797ebdb113c4c35b3039b734a7f7a2
Author: Razish 
Date:   Mon Dec 25 10:37:27 2017 +1100

[MP] Mindtrick users now decloak when they attempt to melee grapple someone
---
 codemp/game/g_cmds.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codemp/game/g_cmds.c b/codemp/game/g_cmds.c
index 9f2be21..c2a9feb 100644
--- a/codemp/game/g_cmds.c
+++ b/codemp/game/g_cmds.c
@@ -3258,6 +3258,7 @@ qboolean TryGrapple(gentity_t *ent)
ent->client->ps.legsTimer = ent->client->ps.torsoTimer;
}
ent->client->ps.weaponTime = ent->client->ps.torsoTimer;
+   ent->client->dangerTime = level.time;
return qtrue;
}
 

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

[openjk] 07/23: [Shared] Fix crash when passing invalid animations to PM_AnimLength. Fixes #943. Ref #939. Thanks to @peter-kien for pointing out the cause of UB

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 92059a6bdd9a7a256e0a07d550c5fc4db4ddb8f4
Author: Razish 
Date:   Sun Dec 10 02:42:29 2017 +1100

[Shared] Fix crash when passing invalid animations to PM_AnimLength. Fixes 
#943. Ref #939.
Thanks to @peter-kien for pointing out the cause of UB
---
 code/game/bg_panimate.cpp|  8 
 codeJK2/game/bg_panimate.cpp |  6 +++---
 codemp/game/bg_panimate.c| 20 
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/code/game/bg_panimate.cpp b/code/game/bg_panimate.cpp
index b681329..a016cc6 100644
--- a/code/game/bg_panimate.cpp
+++ b/code/game/bg_panimate.cpp
@@ -4373,12 +4373,12 @@ PM_AnimLength
 -
 */
 
-int PM_AnimLength( int index, animNumber_t anim )
-{
-   if ( ValidAnimFileIndex( index ) == false )
+int PM_AnimLength( int index, animNumber_t anim ) {
+   if ( !ValidAnimFileIndex( index ) || (int)anim < 0 || anim >= 
MAX_ANIMATIONS ) {
return 0;
+   }
 
-   return level.knownAnimFileSets[index].animations[anim].numFrames * 
abs(level.knownAnimFileSets[index].animations[anim].frameLerp);
+   return level.knownAnimFileSets[index].animations[anim].numFrames * abs( 
level.knownAnimFileSets[index].animations[anim].frameLerp );
 }
 
 /*
diff --git a/codeJK2/game/bg_panimate.cpp b/codeJK2/game/bg_panimate.cpp
index 7fd2c7c..91ecc83 100644
--- a/codeJK2/game/bg_panimate.cpp
+++ b/codeJK2/game/bg_panimate.cpp
@@ -2035,10 +2035,10 @@ PM_AnimLength
 -
 */
 
-int PM_AnimLength( int index, animNumber_t anim )
-{
-   if ( ValidAnimFileIndex( index ) == false )
+int PM_AnimLength( int index, animNumber_t anim ) {
+   if ( !ValidAnimFileIndex( index ) || (int)anim < 0 || anim >= 
MAX_ANIMATIONS ) {
return 0;
+   }
 
return level.knownAnimFileSets[index].animations[anim].numFrames * 
fabs((double)(level.knownAnimFileSets[index].animations[anim].frameLerp));
 }
diff --git a/codemp/game/bg_panimate.c b/codemp/game/bg_panimate.c
index 8b7b22f..3f6b9be 100644
--- a/codemp/game/bg_panimate.c
+++ b/codemp/game/bg_panimate.c
@@ -1589,25 +1589,21 @@ and anim number. Obviously does not take things like 
the length of the
 anim while force speeding (as an example) and whatnot into account.
 =
 */
-int BG_AnimLength( int index, animNumber_t anim )
-{
-   if (anim >= MAX_ANIMATIONS)
-   {
-   return -1;
+int BG_AnimLength( int index, animNumber_t anim ) {
+   if ( (int)anim < 0 || anim >= MAX_ANIMATIONS ) {
+   return 0;
}
 
-   return bgAllAnims[index].anims[anim].numFrames * 
fabs((float)(bgAllAnims[index].anims[anim].frameLerp));
+   return bgAllAnims[index].anims[anim].numFrames * fabs( 
(float)(bgAllAnims[index].anims[anim].frameLerp) );
 }
 
 //just use whatever pm->animations is
-int PM_AnimLength( int index, animNumber_t anim )
-{
-   if (anim >= MAX_ANIMATIONS || !pm->animations)
-   {
-   return -1;
+int PM_AnimLength( int index, animNumber_t anim ) {
+   if ( !pm->animations || (int)anim < 0 || anim >= MAX_ANIMATIONS ) {
+   return 0;
}
 
-   return pm->animations[anim].numFrames * 
fabs((float)(pm->animations[anim].frameLerp));
+   return pm->animations[anim].numFrames * fabs( 
(float)(pm->animations[anim].frameLerp) );
 }
 
 void PM_DebugLegsAnim(int anim)

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

[openjk] 05/23: SP: Fix symbol error caused by UI functions in cgame

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit eba428e64e314ddb822d52f3bf10c12c8f631cfe
Author: Ensiform 
Date:   Fri Dec 8 09:42:55 2017 -0600

SP: Fix symbol error caused by UI functions in cgame

These two functions existin SP's exe which is where UI resides there.

I am leaving references to the proper syscalls but since they do not get 
used when hud is normally loaded in SP (commented out), I think it is best to 
not call them as it is a global state affecting menus as well.
---
 code/cgame/cg_consolecmds.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_consolecmds.cpp b/code/cgame/cg_consolecmds.cpp
index d400ab3..eb4b79a 100644
--- a/code/cgame/cg_consolecmds.cpp
+++ b/code/cgame/cg_consolecmds.cpp
@@ -27,7 +27,6 @@ along with this program; if not, see 
.
 #include "cg_headers.h"
 
 #include "cg_media.h"  //just for cgs
-#include "ui/ui_shared.h"
 
 void CG_TargetCommand_f( void );
 extern qbooleanplayer_locked;
@@ -203,8 +202,8 @@ void CG_LoadHud_f( void ) {
hudSet = "ui/jahud.txt";
}
 
-   String_Init();
-   Menu_Reset();
+   //cgi_UI_String_Init();
+   //cgi_UI_Menu_Reset();
CG_LoadMenus( hudSet );
 }
 

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

[openjk] 04/23: [MP] Fix multiple master (globalservers 0) support

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 4090e096070547f48828e8fb2ced74b05e1563f6
Author: Ensiform 
Date:   Thu Dec 7 10:08:21 2017 +1100

[MP] Fix multiple master (globalservers 0) support
---
 codemp/client/cl_main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codemp/client/cl_main.cpp b/codemp/client/cl_main.cpp
index 7d60b23..e540fd2 100644
--- a/codemp/client/cl_main.cpp
+++ b/codemp/client/cl_main.cpp
@@ -3339,12 +3339,12 @@ void CL_GlobalServers_f( void ) {
return;
}
 
-   Com_sprintf( command, sizeof(command), "sv_master%d", masterNum + 1 );
+   Com_sprintf( command, sizeof(command), "sv_master%d", masterNum );
masteraddress = Cvar_VariableString( command );
 
if ( !*masteraddress )
{
-   Com_Printf( "CL_GlobalServers_f: Error: No master server 
address given.\n" );
+   Com_Printf( "CL_GlobalServers_f: Error: No master server 
address given for %s.\n", command );
return;
}
 

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

[openjk] 03/23: [MP] Rename sv_legacyFixForceSelect to sv_legacyFixes, also force roll angle Default sv_filterCommands to 1, move '; ' filtering to value 2

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 8b07e58c1c2875e94823c8afe5443e003370349b
Author: Razish 
Date:   Wed Dec 6 23:49:59 2017 +1100

[MP] Rename sv_legacyFixForceSelect to sv_legacyFixes, also force roll angle
Default sv_filterCommands to 1, move ';' filtering to value 2
---
 codemp/server/server.h  |  2 +-
 codemp/server/sv_client.cpp | 20 +++-
 codemp/server/sv_init.cpp   |  8 
 codemp/server/sv_main.cpp   |  4 ++--
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/codemp/server/server.h b/codemp/server/server.h
index 9f4839a..e64b97e 100644
--- a/codemp/server/server.h
+++ b/codemp/server/server.h
@@ -270,7 +270,7 @@ extern  cvar_t  *sv_filterCommands;
 extern cvar_t  *sv_autoDemo;
 extern cvar_t  *sv_autoDemoBots;
 extern cvar_t  *sv_autoDemoMaxMaps;
-extern cvar_t  *sv_legacyFixForceSelect;
+extern cvar_t  *sv_legacyFixes;
 extern cvar_t  *sv_banFile;
 
 extern serverBan_t serverBans[SERVER_MAXBANS];
diff --git a/codemp/server/sv_client.cpp b/codemp/server/sv_client.cpp
index f6f9635..d88ed6e 100644
--- a/codemp/server/sv_client.cpp
+++ b/codemp/server/sv_client.cpp
@@ -1285,8 +1285,13 @@ void SV_ExecuteClientCommand( client_t *cl, const char 
*s, qboolean clientOK ) {
// pass unknown strings to the game
if (!u->name && sv.state == SS_GAME && (cl->state == CS_ACTIVE 
|| cl->state == CS_PRIMED)) {
// strip \r \n and ;
-   if ( sv_filterCommands->integer )
-   Cmd_Args_Sanitize();
+   if ( sv_filterCommands->integer ) {
+   Cmd_Args_Sanitize( MAX_CVAR_VALUE_STRING, 
"\n\r", "  " );
+   if ( sv_filterCommands->integer == 2 ) {
+   // also strip ';' for callvote
+   Cmd_Args_Sanitize( 
MAX_CVAR_VALUE_STRING, ";", " " );
+   }
+   }
GVM_ClientCommand( cl - svs.clients );
}
}
@@ -1419,9 +1424,14 @@ static void SV_UserMove( client_t *cl, msg_t *msg, 
qboolean delta ) {
for ( i = 0 ; i < cmdCount ; i++ ) {
cmd = [i];
MSG_ReadDeltaUsercmdKey( msg, key, oldcmd, cmd );
-   if ( sv_legacyFixForceSelect->integer && (cmd->forcesel == 
FP_LEVITATION || cmd->forcesel >= NUM_FORCE_POWERS) )
-   {
-   cmd->forcesel = 0xFFu;
+   if ( sv_legacyFixes->integer ) {
+   // block "charge jump" and other nonsense
+   if ( cmd->forcesel == FP_LEVITATION || cmd->forcesel >= 
NUM_FORCE_POWERS ) {
+   cmd->forcesel = 0xFFu;
+   }
+
+   // affects speed calculation
+   cmd->angles[ROLL] = 0;
}
oldcmd = cmd;
}
diff --git a/codemp/server/sv_init.cpp b/codemp/server/sv_init.cpp
index 1ad1fbf..0a29a43 100644
--- a/codemp/server/sv_init.cpp
+++ b/codemp/server/sv_init.cpp
@@ -951,8 +951,8 @@ void SV_Init (void) {
Cvar_CheckRange( sv_privateClients, 0, MAX_CLIENTS, qtrue );
sv_hostname = Cvar_Get ("sv_hostname", "*Jedi*", CVAR_SERVERINFO | 
CVAR_ARCHIVE, "The name of the server that is displayed in the serverlist" );
sv_maxclients = Cvar_Get ("sv_maxclients", "8", CVAR_SERVERINFO | 
CVAR_LATCH, "Max. connected clients" );
-   
-   
+
+
//cvar_t*sv_ratePolicy; // 1-2
//cvar_t*sv_clientRate;
sv_ratePolicy = Cvar_Get( "sv_ratePolicy", "1", CVAR_ARCHIVE_ND, 
"Determines which policy of enforcement is used for client's \"rate\" cvar" );
@@ -997,7 +997,7 @@ void SV_Init (void) {
sv_mapChecksum = Cvar_Get ("sv_mapChecksum", "", CVAR_ROM);
sv_lanForceRate = Cvar_Get ("sv_lanForceRate", "1", CVAR_ARCHIVE_ND );
 
-   sv_filterCommands = Cvar_Get( "sv_filterCommands", "0", CVAR_ARCHIVE );
+   sv_filterCommands = Cvar_Get( "sv_filterCommands", "1", CVAR_ARCHIVE );
 
 // sv_debugserver = Cvar_Get ("sv_debugserver", "0", 0);
 
@@ -1005,7 +1005,7 @@ void SV_Init (void) {
sv_autoDemoBots = Cvar_Get( "sv_autoDemoBots", "0", CVAR_ARCHIVE_ND, 
"Record server-side demos for bots" );
sv_autoDemoMaxMaps = Cvar_Get( "sv_autoDemoMaxMaps", "0", 
CVAR_ARCHIVE_ND );
 
-   sv_legacyFixForceSelect = Cvar_Get( "sv_legacyFixForceSelect", "1", 
CVAR_ARCHIVE );
+   sv_legacyFixes = Cvar_Get( "sv_legacyFixes", "1", CVAR_ARCHIVE );
 
sv_banFile = Cvar_Get( "sv_banFile", "serverbans.dat", CVAR_ARCHIVE, 
"File to use to store bans and exceptions" );
 
diff --git a/codemp/server/sv_main.cpp b/codemp/server/sv_main.cpp
index 6c61869..a968c4d 100644
--- 

[openjk] branch debian/master updated (d024656 -> 14de557)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository openjk.

  from  d024656   Standards-Version: 4.1.2 (no changes required)
   new  1d125c7   Revert "Shared: Add DPI awareness manifest"
   new  7f23591   [Shared] Add loadhud to MP, make SP reload strings and 
menus
   new  8b07e58   [MP] Rename sv_legacyFixForceSelect to sv_legacyFixes, 
also force roll angle Default sv_filterCommands to 1, move ';' filtering to 
value 2
   new  4090e09   [MP] Fix multiple master (globalservers 0) support
   new  eba428e   SP: Fix symbol error caused by UI functions in cgame
   new  ae3900f   Change refimport ri from ptr type to value type
   new  92059a6   [Shared] Fix crash when passing invalid animations to 
PM_AnimLength. Fixes #943. Ref #939. Thanks to @peter-kien for pointing out the 
cause of UB
   new  9bbba0a   [MP] Added sv_floodProtectSlow (0 = don't reset timer on 
rejected commands). Allowed sv_floodProtect to specify flood time in ms
   new  58e5a20   [Shared] Remove unused (conflicting) defines causing 
compiler warnings (gcc, clang)
   new  b5d4273   [MP] Show infostring overflow reason
   new  18f2049   [MP] Fix for holocron mode to disallow saber styles that 
aren't known
   new  5dedb33   [MP] Mindtrick users now decloak when they attempt to 
melee grapple someone
   new  41bd4d8   [MP] Fix ghoul2 crash found by changing from FFA->Siege 
and restarting map on local server
   new  efbeb7c   [MP] Properly close file handles in the case of errors. 
Also fixed some flag unsetting (EF_SOUNDTRACKER, WPFLAG_GOALPOINT)
   new  01dd490   Use ${CMAKE_C_COMPILER_ID}" MATCHES "Clang"
   new  2c2847a   New upstream version 0~20171228~dfsg
   new  0e065d8   Update upstream source from tag 'upstream/0_20171228_dfsg'
   new  2163872   New upstream snapshot 01dd4909
   new  af933f7   Standards-Version: 4.1.3 (no changes required)
   new  56631c2   Move to debhelper compat level 11
   new  ba01e3a   Move packaging to salsa.debian.org
   new  174f4d2   0~20171228~dfsg-1
   new  14de557   Change Vcs-* from debiangames-team to games-team

The 23 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:
 CMakeLists.txt  |   6 +-
 code/CMakeLists.txt |   8 -
 code/cgame/cg_consolecmds.cpp   |  14 +-
 code/cgame/cg_local.h   |   2 -
 code/game/bg_panimate.cpp   |   8 +-
 codeJK2/cgame/cg_local.h|   2 -
 codeJK2/game/bg_panimate.cpp|   6 +-
 codemp/CMakeLists.txt   |   8 -
 codemp/cgame/cg_consolecmds.c   |  13 +
 codemp/cgame/cg_event.c |   2 +-
 codemp/cgame/cg_local.h |   2 -
 codemp/cgame/cg_players.c   |   1 +
 codemp/cgame/cg_saga.c  |   7 +-
 codemp/client/cl_main.cpp   |   4 +-
 codemp/game/NPC_stats.c |   1 +
 codemp/game/ai_util.c   |   1 +
 codemp/game/ai_wpnav.c  |   7 +-
 codemp/game/bg_misc.c   |  28 +-
 codemp/game/bg_panimate.c   |  21 +-
 codemp/game/bg_saberLoad.c  |   3 +-
 codemp/game/bg_saga.c   |  14 +-
 codemp/game/bg_vehicleLoad.c|   2 +
 codemp/game/g_cmds.c|   1 +
 codemp/game/g_saga.c|   7 +-
 codemp/game/g_utils.c   |  11 +-
 codemp/game/w_force.c   |  14 +
 codemp/ghoul2/G2_gore.cpp   |   2 +-
 codemp/qcommon/q_shared.c   |   2 +-
 codemp/rd-common/tr_common.h|   2 +-
 codemp/rd-common/tr_font.cpp|  40 +--
 codemp/rd-common/tr_image_jpg.cpp   |   8 +-
 codemp/rd-common/tr_image_load.cpp  |   4 +-
 codemp/rd-common/tr_image_png.cpp   |  40 +--
 codemp/rd-common/tr_image_tga.cpp   |   4 +-
 codemp/rd-dedicated/G2_API.cpp  |  20 +-
 codemp/rd-dedicated/G2_bones.cpp|   6 +-
 codemp/rd-dedicated/G2_misc.cpp |   4 +-
 codemp/rd-dedicated/tr_ghoul2.cpp   |   6 +-
 codemp/rd-dedicated/tr_init.cpp | 274 
 codemp/rd-dedicated/tr_local.h  |   3 +-
 codemp/rd-dedicated/tr_main.cpp |   2 +-
 codemp/rd-dedicated/tr_model.cpp|  42 +--
 codemp/rd-dedicated/tr_shader.cpp   |   8 +-
 codemp/rd-dedicated/tr_skin.cpp |  12 +-
 codemp/rd-vanilla/G2_API.cpp|  50 +--
 codemp/rd-vanilla/G2_bolts.cpp  |   2 +-
 codemp/rd-vanilla/G2_bones.cpp  |  72 ++---
 codemp/rd-vanilla/G2_misc.cpp   |  20 +-
 codemp/rd-vanilla/glext.h   |   2 +-
 codemp/rd-vanilla/tr_WorldEffects.cpp   |  60 ++--
 

[openjk] 01/23: Revert "Shared: Add DPI awareness manifest"

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 1d125c7d15b6e91abe67a3de4e47e27f1406739d
Author: Ensiform 
Date:   Fri Nov 3 20:38:37 2017 -0500

Revert "Shared: Add DPI awareness manifest"

This reverts commit b5c3f14ad9c3f2395617f3477312f3b96729e5be.
---
 code/CMakeLists.txt |  8 
 codemp/CMakeLists.txt   |  8 
 shared/sys/win_manifest.xml | 37 -
 3 files changed, 53 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index db401e7..34525c4 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -416,14 +416,6 @@ if(BuildSPEngine OR BuildJK2SPEngine)
endif()
endif(MakeApplicationBundles)
 
-   # add DPI awareness manifest
-   if(MSVC)
-   add_custom_command(TARGET ${ProjectName} POST_BUILD
-   COMMAND "mt.exe" -manifest 
\"${SharedDir}\\sys\\win_manifest.xml\" 
-inputresource:\"$\"\;\#1 
-outputresource:\"$\"\;\#1
-   COMMENT "Adding manifest..." 
-   )
-   endif()
-
set_target_properties(${ProjectName} PROPERTIES 
COMPILE_DEFINITIONS "${SPEngineDefines}")
 
# Hide symbols not explicitly marked public.
diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt
index c2bcbe7..2bd4aa4 100644
--- a/codemp/CMakeLists.txt
+++ b/codemp/CMakeLists.txt
@@ -577,14 +577,6 @@ if(BuildMPEngine)
endif(MakeApplicationBundles)
endif(WIN32)
 
-   # add DPI awareness manifest
-   if(MSVC)
-   add_custom_command(TARGET ${MPEngine} POST_BUILD
-   COMMAND "mt.exe" -manifest 
\"${SharedDir}\\sys\\win_manifest.xml\" 
-inputresource:\"$\"\;\#1 
-outputresource:\"$\"\;\#1
-   COMMENT "Adding manifest..." 
-   )
-   endif()
-
if(MakeApplicationBundles)
install(TARGETS ${MPEngine}
BUNDLE
diff --git a/shared/sys/win_manifest.xml b/shared/sys/win_manifest.xml
deleted file mode 100644
index 2d4412e..000
--- a/shared/sys/win_manifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-  
-
-  
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  http://schemas.microsoft.com/SMI/2005/WindowsSettings;>True/PM
-  http://schemas.microsoft.com/SMI/2016/WindowsSettings;>PerMonitorV2, 
PerMonitor
-
-  
-
\ No newline at end of file

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

[openjk] 02/23: [Shared] Add loadhud to MP, make SP reload strings and menus

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 7f23591f11dbb144709db9dd1d823587e7f8ff40
Author: Razish 
Date:   Wed Dec 6 23:42:20 2017 +1100

[Shared] Add loadhud to MP, make SP reload strings and menus
---
 code/cgame/cg_consolecmds.cpp | 15 +++
 codemp/cgame/cg_consolecmds.c | 13 +
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/code/cgame/cg_consolecmds.cpp b/code/cgame/cg_consolecmds.cpp
index a990b79..d400ab3 100644
--- a/code/cgame/cg_consolecmds.cpp
+++ b/code/cgame/cg_consolecmds.cpp
@@ -27,6 +27,7 @@ along with this program; if not, see 
.
 #include "cg_headers.h"
 
 #include "cg_media.h"  //just for cgs
+#include "ui/ui_shared.h"
 
 void CG_TargetCommand_f( void );
 extern qbooleanplayer_locked;
@@ -196,17 +197,15 @@ void CG_ToggleLAGoggles( void )
}
 }
 
-void CG_LoadHud_f( void )
-{
-   const char *hudSet;
-
-   hudSet = cg_hudFiles.string;
-   if (hudSet[0] == '\0')
-   {
+void CG_LoadHud_f( void ) {
+   const char *hudSet = cg_hudFiles.string;
+   if ( hudSet[0] == '\0' ) {
hudSet = "ui/jahud.txt";
}
 
-   CG_LoadMenus(hudSet);
+   String_Init();
+   Menu_Reset();
+   CG_LoadMenus( hudSet );
 }
 
 typedef struct {
diff --git a/codemp/cgame/cg_consolecmds.c b/codemp/cgame/cg_consolecmds.c
index 2f2c8b2..564da91 100644
--- a/codemp/cgame/cg_consolecmds.c
+++ b/codemp/cgame/cg_consolecmds.c
@@ -27,6 +27,7 @@ along with this program; if not, see 
.
 
 #include "cg_local.h"
 #include "game/bg_saga.h"
+#include "ui/ui_shared.h"
 
 /*
 =
@@ -271,6 +272,17 @@ static void CG_SiegeCompleteCvarUpdate_f(void)
CG_SiegeBriefingDisplay(SIEGETEAM_TEAM2, 1);
 }
 
+static void CG_LoadHud_f( void ) {
+   const char *hudSet = cg_hudFiles.string;
+   if ( hudSet[0] == '\0' ) {
+   hudSet = "ui/jahud.txt";
+   }
+
+   String_Init();
+   Menu_Reset();
+   CG_LoadMenus( hudSet );
+}
+
 typedef struct consoleCommand_s {
const char  *cmd;
void(*func)(void);
@@ -290,6 +302,7 @@ static consoleCommand_t commands[] = {
{ "invnext",CG_NextInventory_f },
{ "invprev",CG_PrevInventory_f },
{ "loaddeferred",   CG_LoadDeferredPlayers 
},
+   { "loadhud",CG_LoadHud_f },
{ "nextframe",  CG_TestModelNextFrame_f 
},
{ "nextskin",   CG_TestModelNextSkin_f 
},
{ "prevframe",  CG_TestModelPrevFrame_f 
},

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

[ioquake3] 03/04: AppArmor: Allow reading EGL vendor configuration

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 78fc10cd6d47306e76f5f033da403ab2bbb83c8b
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 09:50:14 2018 +

AppArmor: Allow reading EGL vendor configuration
---
 debian/apparmor.d/usr.lib.ioquake3.ioquake3 | 2 ++
 debian/changelog| 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/apparmor.d/usr.lib.ioquake3.ioquake3 
b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
index b2705f6..adff6ad 100644
--- a/debian/apparmor.d/usr.lib.ioquake3.ioquake3
+++ b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
@@ -57,6 +57,8 @@
   /sys/devices/pci*/**/uevent r,
   /sys/devices/pci*/**/vendor r,
 
+  # EGL with SDL_VIDEODRIVER=wayland
+  /{etc,usr/share}/glvnd/egl_vendor.d/{,**} r,
 
   profile popup (complain) {
 #include 
diff --git a/debian/changelog b/debian/changelog
index 476ba25..f0e63e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
   * Add reference to #885839 in previous changelog entry
   * Use  from apparmor (>= 2.10.95-5) instead
 of reinventing it
+  * AppArmor: Allow reading EGL vendor configuration
 
  -- Simon McVittie <s...@debian.org>  Thu, 11 Jan 2018 09:48:07 +
 

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

[ioquake3] 04/04: AppArmor: Allow zenity to read from dconf

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 8b02a07d2f2bb54cc7c1adeed60ebacaeee0ed6f
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 09:50:36 2018 +

AppArmor: Allow zenity to read from dconf
---
 debian/apparmor.d/usr.lib.ioquake3.ioquake3 | 1 +
 debian/changelog| 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/apparmor.d/usr.lib.ioquake3.ioquake3 
b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
index adff6ad..52bbfaa 100644
--- a/debian/apparmor.d/usr.lib.ioquake3.ioquake3
+++ b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
@@ -63,6 +63,7 @@
   profile popup (complain) {
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/debian/changelog b/debian/changelog
index f0e63e5..1e87cf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
   * Use  from apparmor (>= 2.10.95-5) instead
 of reinventing it
   * AppArmor: Allow reading EGL vendor configuration
+  * AppArmor: Allow zenity to read from dconf
 
  -- Simon McVittie <s...@debian.org>  Thu, 11 Jan 2018 09:48:07 +
 

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

[ioquake3] 01/04: Add reference to #885839 in previous changelog entry

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 59f1806b7d3f5925ce8ed55016297ec66e867e67
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 09:48:48 2018 +

Add reference to #885839 in previous changelog entry
---
 debian/changelog | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 08ac126..f3a965f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
+ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
+
+  * Add reference to #885839 in previous changelog entry
+
+ -- Simon McVittie <s...@debian.org>  Thu, 11 Jan 2018 09:48:07 +
+
 ioquake3 (1.36+u20180108~dfsg-1) unstable; urgency=medium
 
   [ Pino Toscano ]
-  * Recommend kdialog instead of kdebase-bin
+  * Recommend kdialog instead of kdebase-bin (Closes: #885839)
 
   [ Simon McVittie ]
   * Declare compliance with Debian Policy 4.1.3

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

[ioquake3] branch debian/master updated (6c061a1 -> 8b02a07)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository ioquake3.

  from  6c061a1   1.36+u20180108~dfsg-1
   new  59f1806   Add reference to #885839 in previous changelog entry
   new  3aebbd7   Use  from apparmor (>= 2.10.95-5) 
instead of reinventing it
   new  78fc10c   AppArmor: Allow reading EGL vendor configuration
   new  8b02a07   AppArmor: Allow zenity to read from dconf

The 4 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/apparmor.d/usr.lib.ioquake3.ioquake3 |  9 +
 debian/changelog| 12 +++-
 debian/control  |  1 +
 3 files changed, 17 insertions(+), 5 deletions(-)

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

[ioquake3] 02/04: Use from apparmor (>= 2.10.95-5) instead of reinventing it

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 3aebbd7cd2280fc564e697ca639b2f92a8ff962b
Author: Simon McVittie <s...@debian.org>
Date:   Thu Jan 11 09:49:51 2018 +

Use  from apparmor (>= 2.10.95-5) instead of 
reinventing it
---
 debian/apparmor.d/usr.lib.ioquake3.ioquake3 | 6 ++
 debian/changelog| 2 ++
 debian/control  | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/apparmor.d/usr.lib.ioquake3.ioquake3 
b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
index 51b611d..b2705f6 100644
--- a/debian/apparmor.d/usr.lib.ioquake3.ioquake3
+++ b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
@@ -13,6 +13,7 @@
   #include 
   #include 
   #include 
+  #include 
 
   network inet dgram,
   network inet stream,
@@ -56,14 +57,13 @@
   /sys/devices/pci*/**/uevent r,
   /sys/devices/pci*/**/vendor r,
 
-  # Shared memory buffers used in Wayland
-  owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
 
   profile popup (complain) {
 #include 
 #include 
 #include 
 #include 
+#include 
 
 /etc/X11/app-defaults/Xmessage-color r,
 /usr/bin/kdialog mr,
@@ -73,8 +73,6 @@
 /usr/share/themes/** r,
 /usr/share/zenity/** r,
 owner @{HOME}/.config/gtk-3.0/settings.ini r,
-
-owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
   }
 
   # Site-specific additions and overrides. See local/README for details.
diff --git a/debian/changelog b/debian/changelog
index f3a965f..476ba25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
 
   * Add reference to #885839 in previous changelog entry
+  * Use  from apparmor (>= 2.10.95-5) instead
+of reinventing it
 
  -- Simon McVittie <s...@debian.org>  Thu, 11 Jan 2018 09:48:07 +
 
diff --git a/debian/control b/debian/control
index 3f59625..a5ea91d 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Depends:
 Recommends:
  x11-utils | zenity | kdialog,
 Breaks:
+ apparmor (<< 2.10.95-5~),
  openarena (<< 0.8.8-9~),
 Description: Game engine for 3D first person shooter games
  This package installs a modified version of the ioQuake3 game engine,

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