[SCM] [contrib] Quake III: Arena launcher branch, master, updated. debian/1.0-7-g99d3326

[Simon McVittie]

The following commit has been merged in the master branch:
commit 98b90005baff89544fc582de627d7f242add6185
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Nov 11 01:23:00 2010 +0000

    Turn need-data.txt into README.quake3-data

diff --git a/Makefile b/Makefile
index 3656a7b..f930a84 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@ ALL = \
 	build/quake3-server \
 	build/quake3.png \
 	build/quake3.xpm \
-	build/quake332.xpm \
-	build/quake3-server.README.Debian
+	build/quake332.xpm
 
 all: $(ALL)
 
@@ -36,8 +35,5 @@ build/quake3.xpm: build/quake3.png
 build/quake332.xpm: build/quake3.png
 	convert -resize 32x32 $< $@
 
-build/quake3-server.README.Debian: need-data.txt
-	install -m644 $< $@
-
 clean:
 	rm -rf build
diff --git a/need-data.txt b/README.quake3-data
similarity index 100%
rename from need-data.txt
rename to README.quake3-data
diff --git a/debian/quake3-server.install b/debian/quake3-server.install
index 8938c5d..d1852dd 100644
--- a/debian/quake3-server.install
+++ b/debian/quake3-server.install
@@ -1,3 +1,3 @@
 server.cfg etc/quake3-server
 build/quake3-server usr/games
-build/quake3-server.README.Debian usr/share/doc/quake3-server
+README.quake3-data usr/share/doc/quake3-server
diff --git a/debian/quake3.install b/debian/quake3.install
index a2bba73..cb54544 100644
--- a/debian/quake3.install
+++ b/debian/quake3.install
@@ -4,4 +4,4 @@ build/quake3.xpm usr/share/pixmaps
 build/quake332.xpm usr/share/pixmaps
 build/quake3 usr/games
 need-data.sh usr/share/games/quake3
-need-data.txt usr/share/games/quake3
+README.quake3-data usr/share/games/quake3
diff --git a/debian/quake3.links b/debian/quake3.links
new file mode 100644
index 0000000..aea4993
--- /dev/null
+++ b/debian/quake3.links
@@ -0,0 +1 @@
+usr/share/games/quake3/README.quake3-data usr/share/doc/quake3/README.quake3-data
diff --git a/quake3.in b/quake3.in
index a409d57..7912e8c 100644
--- a/quake3.in
+++ b/quake3.in
@@ -56,9 +56,9 @@ for i in 0 1 2 3 4 5 6 7 8; do
     :
   else
     if test "$IOQ3ROLE" = client; then
-      $BASEPATH/need-data.sh $BASEPATH/need-data.txt
+      $BASEPATH/need-data.sh $BASEPATH/README.quake3-data
     else
-      echo "Quake III Arena data missing, see /usr/share/doc/quake3-server/README.Debian"
+      echo "Quake III Arena data missing, see /usr/share/doc/quake3-server/README.quake3-data"
     fi
     exit 72     # EX_OSFILE
   fi

-- 
[contrib] Quake III: Arena launcher