From 7869a17f76e23ced8f49e3ae13b653278e3de4b9 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 26 Aug 2010 15:31:57 -0700
Subject: VWR-20946 : use fixed linux bundle for kdu

---
 install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.xml b/install.xml
index 3a9dc5f6d1..a47a732d56 100644
--- a/install.xml
+++ b/install.xml
@@ -797,9 +797,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>b379063f5f03374f85620e87ce48e497</string>
+            <string>b1f15bbabb68445e55ce23a2aeaca598</string>
             <key>url</key>
-            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/indra_private-2.1.1-linux-20100820.tar.bz2</uri>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/indra_private-2.1.1-linux-20100826.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
-- 
cgit v1.2.3


From 63053aad8fc15a63bbd35c38de7bdc103b7fb4ab Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 26 Aug 2010 20:30:10 -0700
Subject: VWR-20946 : fix the viewer manifest script to take the new kdu lib
 name into account

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e963bcc9f7..4058933d9f 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -930,7 +930,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libopenal.so", "libopenal.so.1")
             self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
             try:
-                    self.path("libkdu_v42R.so", "libkdu.so")
+                    self.path("libkdu.so")
                     pass
             except:
                     print "Skipping libkdu_v42R.so - not found"
-- 
cgit v1.2.3


From 9d880615d1c8fee01b2528693466d48e816620db Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 26 Aug 2010 20:37:54 -0700
Subject: VWR-20946 : fix erroneous error message (broken window...)

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 4058933d9f..08ba8c13b1 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -933,7 +933,7 @@ class Linux_i686Manifest(LinuxManifest):
                     self.path("libkdu.so")
                     pass
             except:
-                    print "Skipping libkdu_v42R.so - not found"
+                    print "Skipping libkdu.so - not found"
                     pass
             try:
                     self.path("libfmod-3.75.so")
-- 
cgit v1.2.3