[SCM] advanced 3D real time strategy game engine branch, master, updated. upstream/0.80.5.1-10-gb4b50a2

[Marco Amadori]

The following commit has been merged in the master branch:
commit b4b50a2179040a3b1cb6779664c1582efaa0b21f
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Mon Oct 26 02:32:31 2009 +0100

    Split package in -common.

diff --git a/debian/control b/debian/control
index e2c2b18..b6e4c54 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Homepage: http://springrts.com
 
 Package: spring
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-freefont
+Depends: ${shlibs:Depends}, ${misc:Depends}, spring-common
 Conflicts: spring-engine
 Recommends: springlobby | spring-lobby
 Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic | spring-mod
@@ -48,3 +48,16 @@ Description: advanced 3D real time strategy game engine
  .
  This package just includes the bare engine and the default AI, no maps, mods
  or rich user interface.
+
+Package: spring-common
+Architecture: all
+Depends: ${misc:Depends}, ttf-freefont, spring
+Conflicts: spring-engine
+Recommends: springlobby | spring-lobby
+Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic | spring-mod
+Description: advanced 3D real time strategy game engine
+ Spring is a modern full 3D RTS (Real Time Strategy) game engine originally
+ created to bring the gameplay experience of Total Annihilation in 3D.
+ Games are played using one of a number of mods.
+ .
+ This package just includes the arch independet files.
diff --git a/debian/rules b/debian/rules
index c350c33..f1ef2fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PKGDIR := $(CURDIR)/debian/spring
+BUILDDIR=obj
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DBINDIR=/usr/games -DLIBDIR=/usr/lib/spring -DAI_DATADIR=/usr/lib/spring -DCMAKE_BUILD_TYPE=RELEASE
@@ -13,14 +13,16 @@ override_dh_auto_build:
 	$(MAKE) -C debian/manpages
 
 override_dh_auto_install:
-	dh_auto_install
 	# Configure spring to use ~/.spring as user data directory.
-	mkdir -p $(PKGDIR)/etc/spring
-	echo '$$HOME/.spring' > $(PKGDIR)/etc/spring/datadir
+	mkdir -p $(BUILDDIR)/etc/spring
+	echo '$$HOME/.spring' > $(BUILDDIR)/etc/spring/datadir
 	
 	# remove fonts, provide a symlink instead
-	find $(PKGDIR)/usr/share/games/spring/fonts -type f | xargs -i rm {}
-	ln -s /usr/share/fonts/truetype/freefont/FreeSansBold.ttf $(PKGDIR)/usr/share/games/spring/fonts/FreeSansBold.ttf
+	rm -f $(BUILDDIR)/usr/share/games/spring/fonts
+	mkdir -p $(BUILDDIR)/usr/share/games/spring/fonts
+	ln -s /usr/share/fonts/truetype/freefont/FreeSansBold.ttf $(BUILDDIR)/usr/share/games/spring/fonts
+	
+	dh_auto_install
 
 override_dh_installchangelogs:
 	dh_installchangelogs Documentation/changelog.txt
@@ -30,6 +32,6 @@ override_dh_auto_clean:
 	$(MAKE) -C debian/manpages clean
 
 %:
-	dh --with quilt $@
+	dh --with quilt --builddirectory=$(BUILDDIR) $@
 
 
diff --git a/debian/spring-common.install b/debian/spring-common.install
new file mode 100644
index 0000000..ee72232
--- /dev/null
+++ b/debian/spring-common.install
@@ -0,0 +1,2 @@
+usr/share
+etc
diff --git a/debian/spring.install b/debian/spring.install
new file mode 100644
index 0000000..b7e3e6f
--- /dev/null
+++ b/debian/spring.install
@@ -0,0 +1,2 @@
+usr/games
+usr/lib

-- 
advanced 3D real time strategy game engine