[yquake2] 04/05: Remove debian/patches/000*, applied upstream
Fabian Greffrath
fabian at moszumanska.debian.org
Mon Nov 2 09:56:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
fabian pushed a commit to branch master
in repository yquake2.
commit e29173bec8243e8bab3c3bb40108524bbe377dfa
Author: Fabian Greffrath <fabian at debian.org>
Date: Mon Nov 2 10:43:07 2015 +0100
Remove debian/patches/000*, applied upstream
---
debian/changelog | 1 +
debian/patches/0001-Fix-crosshair_scale.patch | 101 ---------------------
...DE-override-the-default-basedir-instead-o.patch | 91 -------------------
...ename-SCR_GetScale-to-SCR_GetDefaultScale.patch | 58 ------------
debian/patches/series | 3 -
5 files changed, 1 insertion(+), 253 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f6df053..22ea909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
yquake2 (5.32~dfsg1-1) UNRELEASED; urgency=medium
* Imported Upstream version 5.32
+ * Remove debian/patches/000*, applied upstream.
-- Fabian Greffrath <fabian at debian.org> Mon, 02 Nov 2015 10:40:08 +0100
diff --git a/debian/patches/0001-Fix-crosshair_scale.patch b/debian/patches/0001-Fix-crosshair_scale.patch
deleted file mode 100644
index 8d7b392..0000000
--- a/debian/patches/0001-Fix-crosshair_scale.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Yamagi Burmeister <yamagi at yamagi.org>
-Date: Mon, 14 Sep 2015 19:05:08 +0200
-Subject: Fix crosshair_scale
-
-The crosshair_scale cvar was broken a long time ago at Icculus Q2 or
-even back at it. The fix is easy... This is part of issue #87.
-
-Origin: upstream, 5.32, commit:f2e53e657b4275343d0d03a94799539e9bcb9723
----
- src/client/cl_screen.c | 58 +++++++++++++++++++++++---------------------------
- 1 file changed, 27 insertions(+), 31 deletions(-)
-
-diff --git a/src/client/cl_screen.c b/src/client/cl_screen.c
-index 5acf9e0..9f541b1 100644
---- a/src/client/cl_screen.c
-+++ b/src/client/cl_screen.c
-@@ -1550,9 +1550,29 @@ SCR_UpdateScreen(void)
- GLimp_EndFrame();
- }
-
-+float
-+SCR_GetScale(void)
-+{
-+ int i = viddef.width / 640;
-+ int j = viddef.height / 240;
-+
-+ if (i > j)
-+ {
-+ i = j;
-+ }
-+ if (i < 1)
-+ {
-+ i = 1;
-+ }
-+
-+ return i;
-+}
-+
- void
- SCR_DrawCrosshair(void)
- {
-+ float scale;
-+
- if (!crosshair->value)
- {
- return;
-@@ -1564,47 +1584,23 @@ SCR_DrawCrosshair(void)
- SCR_TouchPics();
- }
-
-- if (crosshair_scale->modified)
-- {
-- crosshair_scale->modified = false;
--
-- if (crosshair_scale->value > 5)
-- {
-- Cvar_SetValue("crosshair_scale", 5);
-- }
--
-- else if (crosshair_scale->value < 0.25)
-- {
-- Cvar_SetValue("crosshair_scale", 0.25);
-- }
-- }
--
- if (!crosshair_pic[0])
- {
- return;
- }
-
-- Draw_Pic(scr_vrect.x + ((scr_vrect.width - crosshair_width) >> 1),
-- scr_vrect.y + ((scr_vrect.height - crosshair_height) >> 1),
-- crosshair_pic);
--}
--
--float
--SCR_GetScale(void)
--{
-- int i = viddef.width / 640;
-- int j = viddef.height / 240;
--
-- if (i > j)
-+ if (crosshair_scale->value < 0)
- {
-- i = j;
-+ scale = SCR_GetScale();
- }
-- if (i < 1)
-+ else
- {
-- i = 1;
-+ scale = crosshair_scale->value;
- }
-
-- return i;
-+ Draw_PicScaled(scr_vrect.x + ((scr_vrect.width - crosshair_width) >> 1),
-+ scr_vrect.y + ((scr_vrect.height - crosshair_height) >> 1),
-+ crosshair_pic, scale);
- }
-
- float
diff --git a/debian/patches/0001-If-SYSTEMWIDE-override-the-default-basedir-instead-o.patch b/debian/patches/0001-If-SYSTEMWIDE-override-the-default-basedir-instead-o.patch
deleted file mode 100644
index 87ee3e9..0000000
--- a/debian/patches/0001-If-SYSTEMWIDE-override-the-default-basedir-instead-o.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Wed, 30 Sep 2015 09:28:08 +0100
-Subject: If SYSTEMWIDE, override the default basedir instead of adding a path
-
-This makes it behave a little more like -basedir in Quake 1 and
-fs_basepath in ioquake3.
-
-This lets "+set basedir" take precedence over the SYSTEMDIR,
-which is useful if you have the demo and full-game data installed
-in different base directories to be able to test the demo for
-regressions.
-
-Forwarded: https://github.com/yquake2/yquake2/issues/90#issuecomment-144327088
----
- src/common/filesystem.c | 37 ++++++++-----------------------------
- 1 file changed, 8 insertions(+), 29 deletions(-)
-
---- a/src/common/filesystem.c
-+++ b/src/common/filesystem.c
-@@ -40,7 +40,7 @@
-
- #ifdef SYSTEMWIDE
- #ifndef SYSTEMDIR
-- #define SYSTEMDIR "/usr/share/games/quake2/"
-+ #define SYSTEMDIR "/usr/share/games/quake2"
- #endif
- #endif
-
-@@ -1381,25 +1381,6 @@ FS_AddHomeAsGameDirectory(char *dir)
- FS_AddGameDirectory(gdir);
- }
-
--#ifdef SYSTEMWIDE
--void
--FS_AddSystemwideGameDirectory(char *dir)
--{
-- char gdir[MAX_OSPATH];
-- char *datadir = SYSTEMDIR;
-- int len = snprintf(gdir, sizeof(gdir), "%s/%s/", datadir, dir);
--
-- printf("Using %s to fetch paks\n", gdir);
--
-- if ((len > 0) && (len < sizeof(gdir)) && (gdir[len - 1] == '/'))
-- {
-- gdir[len - 1] = 0;
-- }
--
-- FS_AddGameDirectory(gdir);
--}
--#endif
--
- void FS_AddBinaryDirAsGameDirectory(const char* dir)
- {
- char gdir[MAX_OSPATH];
-@@ -1690,10 +1671,6 @@ FS_SetGamedir(char *dir)
- FS_AddGameDirectory(va("%s/%s", fs_cddir->string, dir));
- }
-
--#ifdef SYSTEMWIDE
-- FS_AddSystemwideGameDirectory(dir);
--#endif
--
- FS_AddGameDirectory(va("%s/%s", fs_basedir->string, dir));
- FS_AddBinaryDirAsGameDirectory(dir);
- FS_AddHomeAsGameDirectory(dir);
-@@ -2081,7 +2058,13 @@ FS_InitFilesystem(void)
- Cmd_AddCommand("dir", FS_Dir_f);
-
- /* basedir <path> Allows the game to run from outside the data tree. */
-- fs_basedir = Cvar_Get("basedir", ".", CVAR_NOSET);
-+ fs_basedir = Cvar_Get("basedir",
-+#ifdef SYSTEMWIDE
-+ SYSTEMDIR,
-+#else
-+ ".",
-+#endif
-+ CVAR_NOSET);
-
- /* cddir <path> Logically concatenates the cddir after the basedir to
- allow the game to run from outside the data tree. */
-@@ -2101,10 +2084,6 @@ FS_InitFilesystem(void)
- /* Current directory. */
- fs_homepath = Cvar_Get("homepath", Sys_GetCurrentDirectory(), CVAR_NOSET);
-
--#ifdef SYSTEMWIDE
-- FS_AddSystemwideGameDirectory(BASEDIRNAME);
--#endif
--
- /* Add baseq2 to search path. */
- FS_AddGameDirectory(va("%s/" BASEDIRNAME, fs_basedir->string));
- FS_AddBinaryDirAsGameDirectory(BASEDIRNAME);
diff --git a/debian/patches/0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch b/debian/patches/0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch
deleted file mode 100644
index 5e42506..0000000
--- a/debian/patches/0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Yamagi Burmeister <yamagi at yamagi.org>
-Date: Mon, 14 Sep 2015 19:23:11 +0200
-Subject: Rename SCR_GetScale() to SCR_GetDefaultScale()
-
-Origin: upstream, 5.32, commit:eba4ce95d4088c436920a5be85cbd48fa39a33cf
----
- src/client/cl_screen.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/client/cl_screen.c b/src/client/cl_screen.c
-index 9f541b1..8100a74 100644
---- a/src/client/cl_screen.c
-+++ b/src/client/cl_screen.c
-@@ -1551,7 +1551,7 @@ SCR_UpdateScreen(void)
- }
-
- float
--SCR_GetScale(void)
-+SCR_GetDefaultScale(void)
- {
- int i = viddef.width / 640;
- int j = viddef.height / 240;
-@@ -1591,7 +1591,7 @@ SCR_DrawCrosshair(void)
-
- if (crosshair_scale->value < 0)
- {
-- scale = SCR_GetScale();
-+ scale = SCR_GetDefaultScale();
- }
- else
- {
-@@ -1610,7 +1610,7 @@ SCR_GetHUDScale(void)
-
- if (gl_hudscale->value < 0)
- {
-- scale = SCR_GetScale();
-+ scale = SCR_GetDefaultScale();
- }
- else
- {
-@@ -1627,7 +1627,7 @@ SCR_GetConsoleScale(void)
-
- if (gl_consolescale->value < 0)
- {
-- scale = SCR_GetScale();
-+ scale = SCR_GetDefaultScale();
- }
- else
- {
-@@ -1644,7 +1644,7 @@ SCR_GetMenuScale(void)
-
- if (gl_menuscale->value < 0)
- {
-- scale = SCR_GetScale();
-+ scale = SCR_GetDefaultScale();
- }
- else
- {
diff --git a/debian/patches/series b/debian/patches/series
index bfe3e5a..77479c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
-0001-Fix-crosshair_scale.patch
-0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch
Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
Remove-unwanted-rpaths-from-LDFLAGS.patch
Fix-spelling-errors-detected-by-lintian.patch
Optionally-link-libopenal-at-compile-time.patch
Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch
-0001-If-SYSTEMWIDE-override-the-default-basedir-instead-o.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git
More information about the Pkg-games-commits
mailing list