ooo-build r14985 - in trunk: . bin

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jan  1 14:42:02 2009
New Revision: 14985
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14985&view=rev

Log:
        * bin/ooinstall: remove gid moving here for langpacks as its obsolete
          (solenv-installer-lang-filelist-names.diff fixes it)



Modified:
   trunk/ChangeLog
   trunk/bin/ooinstall

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Thu Jan  1 14:42:02 2009
@@ -156,23 +156,6 @@
 	"-buildid $BUILD $destdir $strip " .
 	"-simple $path") && die "Failed to install: $!";
 
-# hack. fix up stuff created by the install to stuff we expect.
-# FIXME properly...
-foreach my $i (split(/,/, $langs)) {
-	$i =~ s/'//g;
-	if ("$i" ne "en-US") {
-		my $j = $i;
-		$j =~ s/-/_/g;
-		print "Moving gid_Module_Root_$j.$i to gid_Module_Root.$i\n";
-		rename("$setup_vars{OODESTDIR}/gid_Module_Root_$j.$i",
-			"$setup_vars{OODESTDIR}/gid_Module_Root.$i");
-		rename("$setup_vars{OODESTDIR}/gid_Module_Langpack_Resource_$j.$i",
-			"$setup_vars{OODESTDIR}/gid_Module_Langpack_Resource.$i");
-		rename("$setup_vars{OODESTDIR}/gid_Module_Langpack_Help_$j.$i",
-			"$setup_vars{OODESTDIR}/gid_Module_Langpack_Help.$i");
-	}
-}
-
 if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' || $setup_vars{'VENDORNAME'} eq 'Frugalware' ) && $configure_vars{BUILD_TYPE} =~ m/ODK/) {
     print "Running SDK installer\n";
     system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " .