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

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 95f83208c2a4fb7be5ed13c7653da9a6eb04bc49
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Sat Oct 18 10:36:12 2008 +0100

    Update changelog, import joystic patch and drop security patch as it is include upstream, fix icon

diff --git a/debian/changelog b/debian/changelog
index fb0dbc7..64c679a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+omvviewer (1.21.6-1) unstable; urgency=low
+
+  * New Upstream Version
+    + DEV-21775 is now upstream, remove patch
+  * Import OMVV-1 linux joystick support patch
+  * Update standards version
+  * Fix missing icon  
+
+ -- Robin Cornelius <robin.cornelius at gmail.com>  Sat, 18 Oct 2008 10:32:21 +0100
+
 omvviewer (1.21.4-2) unstable; urgency=high
 
   * Security release, actualy version 1.21.5 but upgraded by patch from upstream
diff --git a/debian/patches/linux_joystick.patch b/debian/patches/linux_joystick.patch
new file mode 100644
index 0000000..9db597c
--- /dev/null
+++ b/debian/patches/linux_joystick.patch
@@ -0,0 +1,60 @@
+Index: slviewer/indra/cmake/NDOF.cmake
+===================================================================
+--- slviewer.orig/indra/cmake/NDOF.cmake	2008-09-24 11:43:23.000000000 +0200
++++ slviewer/indra/cmake/NDOF.cmake	2008-09-24 11:44:02.000000000 +0200
+@@ -3,12 +3,12 @@
+ 
+ use_prebuilt_binary(ndofdev)
+ 
+-if (WINDOWS OR DARWIN)
++if (WINDOWS OR DARWIN OR LINUX)
+   add_definitions(-DLIB_NDOF=1)
+-endif (WINDOWS OR DARWIN)
++endif (WINDOWS OR DARWIN OR LINUX)
+ 
+ if (WINDOWS)
+   set(NDOF_LIBRARY libndofdev)
+-elseif (DARWIN)
++elseif (DARWIN OR LINUX)
+   set(NDOF_LIBRARY ndofdev)
+ endif (WINDOWS)
+Index: slviewer/indra/newview/llviewerjoystick.cpp
+===================================================================
+--- slviewer.orig/indra/newview/llviewerjoystick.cpp	2008-09-24 11:44:28.000000000 +0200
++++ slviewer/indra/newview/llviewerjoystick.cpp	2008-09-24 11:48:05.000000000 +0200
+@@ -973,7 +973,7 @@
+ // -----------------------------------------------------------------------------
+ void LLViewerJoystick::setSNDefaults()
+ {
+-#if LL_DARWIN 
++#if LL_DARWIN || LL_LINUX
+ #define kPlatformScale	20.f
+ #else
+ #define kPlatformScale	1.f
+@@ -990,8 +990,8 @@
+ 	gSavedSettings.setS32("JoystickAxis5", 5); // yaw
+ 	gSavedSettings.setS32("JoystickAxis6", -1);
+ 	
+-#if LL_DARWIN
+-	// The SpaceNavigator doesn't act as a 3D cursor on OS X. 
++#if LL_DARWIN || LL_LINUX
++	// The SpaceNavigator doesn't act as a 3D cursor on OS X / Linux.
+ 	gSavedSettings.setBOOL("Cursor3D", false);
+ #else
+ 	gSavedSettings.setBOOL("Cursor3D", true);
+Index: slviewer/install.xml
+===================================================================
+--- slviewer.orig/install.xml	2008-09-24 11:42:25.000000000 +0200
++++ slviewer/install.xml	2008-09-24 11:43:02.000000000 +0200
+@@ -773,9 +773,9 @@
+           <key>linux</key>
+           <map>
+             <key>md5sum</key>
+-            <string>489612b246b2f4b2f239611d786c79de</string>
++            <string>9469c3732a33a154fa0a2807b9f36ccc</string>
+             <key>url</key>
+-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-linux-20080618.tar.bz2</uri>
++			<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-linux-0.2-20080828.tar.bz2</uri>
+           </map>
+           <key>windows</key>
+           <map>
diff --git a/debian/patches/series b/debian/patches/series
index 97639de..07ce8c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+linux_joystick.patch
 remove_as_needed.patch
 glh_linear.patch
 viewericon.patch
@@ -33,4 +34,3 @@ VWR-8751-Build-with-a-shared-llmozlib2.patch
 lltemplatemessagereader_memcpy.patch
 no_old_school_typedefs.patch
 gcc_warning_on_llwindowsdl_var_not_set.patch
-DEV-21775.patch -p0

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