[yquake2] 04/05: Refresh patches

Simon McVittie smcv at debian.org
Sun Dec 10 21:16:22 UTC 2017


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

smcv pushed a commit to annotated tag debian/7.10+ctf1.05_dfsg-1
in repository yquake2.

commit 345074ba5fcdcd6de6f126aec81475b261264db4
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Dec 10 20:01:16 2017 +0000

    Refresh patches
---
 debian/changelog                                                    | 1 +
 .../Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch      | 6 +++---
 debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch            | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 585e0e8..c2d1d17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ yquake2 (7.10+ctf1.05~dfsg-1) UNRELEASED; urgency=medium
 
   * Standards-Version: 4.1.2 (no changes required)
   * New upstream release
+    - Refresh patches
 
  -- Simon McVittie <smcv at debian.org>  Fri, 08 Dec 2017 11:31:32 +0000
 
diff --git a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
index 9586832..94c194d 100644
--- a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
+++ b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
@@ -12,10 +12,10 @@ but yquake2 doesn't.
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index bd4b81a..efc4a1c 100755
+index a34985f..d189648 100755
 --- a/Makefile
 +++ b/Makefile
-@@ -155,12 +155,13 @@ endif
+@@ -164,12 +164,13 @@ endif
  #
  # -MMD to generate header dependencies. (They cannot be
  #  generated if building universal binaries on OSX)
@@ -31,7 +31,7 @@ index bd4b81a..efc4a1c 100755
  		  -Wall -pipe -g -ggdb -MMD -fwrapv
  endif
  
-@@ -237,15 +238,15 @@ GLAD_INCLUDE = -Isrc/client/refresh/gl3/glad/include
+@@ -263,15 +264,15 @@ GLAD_INCLUDE = -Isrc/client/refresh/gl3/glad/include
  
  # Base LDFLAGS.
  ifeq ($(YQ2_OSTYPE),Linux)
diff --git a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
index 00b1448..40c6f49 100644
--- a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
+++ b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
@@ -8,10 +8,10 @@ Forwarded: no, Debian-specific
  1 file changed, 21 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index efc4a1c..6f30434 100755
+index d189648..f441716 100755
 --- a/Makefile
 +++ b/Makefile
-@@ -457,27 +457,6 @@ ifneq ($(YQ2_OSTYPE), Darwin)
+@@ -483,27 +483,6 @@ ifneq ($(YQ2_OSTYPE), Darwin)
  release/ref_gl1.so : LDFLAGS += -lGL
  endif
  

-- 
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