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

[Robin Cornelius]

The following commit has been merged in the master branch:
commit e43a14cbd24d252aadf74718b7ab6aa3de46215d
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Mon Nov 17 12:25:56 2008 +0000

    Update gconf-defaults with correct paths, enable nvidia header patch

diff --git a/debian/omvviewer.gconf-defaults b/debian/omvviewer.gconf-defaults
index 8d1a69e..1d36aa4 100644
--- a/debian/omvviewer.gconf-defaults
+++ b/debian/omvviewer.gconf-defaults
@@ -1 +1,3 @@
-desktop/gnome/url-handlers/secondlife/command omvviewer -url %s
+desktop/gnome/url-handlers/secondlife/command /usr/games/omvviewer -url %s
+desktop/gnome/url-handlers/secondlife/enabled true
+
diff --git a/debian/patches/series b/debian/patches/series
index e865b35..a07d027 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 #linux_joystick.patch
+VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.patch
 Allow-CXXFLAGS-to-specify-the-debug-flag.patch
 remove_as_needed.patch
 glh_linear.patch
diff --git a/debian/rules b/debian/rules
index 84ef597..671fb10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,12 @@
 
 include /usr/share/quilt/quilt.make
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Always use verbose incase we have an autobuild fail and need to check a log
 export VERBOSE=1
 
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-
 # Process DEB_BUILD_OPTIONS.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   	# Strip existing -O* parameters. 
@@ -73,8 +70,6 @@ realclean:
 	- rm -f -r indra/build	
 	dh_clean indra/lib/python/indra/*.pyc indra/lib/python/indra/ipc/*.pyc
 
-
-
 install: install-indep install-arch
 install-indep:
 	dh_testdir

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