[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.15-68-g3c8b31e

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 3c8b31efedafc5d4f22ec6f96890266f182e0bff
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Tue Sep 2 20:42:09 2008 +0100

    Import new build system rules

diff --git a/debian/control b/debian/control
index 326e394..a7d3332 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: games
 Priority: extra
 Maintainer: Secondlife Debian Team <secondlife-debian-maintainers at slupdate.byteme.org.uk>
 Uploaders: Robin Cornelius <robin.cornelius at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch (>= 2), scons, libcairo2-dev, libglib2.0-dev, libgtk2.0-dev, libsdl1.2-dev, libvorbis-dev, libopenjpeg-dev, libjpeg62-dev, libpng12-dev, flex, bison, libcurl4-openssl-dev | libcurl3-openssl-dev, libssl-dev, libexpat1-dev, libaprutil1-dev, libapr1-dev, zlib1g-dev, libxmlrpc-epi-dev, libgl1-mesa-dev ( >= 7 ) | libgl-dev, libboost-dev, libboost-regex-dev,libboost-signals-dev ,libboost-program-options-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libc-ares-dev , libllmozlib2-dev  (>= 0.0.1), libopenal-dev, libalut-dev, libapr1-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), cmake, libcairo2-dev, libglib2.0-dev, libgtk2.0-dev, libsdl1.2-dev, libvorbis-dev, libopenjpeg-dev, libjpeg62-dev, libpng12-dev, flex, bison, libcurl4-openssl-dev | libcurl3-openssl-dev, libssl-dev, libexpat1-dev, libaprutil1-dev, libapr1-dev, zlib1g-dev, libxmlrpc-epi-dev, libgl1-mesa-dev ( >= 7 ) | libgl-dev, libboost-dev, libboost-regex-dev,libboost-signals-dev ,libboost-program-options-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libc-ares-dev , libllmozlib2-dev  (>= 0.0.1), libopenal-dev, libalut-dev, libapr1-dev
 Standards-Version: 3.7.3
 XS-Vcs-Svn: svn://slupdate.byteme.org.uk/slviewer/slviewer/trunk
 XS-Vcs-Browser: http://slupdate.byteme.org.uk/
 
 Package: omvviewer
 Architecture: i386 amd64 powerpc
-Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-data  (= ${source:Version}), omvviewer-artwork  (>= 1.20.14), ttf-kochi-mincho, ttf-dejavu, libc-ares1
+Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-data  (= ${source:Version}), omvviewer-artwork  (>= 1.21.0), ttf-kochi-mincho, ttf-dejavu, libc-ares1
 Recommends: libgstreamer0.10-0, libgstreamer-plugins-base0.10-0
 Replaces: slviewer
 Description: Open Metaverse Viewer
diff --git a/debian/rules b/debian/rules
index 53a59b4..e341837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,12 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/quilt/quilt.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export VERBOSE=1
+
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -23,7 +27,15 @@ build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp: patch
-	scons -C indra BUILD=$(BUILDTYPE) ARCH=$(SLVIEWER_ARCH) BTARGET=client DISTCC=no MOZLIB=yes ELFIO=no FMOD=no STANDALONE=yes
+	cd indra && cmake -DUNATTENDED:BOOl=FALSE -DSTANDALONE:BOOL=TRUE \
+	-DCMAKE_BUILD_TYPE:STRING=RELWITHDEBINFO -DSERVER:BOOL=FALSE \
+	-DVIEWER:BOOL=TRUE -DMOZLIB:BOOL=true -DINSTALL:BOOL=TRUE \
+	-DAPP_SHARE_DIR:STRING=/usr/share/omvviewer/ \
+	-DAPP_BINARY_DIR:STRING=/usr/games/ \
+	-DCMAKE_INSTALL_PREFIX:STRING=debian/ \
+	-DBINARY_NAME:STRING=omvviewer \
+	-DOPENAL:BOOL=TRUE
+	cd indra && make
 	touch $@
 
 build-indep: build-indep-stamp
@@ -36,10 +48,8 @@ realclean:
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp
 	
-	scons -C indra BUILD=$(BUILDTYPE) ARCH=$(SLVIEWER_ARCH) BTARGET=client DISTCC=no MOZLIB=yes ELFIO=no FMOD=no STANDALONE=yes -c
-	rm -f indra/.sconsign.dblite 
-	rm -f indra/lib/python/indra/*.pyc indra/lib/python/indra/ipc/*.pyc
-	
+	cd indra && make clean
+
 	dh_clean indra/newview/omvviewer indra/newview/omvviewer-globalsyms
 
 install: install-indep install-arch
@@ -48,11 +58,7 @@ install-indep:
 	dh_testroot
 	dh_clean -k -i 
 	dh_installdirs -i
-	dh_install -i -Xindra/newview/app_settings/windlight/clouds2.tga
-	#upstream has a nasty habit of leaving shaders with +x
-	chmod -x debian/omvviewer-data/usr/share/omvviewer/app_settings/shaders -R
-	chmod +X debian/omvviewer-data/usr/share/omvviewer/app_settings/shaders -R
-	rm -f debian/omvviewer-data/usr/share/omvviewer/app_settings/windlight/clouds2.tga
+	dh_install -i	
 
 install-arch:
 	dh_testdir
@@ -95,21 +101,6 @@ binary-arch: build-arch install-arch
 
 binary: binary-arch binary-indep
 
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-# You can do more things with dpatch, like having patches only applied on
-# a special architecture - see the non-dh version of the sample for this!
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	dpatch cat-all >patch-stamp
-	touch patch-stamp
-	chmod -x debian/patches/*.dpatch
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-	chmod -x debian/patches/*.dpatch
-
 # indra/newview/res/resource.h is a Visual C++-generated file of tokens used in indra/newview/res/newViewRes.rc
 headeraudit: indra
 	@find indra \( -name *.cpp -or -name *.h -and -not -wholename indra/newview/res/resource.h -or -name *.inl -or -name *.mm \) -exec debian/headeraudit.pl {} +

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids