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

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 9d423c298ce22d5503d6c3210f03dda6e42f1f7d
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Tue Sep 2 23:47:40 2008 +0100

    Add in llmozlib2 shared patch and fix build system to build in a temp directory and fix clean rule too

diff --git a/debian/patches/VWR-8751-Build-with-a-shared-llmozlib2.patch b/debian/patches/VWR-8751-Build-with-a-shared-llmozlib2.patch
new file mode 100644
index 0000000..d2373f4
--- /dev/null
+++ b/debian/patches/VWR-8751-Build-with-a-shared-llmozlib2.patch
@@ -0,0 +1,16 @@
+--- ./indra/cmake/Mozlib.cmake	2008-08-04 17:52:50.000000000 +0100
++++ ./indra/cmake/Mozlib.cmake	2008-08-30 15:03:07.000000000 +0100
+@@ -18,13 +18,6 @@
+         link_directories(${CMAKE_SOURCE_DIR}/newview/app_settings/mozilla-runtime-linux-${ARCH})
+         set(MOZLIB_LIBRARIES
+             llmozlib2
+-            mozjs
+-            nspr4
+-            plc4
+-            plds4
+-            xpcom
+-            xul
+-            profdirserviceprovider_s
+             )
+     elseif (WINDOWS)
+         if (MSVC71)
diff --git a/debian/patches/series b/debian/patches/series
index d7d57b5..5cc667b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,7 +23,7 @@ VWR-1815_top_corner_fix.diff
 VWR-5697_fix_startup_paths.diff
 VWR-8194_clamp_outline_for_broken_nvidia.diff
 openal_1.21.0.diff
-
 VWR-5082_set_bulk_inv_permissions.diff
 use_c_locale_and_dont_spam_me_because_i_am_not_american.patch
 dont_depend_on_artwork_to_build.patch
+VWR-8751-Build-with-a-shared-llmozlib2.patch
diff --git a/debian/rules b/debian/rules
index baa1a87..9775c34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,9 @@ build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp: patch
-	cd indra && cmake -DUNATTENDED:BOOl=FALSE -DSTANDALONE:BOOL=TRUE \
+	 - mkdir indra/build
+	 cd indra/build && \
+	 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/ \
@@ -35,8 +37,8 @@ build-arch-stamp: patch
 	-DCMAKE_INSTALL_PREFIX:STRING=debian/ \
 	-DBINARY_NAME:STRING=omvviewer \
 	-DOPENAL:BOOL=TRUE \
-	builddir
-	cd indra && make
+	..
+	cd indra/build && make
 	touch $@
 
 build-indep: build-indep-stamp
@@ -48,7 +50,7 @@ realclean:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp
-	#[ ! -f  indra/Makefile ] || cd indra && make clean
+	- rm -f -r indra/build	
 	dh_clean
 
 install: install-indep install-arch

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