[game-data-packager] 80/293: Clean up of all the stuff from when it included engine

[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 aad2ce3e30746420215e3c47e85b4f19ada7c961
Author: Jack Coulter <jscinoz at gmail.com>
Date:   Mon Jun 30 09:00:08 2008 +0000

    Clean up of all the stuff from when it included engine
---
 debian/control |  6 +++---
 debian/rules   | 52 +++++++++++++---------------------------------------
 2 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/debian/control b/debian/control
index 9e2489b..2db5675 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: quake3
 Section: contrib/games
 Priority: optional
 Maintainer: Jack Coulter <jscinoz at gmail.com>
-Build-Depends: debhelper (>= 5.0.51~), libopenal-dev, libsdl1.2-dev
+Build-Depends: debhelper (>= 5.0.51~)
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/quake3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/quake3/?op=log
 Homepage: http://www.ioquake3.org/
@@ -10,14 +10,14 @@ Standards-Version: 3.8.0
 
 Package: quake3
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ioquake3, quake3-data
+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: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ioquake3-server, quake3-data
+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/rules b/debian/rules
index 8e6ac01..4c78b5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,63 +9,34 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-build: build-arch
-build-arch: build-arch-stamp
-build-arch-stamp:
-	dh_testdir
+build:
 	# Nothing to do
 
 clean:
 	dh_testdir
 	dh_testroot
+	dh_clean
+	rm -rf tmp.*
 
-
-install: install-indep install-arch
-
-
+install: install-indep
 install-indep:
 	dh_testdir
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
-	dh_install -i
 	dh_icons -i
-
-install-arch: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-	dh_icons -s
-
-	dh_install 
+	
 	dh_desktop -pquake3 debian/quake3.desktop
 	dh_installman -pquake3 debian/quake3.6
 
 	dh_installman -pquake3-server debian/quake3-server.6
 	dh_install -pquake3-server debian/scripts/quake3-server usr/games
 
-	dh_install -s
+	dh_install -i
+
 	
 # Build architecture-independent files here.
 binary-indep: install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture-dependent files here.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-# Build architecture-dependent files here.
-binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installdocs
@@ -75,11 +46,14 @@ binary-common:
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+	
+# Build architecture dependant packages using the common target.
+binary-arch:
+	# Nothing to do
 
 
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+binary: binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep

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