incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1167537 - in /incubator/ooo/trunk/main: setup_native/source/packinfo/packinfo_office_lang.txt solenv/bin/modules/installer/epmfile.pm
Date Sat, 10 Sep 2011 15:23:10 GMT
Author: erack
Date: Sat Sep 10 15:23:10 2011
New Revision: 1167537

URL: http://svn.apache.org/viewvc?rev=1167537&view=rev
Log:
native373: ##164464# improve debian support

# User Ingo Schmidt <is@openoffice.org>

Modified:
    incubator/ooo/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt
    incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm

Modified: incubator/ooo/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt?rev=1167537&r1=1167536&r2=1167537&view=diff
==============================================================================
--- incubator/ooo/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt (original)
+++ incubator/ooo/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt Sat Sep
10 15:23:10 2011
@@ -21,7 +21,7 @@ module = "gid_Module_Langpack_Basis"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -37,7 +37,7 @@ module = "gid_Module_Langpack_Fonts"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-fonts"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-fonts"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -53,7 +53,7 @@ module = "gid_Module_Langpack_Resource"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -69,7 +69,7 @@ module = "gid_Module_Langpack_Help"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -85,7 +85,7 @@ module = "gid_Module_Langpack_Writer"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -101,7 +101,7 @@ module = "gid_Module_Langpack_Calc"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -117,7 +117,7 @@ module = "gid_Module_Langpack_Impress"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -133,7 +133,7 @@ module = "gid_Module_Langpack_Draw"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -149,7 +149,7 @@ module = "gid_Module_Langpack_Math"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -165,7 +165,7 @@ module = "gid_Module_Langpack_Base"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -181,7 +181,7 @@ module = "gid_Module_Langpack_Binfilter"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-binfilter"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-binfilter"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
@@ -197,7 +197,7 @@ module = "gid_Module_Langpack_Onlineupda
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
 packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-onlineupd"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
+provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-onlineupd"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"

Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm?rev=1167537&r1=1167536&r2=1167537&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm Sat Sep 10 15:23:10 2011
@@ -546,6 +546,7 @@ sub create_epm_header
 				$onereplaces =~ s/\s*$//;
 				installer::packagelist::resolve_packagevariables(\$onereplaces, $variableshashref, 1);
 				if ( $installer::globals::linuxlinkrpmprocess ) { $onereplaces = $onereplaces . "u";
}
+				if ( $installer::globals::debian ) { $onereplaces =~ s/_/-/g; } # Debian allows no underline
in package name
 				$line = "%replaces" . " " . $onereplaces . "\n";
 				push(@epmheader, $line);
 
@@ -619,6 +620,7 @@ sub create_epm_header
 			$oneprovides =~ s/\s*$//;
 			installer::packagelist::resolve_packagevariables(\$oneprovides, $variableshashref, 1);
 			if ( $installer::globals::linuxlinkrpmprocess ) { $oneprovides = $oneprovides . "u"; }
+			if ( $installer::globals::debian ) { $oneprovides =~ s/_/-/g; } # Debian allows no underline
in package name
 			$line = "%provides" . " " . $oneprovides . "\n";
 			push(@epmheader, $line);
 		}
@@ -648,6 +650,7 @@ sub create_epm_header
 			my $onerequires = ${$allrequires}[$i];
 			$onerequires =~ s/\s*$//;
 			installer::packagelist::resolve_packagevariables2(\$onerequires, $variableshashref, 0,
$isdict);
+			if ( $installer::globals::debian ) { $onerequires =~ s/_/-/g; } # Debian allows no underline
in package name
 			
 			# Special handling for Solaris. In depend files, the names of the packages are required,
not 
 			# only the abbreviation. Therefore there is a special syntax for names in packagelist:
@@ -682,6 +685,7 @@ sub create_epm_header
 				my $onerequires = ${$allrequires}[$i];
 				$onerequires =~ s/\s*$//;
 				installer::packagelist::resolve_packagevariables(\$onerequires, $variableshashref, 0);
+				if ( $installer::globals::debian ) { $onerequires =~ s/_/-/g; } # Debian allows no underline
in package name
 
 				# Special handling for Solaris. In depend files, the names of the packages are required,
not 
 				# only the abbreviation. Therefore there is a special syntax for names in packagelist:



Mime
View raw message