Merge lp:~deeack/ubuntu/maverick/mumble/fix-for-713693 into lp:ubuntu/maverick/mumble

[Ryan Short]

Updated the mumble-overlay shell script to find the correct location of libmumble.so.1.

The script now checks to see if the full paths /usr/lib32/mumble and /usr/lib64/mumble exist instead of just /usr/lib32 and /usr/lib64 which was causing problems further on in the script when it assumed that because those folders existed that's where the file was located.

[Ryan Short (deeack)]

Re-uploaded after noticed a stupid typo on my part!

[Micah Gersten (micahg)]

I'm sorry, but I don't see the benefit of this change. It is less lines of code, but it seems to accomplish the same goal.

review: Needs Information

[Ryan Short (deeack)]

My apologies I guess I need to explain what it does a little better, the problem is actually further down in the script.

If you try and run "mumble-overlay glxgears" you'll get an error message saying "Could not find 32-bit/64-bit libmumble.so.1". The reason for that is the Ubuntu install places the file under /usr/lib/mumble.

What's currently happening pre-patch is the script checks to see if the /usr/lib32 and /usr/lib64 directories exist and if they do it creates a variable to store their location in, then after it's created the variable it checks to see if the mumble subdirectory exists and updates the variable.

The problem is the variable gets created because further down in the script, it checks if those directories don't exist "if [ -z "$libdir_32" -o -z "$libdir_64" ]; then" and if they don't it uses the correct location of /usr/lib/mumble/libmumble.so.1 for the remainder of the script.

I did think about removing the references to /usr/lib32 and /usr/lib64 completely but it seemed to make more sense to me to leave them in just in case somebody wanted to have both 32 and 64 bit versions at hand.

Hope this clarifies the situation, here's a screen shot of it working as intended: http://i.imgur.com/wVqIA.png

Unmerged revisions

16. By Ryan Short on 2011-02-05

mumble-overlay: Updated script to find libmumble.so.1 (LP: #713693)

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-19 19:10:04 +0000
+++ debian/changelog	2011-02-05 21:47:56 +0000
@@ -1,3 +1,9 @@
+mumble (1.2.1-3ubuntu1) maverick; urgency=low
+
+  * mumble-overlay: Updated script to find libmumble.so.1 (LP: #713693)
+
+ -- Ryan Short <[e-mail]>  Sat, 05 Feb 2011 21:34:56 +0000
+
 mumble (1.2.1-3) unstable; urgency=low
 
   [ Thorvald Natvig ]

=== modified file 'scripts/mumble-overlay'
--- scripts/mumble-overlay	2009-03-22 16:21:58 +0000
+++ scripts/mumble-overlay	2011-02-05 21:47:56 +0000
@@ -5,18 +5,15 @@
 	exit 1
 fi
 
-if [ -d /usr/lib64 ]; then
-  libdir_64=/usr/lib64
-  if [ -d "$libdir_64/mumble" ]; then
-    libdir_64="$libdir_64/mumble";
-  fi
-fi
-if [ -d /usr/lib32 ]; then
-  libdir_32=/usr/lib32
-  if [ -d "$libdir_32/mumble" ]; then
-    libdir_32="$libdir_32/mumble";
-  fi
-fi
+
+if [ -d /usr/lib64/mumble ]; then
+  libdir_64="/usr/lib64/mumble";
+fi
+
+if [ -d /usr/lib32/mumble ]; then
+  libdir_32="/usr/lib32/mumble";
+fi
+
 if [ -z "$libdir_32" -o -z "$libdir_64" ]; then
   tlibdir=/usr/lib
   if [ -d "$tlibdir/mumble" ]; then