[SCM] Git repository for pkg-virtuoso branch, master, updated. upstream/6.0.1.cvs20091210+dfsg2-200-gb385a07

[Obey Arthur Liu]

The following commit has been merged in the master branch:
commit 98c4bcbbd0d8547804eddfaff2a453172113a11e
Author: Obey Arthur Liu <arthur at milliways.fr>
Date:   Sun Jul 11 11:17:20 2010 -0700

    Include back parts of OAT now with proper licensing.

diff --git a/debian/copyright b/debian/copyright
index b3698b1..020e51f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1353,6 +1353,53 @@ Additional copyrights:
        License along with the GNU C Library; see the file COPYING.LIB.  If
        not, write to the Free Software Foundation, Inc.,
        51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+    
+    
+    OpenLayers Map Viewer Library
+    
+       Copyright 2005-2008 MetaCarta, Inc., released under the Clear BSD license.
+       Please see http://svn.openlayers.org/trunk/openlayers/license.txt
+       for the full text of the license.
+       
+       Includes compressed code under the following licenses:
+       
+       (For uncompressed versions of the code used please see the
+       OpenLayers SVN repository: <http://openlayers.org/>)
+       
+       
+       Contains portions of Prototype.js:
+       
+       Prototype JavaScript framework, version 1.4.0
+        (c) 2005 Sam Stephenson <sam at conio.net>
+       
+        Prototype is freely distributable under the terms of an MIT-style license.
+        For details, see the Prototype web site: http://prototype.conio.net/
+       
+       
+       Contains portions of Rico <http://openrico.org/>
+       
+       Copyright 2005 Sabre Airline Solutions
+       
+       Licensed under the Apache License, Version 2.0 (the "License"); you
+       may not use this file except in compliance with the License. You
+       may obtain a copy of the License at
+       
+              http://www.apache.org/licenses/LICENSE-2.0
+       
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+
+    MD5 and SHA routines, Johnston
+
+       MD5 and SHA routines, along with their supplemental sub-routines are
+       Copyright (C) Paul Johnston 1999 - 2002.
+       Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+       Distributed under the BSD License
+
 
 The Debian packaging is:
 
diff --git a/debian/patches/repack-oat.patch b/debian/patches/repack-oat.patch
index dbe3534..51639d3 100644
--- a/debian/patches/repack-oat.patch
+++ b/debian/patches/repack-oat.patch
@@ -1,103 +1,7 @@
 Description: Fix OAT related code after repacking
  Fix a few usages of OAT after partial removal through repacking.
 Author: Obey Arthur Liu <arthur at milliways.fr>
-Last-Update: 2010-03-22
---- /dev/null
-+++ b/binsrc/oat/toolkit/crypto.js
-@@ -0,0 +1,93 @@
-+/*
-+	OAT.Crypto.base64e(input)
-+	OAT.Crypto.base64d(input)
-+*/
-+
-+OAT.Crypto = {
-+	base64e:function(input) {
-+		var keyStr = "ABCDEFGHIJKLMNOP" +
-+                "QRSTUVWXYZabcdef" +
-+                "ghijklmnopqrstuv" +
-+                "wxyz0123456789+/" +
-+                "=";
-+		var output = "";
-+		var chr1, chr2, chr3 = "";
-+		var enc1, enc2, enc3, enc4 = "";
-+		var i = 0;
-+		
-+		if (!input.length) { return output; }
-+
-+		do {
-+			chr1 = input.charCodeAt(i++);
-+			chr2 = input.charCodeAt(i++);
-+			chr3 = input.charCodeAt(i++);
-+
-+			enc1 = chr1 >> 2;
-+			enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-+			enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-+			enc4 = chr3 & 63;
-+
-+			if (isNaN(chr2)) {
-+				enc3 = enc4 = 64;
-+			} else if (isNaN(chr3)) {
-+				enc4 = 64;
-+			}
-+
-+			output = output + 
-+			keyStr.charAt(enc1) + 
-+			keyStr.charAt(enc2) + 
-+			keyStr.charAt(enc3) + 
-+			keyStr.charAt(enc4);
-+			chr1 = chr2 = chr3 = "";
-+			enc1 = enc2 = enc3 = enc4 = "";
-+		} while (i < input.length);
-+		return output;
-+	},
-+	
-+	base64d:function(input) {
-+		if (!input) { return ""; }
-+		var keyStr = "ABCDEFGHIJKLMNOP" +
-+                "QRSTUVWXYZabcdef" +
-+                "ghijklmnopqrstuv" +
-+                "wxyz0123456789+/" +
-+                "=";
-+		var output = "";
-+		var chr1, chr2, chr3 = "";
-+		var enc1, enc2, enc3, enc4 = "";
-+		var i = 0;
-+
-+		// remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-+		var base64test = /[^A-Za-z0-9\+\/\=]/g;
-+		if (base64test.exec(input)) {
-+			alert("There were invalid base64 characters in the input text.\n" +
-+			"Valid base64 characters are A-Z, a-z, 0-9, '+', '/', and '='\n" +
-+			"Expect errors in decoding.");
-+		}
-+		input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-+
-+		if (!input.length) { return output; }
-+
-+		do {
-+			enc1 = keyStr.indexOf(input.charAt(i++));
-+			enc2 = keyStr.indexOf(input.charAt(i++));
-+			enc3 = keyStr.indexOf(input.charAt(i++));
-+			enc4 = keyStr.indexOf(input.charAt(i++));
-+
-+			chr1 = (enc1 << 2) | (enc2 >> 4);
-+			chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-+			chr3 = ((enc3 & 3) << 6) | enc4;
-+
-+			output = output + String.fromCharCode(chr1);
-+
-+			if (enc3 != 64) { output = output + String.fromCharCode(chr2); }
-+			if (enc4 != 64) { output = output + String.fromCharCode(chr3); }
-+
-+			chr1 = chr2 = chr3 = "";
-+			enc1 = enc2 = enc3 = enc4 = "";
-+
-+		} while (i < input.length);
-+
-+		return output;
-+	}
-+}
-+OAT.Loader.featureLoaded("crypto");
+Last-Update: 2010-07-11
 --- a/binsrc/oat/toolkit/loader.js
 +++ b/binsrc/oat/toolkit/loader.js
 @@ -1617,7 +1617,6 @@

-- 
Git repository for pkg-virtuoso