r7591 - in packages/trunk/quake3/debian: . scripts

[Jack Coulter]

Author: jscinoz-guest
Date: 2008-06-30 08:20:10 +0000 (Mon, 30 Jun 2008)
New Revision: 7591

Removed:
   packages/trunk/quake3/debian/quake3-server.install
Modified:
   packages/trunk/quake3/debian/changelog
   packages/trunk/quake3/debian/control
   packages/trunk/quake3/debian/quake3.install
   packages/trunk/quake3/debian/rules
   packages/trunk/quake3/debian/scripts/quake3
   packages/trunk/quake3/debian/scripts/quake3-server
Log:
Reworked to depend on common ioquake3 engine package

Modified: packages/trunk/quake3/debian/changelog
===================================================================
--- packages/trunk/quake3/debian/changelog	2008-06-30 05:12:20 UTC (rev 7590)
+++ packages/trunk/quake3/debian/changelog	2008-06-30 08:20:10 UTC (rev 7591)
@@ -1,4 +1,4 @@
-quake3 (1.35+svn1400-1) unstable; urgency=low
+quake3 (1.0) unstable; urgency=low
 
   * Initial release (Closes: #487933)
 

Modified: packages/trunk/quake3/debian/control
===================================================================
--- packages/trunk/quake3/debian/control	2008-06-30 05:12:20 UTC (rev 7590)
+++ packages/trunk/quake3/debian/control	2008-06-30 08:20:10 UTC (rev 7591)
@@ -9,21 +9,15 @@
 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.

Deleted: packages/trunk/quake3/debian/quake3-server.install
===================================================================
--- packages/trunk/quake3/debian/quake3-server.install	2008-06-30 05:12:20 UTC (rev 7590)
+++ packages/trunk/quake3/debian/quake3-server.install	2008-06-30 08:20:10 UTC (rev 7591)
@@ -1,2 +0,0 @@
-debian/scripts/quake3-server usr/games
-ioq3ded usr/lib/games/quake3

Modified: packages/trunk/quake3/debian/quake3.install
===================================================================
--- packages/trunk/quake3/debian/quake3.install	2008-06-30 05:12:20 UTC (rev 7590)
+++ packages/trunk/quake3/debian/quake3.install	2008-06-30 08:20:10 UTC (rev 7591)
@@ -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

Modified: packages/trunk/quake3/debian/rules
===================================================================
--- packages/trunk/quake3/debian/rules	2008-06-30 05:12:20 UTC (rev 7590)
+++ packages/trunk/quake3/debian/rules	2008-06-30 08:20:10 UTC (rev 7591)
@@ -22,18 +22,13 @@
 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 @@
 	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
 	

Modified: packages/trunk/quake3/debian/scripts/quake3
===================================================================
--- packages/trunk/quake3/debian/scripts/quake3	2008-06-30 05:12:20 UTC (rev 7590)
+++ packages/trunk/quake3/debian/scripts/quake3	2008-06-30 08:20:10 UTC (rev 7591)
@@ -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="\

Modified: packages/trunk/quake3/debian/scripts/quake3-server
===================================================================
--- packages/trunk/quake3/debian/scripts/quake3-server	2008-06-30 05:12:20 UTC (rev 7590)
+++ packages/trunk/quake3/debian/scripts/quake3-server	2008-06-30 08:20:10 UTC (rev 7591)
@@ -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="\