[ioquake3] 01/01: Mark patches as either forwarded or Debian-specific

Simon McVittie smcv at debian.org
Sun Sep 25 14:51:14 UTC 2016 

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

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

commit 7897729d907744e5d42d2733782ccccc37b0d91c
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Sep 25 15:40:36 2016 +0100

    Mark patches as either forwarded or Debian-specific
---
 .../Fix-mis-spellings-of-separating-as-seperating.patch        |  2 ++
 ...troduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch |  2 ++
 ...-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch |  9 +++++++++
 .../Add-a-special-vmMagic-that-causes-equivalent-native-.patch |  0
 .../Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch |  0
 debian/patches/{ => debian}/Let-servers-set-sv_fps-too.patch   |  0
 .../Run-in-a-window-by-default-on-new-installations.patch      |  0
 .../ui-reinstate-minimal-code-to-determine-whether-this-.patch |  0
 debian/patches/series                                          | 10 +++++-----
 9 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch b/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
index 55a5bef..de0e22a 100644
--- a/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
+++ b/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
@@ -3,6 +3,8 @@ Date: Wed, 21 Sep 2016 20:15:01 +0100
 Subject: Fix mis-spellings of "separating" as "seperating"
 
 Found by Debian's Lintian tool.
+
+Forwarded: https://github.com/ioquake/ioq3/pull/223
 ---
  code/botlib/aasfile.h        | 4 ++--
  code/botlib/be_aas_cluster.c | 2 +-
diff --git a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch b/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
index 4335ba1..de75a5f 100644
--- a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
+++ b/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
@@ -6,6 +6,8 @@ This can be used for LDFLAGS that would be inappropriate for shared
 libraries, such as the "-fPIE -pie" used to link position-independent
 executables. PIEs make it more difficult to exploit various classes
 of security vulnerability.
+
+Forwarded: https://github.com/ioquake/ioq3/pull/224
 ---
  Makefile | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
index 7572618..8d28a10 100644
--- a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+++ b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
@@ -7,6 +7,15 @@ code with the same compiler, libraries, etc. should result in the same
 binaries. SOURCE_DATE_EPOCH provides a standard way for build systems
 to fill in the date of the latest source change, typically from a git
 commit or from metadata like the debian/changelog in Debian packages.
+
+This does not change anything if SOURCE_DATE_EPOCH is not defined;
+the intention is that a larger build system like a Debian package
+will define it.
+
+Please see https://reproducible-builds.org/ for more information about
+reproducible builds.
+
+Forwarded: https://github.com/ioquake/ioq3/pull/225
 ---
  Makefile                | 5 +++++
  code/game/g_main.c      | 4 ++--
diff --git a/debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch b/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
similarity index 100%
rename from debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
rename to debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
diff --git a/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch b/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
similarity index 100%
rename from debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
rename to debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
diff --git a/debian/patches/Let-servers-set-sv_fps-too.patch b/debian/patches/debian/Let-servers-set-sv_fps-too.patch
similarity index 100%
rename from debian/patches/Let-servers-set-sv_fps-too.patch
rename to debian/patches/debian/Let-servers-set-sv_fps-too.patch
diff --git a/debian/patches/Run-in-a-window-by-default-on-new-installations.patch b/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
similarity index 100%
rename from debian/patches/Run-in-a-window-by-default-on-new-installations.patch
rename to debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
diff --git a/debian/patches/ui-reinstate-minimal-code-to-determine-whether-this-.patch b/debian/patches/debian/ui-reinstate-minimal-code-to-determine-whether-this-.patch
similarity index 100%
rename from debian/patches/ui-reinstate-minimal-code-to-determine-whether-this-.patch
rename to debian/patches/debian/ui-reinstate-minimal-code-to-determine-whether-this-.patch
diff --git a/debian/patches/series b/debian/patches/series
index b5a608b..c5b7b81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
-Let-servers-set-sv_fps-too.patch
-Run-in-a-window-by-default-on-new-installations.patch
-ui-reinstate-minimal-code-to-determine-whether-this-.patch
 Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
 Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
 Fix-mis-spellings-of-separating-as-seperating.patch
+debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
+debian/Let-servers-set-sv_fps-too.patch
+debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+debian/Run-in-a-window-by-default-on-new-installations.patch
+debian/ui-reinstate-minimal-code-to-determine-whether-this-.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git

More information about the Pkg-games-commits mailing list