[iortcw] 01/01: d/copyright, d/rules: Update to reflect addition of COPYING.txt to the upstream repository

[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 52c71bcc3a6322c190545a37ee1364415dfa4e0b
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 15 12:06:29 2017 +0100

    d/copyright, d/rules: Update to reflect addition of COPYING.txt to the upstream repository
---
 debian/changelog |  7 +++++++
 debian/copyright |  4 ----
 debian/rules     | 11 ++---------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75fca1e..9116481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+iortcw (1.51+dfsg1-2) UNRELEASED; urgency=medium
+
+  * d/copyright, d/rules: Update to reflect addition of COPYING.txt
+    to the upstream repository
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 15 Jun 2017 12:05:31 +0100
+
 iortcw (1.51+dfsg1-1) unstable; urgency=medium
 
   * Reference CVE-2017-6903 in previous changelog entry
diff --git a/debian/copyright b/debian/copyright
index fe63e0a..3d63a58 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,10 +35,6 @@ Source: https://github.com/iortcw/iortcw/
   Some of the omitted libraries are DFSG-free themselves, but since we need
   to repack the tarball anyway, omitting them too means we don't need to
   comply with as many licenses.
-  .
-  The COPYING.txt files are not currently present in iortcw git.
-  The versions in the orig.tar.gz were taken from the id Software
-  code-drop, as made available by id Software on GitHub.
 
 Files:
  *
diff --git a/debian/rules b/debian/rules
index 4b9406e..02587fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,15 +145,8 @@ get-orig-source:
 		--format=tar \
 		--prefix=${ORIG_SOURCE}-${ORIG_VER}.orig/ \
 		${ORIG_EXPORT} | tar -xf-
-	test -e ${ORIG_SOURCE}-${ORIG_VER}.orig/MP/COPYING.txt || wget -O ${ORIG_SOURCE}-${ORIG_VER}.orig/MP/COPYING.txt https://raw.githubusercontent.com/id-Software/RTCW-MP/master/COPYING.txt
-	test -e ${ORIG_SOURCE}-${ORIG_VER}.orig/SP/COPYING.txt || wget -O ${ORIG_SOURCE}-${ORIG_VER}.orig/SP/COPYING.txt https://raw.githubusercontent.com/id-Software/RTCW-SP/master/COPYING.txt
-	: # if in the Debian checkout, check that they haven't changed
-	if [ -e debian/rtcw.install ]; then \
-		e=0; \
-		diff -u MP/COPYING.txt ${ORIG_SOURCE}-${ORIG_VER}.orig/MP/COPYING.txt || e=$$?; \
-		diff -u SP/COPYING.txt ${ORIG_SOURCE}-${ORIG_VER}.orig/SP/COPYING.txt || e=$$?; \
-		exit $$e; \
-	fi
+	test -e ${ORIG_SOURCE}-${ORIG_VER}.orig/MP/COPYING.txt
+	test -e ${ORIG_SOURCE}-${ORIG_VER}.orig/SP/COPYING.txt
 	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/AL
 	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/SDL2
 	rm -rf ${ORIG_SOURCE}-${ORIG_VER}.orig/*/code/curl-*

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