Merge remote branch 'armin/weekly' into weekly

author: McCabe Maxsted 2010-11-05 18:29:09 -0700
committer: McCabe Maxsted 2010-11-05 18:29:09 -0700
commit: 85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed (patch)
tree: e8e27cd0dc2ebf061c96da0efcfdc2fcd23ab478
parent: Set can_edit_text attribute to true for the radar distance slider, fixed the ... (diff)
parent: fix: don't use untested libraries (diff)
download: meta-impy-85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed.zip
meta-impy-85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed.tar.gz
meta-impy-85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed.tar.bz2
meta-impy-85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed.tar.xz
2 files changed, 10 insertions, 10 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index e0f08b2..41495ca 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1087,7 +1087,7 @@ class Linux_x86_64Manifest(LinuxManifest):
            self.path("libuuid.so", "libuuid.so.1")
            self.path("libSDL-1.2.so.0")
            self.path("libELFIO.so")
-            self.path("libjpeg.so.62")
+            self.path("libjpeg.so.7")
            self.path("libpng12.so.0")
            self.path("libopenjpeg.so.2")
            self.path("libxml2.so.2")
diff --git a/linden/install.xml b/linden/install.xml
index a6a4670..fbb269a 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -794,10 +794,10 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
          </map>
          <key>linux64</key>
          <map>
-            <key>md5sum</key>
+          <key>md5sum</key>
-            <string>8b5f413bdefec7cfe3d9ad2d69986bdc</string>
+            <string>64e7fa98568ef52b3b9d4a18b3515090</string>
            <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/jpeglib-6b-linux64-20101012.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/jpeglib-7-linux64-20091230.tar.bz2</uri>
          </map>
          <key>windows</key>
          <map>
@@ -1048,12 +1048,12 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri>
          </map>
          <key>linux64</key>
-          <map>
+           <map>
-            <key>md5sum</key>
+             <key>md5sum</key>
-            <string>863f7b31556b1d368651f85457f4e46d</string>
+             <string>d5deaf897fe8effa3d3537c875060379</string>
-            <key>url</key>
+             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20101012.1.tar.bz2</uri>
+             <uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20100907.tar.bz2</uri>
-          </map>
+           </map>
          <key>windows</key>
          <map>
            <key>md5sum</key>
author	McCabe Maxsted	2010-11-05 18:29:09 -0700
committer	McCabe Maxsted	2010-11-05 18:29:09 -0700
commit	85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed (patch)
tree	e8e27cd0dc2ebf061c96da0efcfdc2fcd23ab478
parent	Set can_edit_text attribute to true for the radar distance slider, fixed the ... (diff)
parent	fix: don't use untested libraries (diff)
download	meta-impy-85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed.zip meta-impy-85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed.tar.gz meta-impy-85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed.tar.bz2 meta-impy-85f9e62d515fd8b3c44ec665d147fcbdbc69b2ed.tar.xz

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index e0f08b2..41495ca 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py
@@ -1087,7 +1087,7 @@ class Linux_x86_64Manifest(LinuxManifest):
1087	self.path("libuuid.so", "libuuid.so.1")	1087	self.path("libuuid.so", "libuuid.so.1")
1088	self.path("libSDL-1.2.so.0")	1088	self.path("libSDL-1.2.so.0")
1089	self.path("libELFIO.so")	1089	self.path("libELFIO.so")
1090	self.path("libjpeg.so.62")	1090	self.path("libjpeg.so.7")
1091	self.path("libpng12.so.0")	1091	self.path("libpng12.so.0")
1092	self.path("libopenjpeg.so.2")	1092	self.path("libopenjpeg.so.2")
1093	self.path("libxml2.so.2")	1093	self.path("libxml2.so.2")


diff --git a/linden/install.xml b/linden/install.xml index a6a4670..fbb269a 100755 --- a/linden/install.xml +++ b/linden/install.xml
@@ -794,10 +794,10 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
794	</map>	794	</map>
795	<key>linux64</key>	795	<key>linux64</key>
796	<map>	796	<map>
797	<key>md5sum</key>	797	<key>md5sum</key>
798	<string>8b5f413bdefec7cfe3d9ad2d69986bdc</string>	798	<string>64e7fa98568ef52b3b9d4a18b3515090</string>
799	<key>url</key>	799	<key>url</key>
800	<uri>http://imprudenceviewer.org/download/libs/jpeglib-6b-linux64-20101012.tar.bz2</uri>	800	<uri>http://imprudenceviewer.org/download/libs/jpeglib-7-linux64-20091230.tar.bz2</uri>
801	</map>	801	</map>
802	<key>windows</key>	802	<key>windows</key>
803	<map>	803	<map>
@@ -1048,12 +1048,12 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
1048	<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri>	1048	<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri>
1049	</map>	1049	</map>
1050	<key>linux64</key>	1050	<key>linux64</key>
1051	<map>	1051	<map>
1052	<key>md5sum</key>	1052	<key>md5sum</key>
1053	<string>863f7b31556b1d368651f85457f4e46d</string>	1053	<string>d5deaf897fe8effa3d3537c875060379</string>
1054	<key>url</key>	1054	<key>url</key>
1055	<uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20101012.1.tar.bz2</uri>	1055	<uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20100907.tar.bz2</uri>
1056	</map>	1056	</map>
1057	<key>windows</key>	1057	<key>windows</key>
1058	<map>	1058	<map>
1059	<key>md5sum</key>	1059	<key>md5sum</key>