[game-data-packager] 79/293: Reworked to depend on common ioquake3 engine package

[Simon McVittie]

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

smcv pushed a commit to branch quake
in repository game-data-packager.

commit c8ca8fe10be325ff20fc22ba1f38faf35796f758
Author: Jack Coulter <jscinoz at gmail.com>
Date:   Mon Jun 30 08:20:10 2008 +0000

    Reworked to depend on common ioquake3 engine package
---
 debian/changelog             |  2 +-
 debian/control               | 26 ++++++++++----------------
 debian/quake3-server.install |  2 --
 debian/quake3.install        |  1 -
 debian/rules                 | 17 ++++-------------
 debian/scripts/quake3        |  2 +-
 debian/scripts/quake3-server |  2 +-
 7 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d5e83d..2852622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-quake3 (1.35+svn1400-1) unstable; urgency=low
+quake3 (1.0) unstable; urgency=low
 
   * Initial release (Closes: #487933)
 
diff --git a/debian/control b/debian/control
index 5c3b31b..9e2489b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,21 +9,15 @@ Homepage: http://www.ioquake3.org/
 Standards-Version: 3.8.0
 
 Package: quake3
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, quake3-data, libcurl3
-Description: ioQuake3 with baseq3 specific scripts - Game client
- This package contains the latest SVN build of ioquake3, with a dependency on
- quake3-data, launcher scripts, and menu entries. The user must still provide
- their own legal copy of quake3 to install data from via the use of quake3-data
- .
- This package contains the game client.
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ioquake3, quake3-data
+Description: baseq3 game client specific menu entry and launcher scripts
+ This package contains man pages documenting, and a launcher script to play
+ Quake III Arena with the ioQuake3 engine.
 
 Package: quake3-server
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, quake3-data
-Description: ioQuake3 with baseq3 specific scripts - Dedicated server
- This package contains the latest SVN build of ioquake3, with a dependency on
- quake3-data, launcher scripts, and menu entries. The user must still provide
- their own legal copy of quake3 to install data from via the use of quake3-data
- .
- This package contains the dedicated server.
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ioquake3-server, quake3-data
+Description: baseq3 dedicated server specific launcher scripts
+ This package contains man pages documenting, and a launcher script to run a
+ Quake III Arena dedicated server with the ioQuake3 engine.
diff --git a/debian/quake3-server.install b/debian/quake3-server.install
deleted file mode 100644
index 9fcff57..0000000
--- a/debian/quake3-server.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/scripts/quake3-server usr/games
-ioq3ded usr/lib/games/quake3
diff --git a/debian/quake3.install b/debian/quake3.install
index 4d73ff7..eb244f3 100644
--- a/debian/quake3.install
+++ b/debian/quake3.install
@@ -1,4 +1,3 @@
 debian/quake3.desktop usr/share/applications
 debian/quake3.xpm usr/share/pixmaps
 debian/scripts/quake3 usr/games
-ioquake3 usr/lib/games/quake3
diff --git a/debian/rules b/debian/rules
index 5d3fa90..8e6ac01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,17 +22,12 @@ build: build-arch
 build-arch: build-arch-stamp
 build-arch-stamp:
 	dh_testdir
-	BUILD_GAME_QVM=0 BUILD_GAME_SO=0 $(MAKE) $(BUILD_FLAGS) # so/qvm unneeded
+	# Nothing to do
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f ioquake3 ioq3ded configure-stamp
-	rm -rf build
-	
-	$(MAKE) clean
-	
-	dh_clean
+
 
 install: install-indep install-arch
 
@@ -52,16 +47,12 @@ install-arch: build
 	dh_installdirs -s
 	dh_icons -s
 
-	cp build/release*/ioquake3.* ioquake3
-	cp build/release*/ioq3ded.* ioq3ded
-
-
+	dh_install 
 	dh_desktop -pquake3 debian/quake3.desktop
 	dh_installman -pquake3 debian/quake3.6
-	dh_installchangelogs -pquake3 ChangeLog
 
 	dh_installman -pquake3-server debian/quake3-server.6
-	dh_installchangelogs -pquake3-server ChangeLog
+	dh_install -pquake3-server debian/scripts/quake3-server usr/games
 
 	dh_install -s
 	
diff --git a/debian/scripts/quake3 b/debian/scripts/quake3
index 802ef75..71f9503 100644
--- a/debian/scripts/quake3
+++ b/debian/scripts/quake3
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Adapted from Tremulous and Nexuiz launch scripts
-BINARY=/usr/lib/games/quake3/ioquake3
+BINARY=/usr/lib/games/ioquake3/ioquake3
 BASE_PATH=/usr/share/games/quake3
 QUIET=0
 EXCUSE="\
diff --git a/debian/scripts/quake3-server b/debian/scripts/quake3-server
index 3b63e59..5c5f6c7 100644
--- a/debian/scripts/quake3-server
+++ b/debian/scripts/quake3-server
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Adapted from Tremulous and Nexuiz launch scripts
-BINARY=/usr/lib/games/quake3/ioq3ded
+BINARY=/usr/lib/games/ioquake3/ioq3ded
 BASE_PATH=/usr/share/games/quake3
 QUIET=0
 EXCUSE="\

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