[yquake2] 02/02: Split rpath-avoidance into a separate patch

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository yquake2.

commit 60ac3a8d3218d3bbd1cfb7a00040f1f6df652594
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Sep 30 08:25:38 2015 +0100

    Split rpath-avoidance into a separate patch
---
 debian/changelog                                   |  1 +
 ...-LD-FLAGS-instead-of-overriding-them-to-o.patch | 32 ++---------------
 .../Remove-unwanted-rpaths-from-LDFLAGS.patch      | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d682981..4f1d5a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ yquake2 (5.31~dfsg1-2) UNRELEASED; urgency=medium
 
   * Move patches from upstream to the beginning of the patch series,
     and add DEP-3 metadata
+  * Split rpath-avoidance into a separate patch
 
  -- Simon McVittie <smcv at debian.org>  Wed, 30 Sep 2015 08:21:33 +0100
 
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 45b6514..58e8e3d 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
@@ -11,6 +11,8 @@ but yquake2 doesn't.
  Makefile | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
+diff --git a/Makefile b/Makefile
+index 580da76..cfd936a 100755
 --- a/Makefile
 +++ b/Makefile
 @@ -153,13 +153,14 @@ endif
@@ -42,33 +44,3 @@ but yquake2 doesn't.
  else ifeq ($(OSTYPE),OpenBSD)
  LDFLAGS := -L/usr/local/lib -lm
  else ifeq ($(OSTYPE),Windows)
-@@ -425,23 +426,23 @@ release/quake2 : LDFLAGS += -lGL
- endif
- 
- ifeq ($(OSTYPE), FreeBSD)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
- else ifeq ($(OSTYPE), Linux)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
- endif
- 
- ifeq ($(WITH_SYSTEMWIDE),yes)
- ifneq ($(WITH_SYSTEMDIR),"")
- ifeq ($(OSTYPE), FreeBSD)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
- else ifeq ($(OSTYPE), Linux)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
- endif
- else
- ifeq ($(OSTYPE), FreeBSD)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
- else ifeq ($(OSTYPE), Linux)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
- endif
- endif
- endif
diff --git a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
new file mode 100644
index 0000000..8d6789b
--- /dev/null
+++ b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
@@ -0,0 +1,42 @@
+From: Fabian Greffrath <fabian at debian.org>
+Date: Tue, 29 Sep 2015 10:57:38 +0100
+Subject: Remove unwanted rpaths from LDFLAGS
+
+---
+ Makefile | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index cfd936a..b0855d1 100755
+--- a/Makefile
++++ b/Makefile
+@@ -426,23 +426,23 @@ release/quake2 : LDFLAGS += -lGL
+ endif
+ 
+ ifeq ($(OSTYPE), FreeBSD)
+-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
+ else ifeq ($(OSTYPE), Linux)
+-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
+ endif
+ 
+ ifeq ($(WITH_SYSTEMWIDE),yes)
+ ifneq ($(WITH_SYSTEMDIR),"")
+ ifeq ($(OSTYPE), FreeBSD)
+-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
+ else ifeq ($(OSTYPE), Linux)
+-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
+ endif
+ else
+ ifeq ($(OSTYPE), FreeBSD)
+-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
+ else ifeq ($(OSTYPE), Linux)
+-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
+ endif
+ endif
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index ef3474b..56b1671 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 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

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