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

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 7eacf35bfd40599b4ddba375d8549235c7b2b672
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Tue Jul 8 12:33:18 2008 +0100

    Fix some lintain warnings over binary location and rogue execute permissions

diff --git a/debian/omvviewer.desktop b/debian/omvviewer.desktop
index fbcf613..d3e4c61 100644
--- a/debian/omvviewer.desktop
+++ b/debian/omvviewer.desktop
@@ -6,5 +6,5 @@ Exec=omvviewer
 Icon=viewericon
 Terminal=false
 Type=Application
-Categories=Games;Simulation;
+Categories=Game;Simulation;
 StartupNotify=true
diff --git a/debian/omvviewer.dirs b/debian/omvviewer.dirs
index a59ccc8..8f6335f 100644
--- a/debian/omvviewer.dirs
+++ b/debian/omvviewer.dirs
@@ -1,3 +1,4 @@
-usr/bin
+usr/games
 usr/share/applications
 usr/share/pixmaps
+
diff --git a/debian/omvviewer.install b/debian/omvviewer.install
index 600932d..361d24d 100644
--- a/debian/omvviewer.install
+++ b/debian/omvviewer.install
@@ -1,5 +1,4 @@
-indra/newview/omvviewer usr/bin/
+indra/newview/omvviewer usr/games/
 indra/newview/res/viewericon.xpm usr/share/pixmaps/
 debian/omvviewer.desktop usr/share/applications/
 
-
diff --git a/debian/omvviewer.menu b/debian/omvviewer.menu
index a3ea875..34e1d98 100644
--- a/debian/omvviewer.menu
+++ b/debian/omvviewer.menu
@@ -1,3 +1,3 @@
-?package(slviewer):needs="x11" section="Games/Simulation"\
-  title="Open Metaverse Viewer" command="/usr/bin/omvviewer" \
+?package(omvviewer):needs="x11" section="Games/Simulation"\
+  title="Open Metaverse Viewer" command="/usr/games/omvviewer" \
   icon="/usr/share/pixmaps/viewericon.xpm"
diff --git a/debian/rules b/debian/rules
index 68d5fe7..888285c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,10 @@ install-indep:
 	dh_testdir
 	dh_testroot
 	dh_clean -k -i 
+	
+	#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
 	dh_installdirs -i
 	dh_install -i -Xindra/app_settings/windlight/clouds2.tga
 

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