[iortcw] 07/08: Fix FTBFS when .git/index doesn't exist

[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 45932d740490e0172d7a8b88774fad3e4a7db954
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Nov 20 22:27:54 2016 +0000

    Fix FTBFS when .git/index doesn't exist
---
 debian/changelog                                   |  2 +
 .../Don-t-require-.git-index-to-exist.patch        | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0ddf304..ce16575 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ iortcw (1.50a+dfsg1-1) UNRELEASED; urgency=medium
     sort in the intended order
     - drop patches that were merged upstream
     - debian/copyright: update
+  * d/p/Don-t-require-.git-index-to-exist.patch: Fix FTBFS when
+    .git/index doesn't exist
 
  -- Simon McVittie <smcv at debian.org>  Sun, 20 Nov 2016 18:15:45 +0000
 
diff --git a/debian/patches/Don-t-require-.git-index-to-exist.patch b/debian/patches/Don-t-require-.git-index-to-exist.patch
new file mode 100644
index 0000000..f199031
--- /dev/null
+++ b/debian/patches/Don-t-require-.git-index-to-exist.patch
@@ -0,0 +1,43 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sun, 20 Nov 2016 22:26:30 +0000
+Subject: Don't require .git/index to exist
+
+This is normally conditional on ../.git existing, but that check was
+(mistakenly?) removed when releasing v1.5a.
+---
+ MP/Makefile | 2 ++
+ SP/Makefile | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/MP/Makefile b/MP/Makefile
+index 6bb0174..eba717c 100644
+--- a/MP/Makefile
++++ b/MP/Makefile
+@@ -2692,9 +2692,11 @@ $(B)/ded/%.o: $(NDIR)/%.c
+ 	$(DO_DED_CC)
+ 
+ # Extra dependencies to ensure the git version is incorporated
++ifeq ($(USE_GIT),1)
+   $(B)/client/cl_console.o : ../.git/index
+   $(B)/client/common.o : ../.git/index
+   $(B)/ded/common.o : ../.git/index
++endif
+ 
+ 
+ #############################################################################
+diff --git a/SP/Makefile b/SP/Makefile
+index fd2a6ea..2e5b739 100644
+--- a/SP/Makefile
++++ b/SP/Makefile
+@@ -2658,9 +2658,11 @@ $(B)/ded/%.o: $(NDIR)/%.c
+ 	$(DO_DED_CC)
+ 
+ # Extra dependencies to ensure the git version is incorporated
++ifeq ($(USE_GIT),1)
+   $(B)/client/cl_console.o : ../.git/index
+   $(B)/client/common.o : ../.git/index
+   $(B)/ded/common.o : ../.git/index
++endif
+ 
+ 
+ #############################################################################
diff --git a/debian/patches/series b/debian/patches/series
index 68767f6..02ee5e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+Don-t-require-.git-index-to-exist.patch
 debian/Disable-client-side-auto-download-by-default.patch
 debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
 debian/Remove-support-for-downloading-executable-updates.patch

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