ooo-build r11275 - in trunk: . patches/src680

From: mrl svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r11275 - in trunk: . patches/src680
Date: Tue, 15 Jan 2008 19:00:01 +0000 (GMT)
Author: mrl
Date: Tue Jan 15 19:00:00 2008
New Revision: 11275
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11275&view=rev

Log:
2008-01-15  Marcelo Ricardo Leitner  <mrl mandriva com>

	* patches/src680/ooqstart.desktop-exec.diff: fixes ooqstart.desktop
	Exec line as Mandriva doesn't ship a link named openoffice.
	* patches/src680/angola.diff: adds Angola currency. FIXME: probably
	done in the worst way.
	* patches/src680/wizards-path.diff: Fix DictOOo.swx and FontOOo.swx
	paths, as Mandriva doesn't ship them inside share/dict/ooo dir.

	* patches/src680/apply: apply the above patches under section
	MandrivaOnly for now, as they should be revised. Also, adds sections
	CairoFonts, CalcSolver, Split and NotDebian to MandrivaBase group.
	Still, remove default-system-fpicker patch from section MandrivaOnly,
	as it is already applied.


Added:
   trunk/patches/src680/angola.diff
   trunk/patches/src680/ooqstart.desktop-exec.diff
   trunk/patches/src680/wizards-path.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Added: trunk/patches/src680/angola.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/angola.diff	Tue Jan 15 19:00:00 2008
@@ -0,0 +1,542 @@
+--- i18npool/source/localedata/data/pt_AO.xml.angola	2007-10-18 14:33:49.000000000 -0200
++++ i18npool/source/localedata/data/pt_AO.xml	2007-10-18 14:33:08.000000000 -0200
+@@ -0,0 +1,373 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE Locale SYSTEM 'locale.dtd'>
++<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
++<LC_INFO>
++<Language>
++<LangID>pt</LangID>
++<DefaultName>Portuguese</DefaultName>
++</Language>
++<Country>
++<CountryID>AO</CountryID>
++<DefaultName>Angola</DefaultName>
++</Country>
++</LC_INFO>
++<LC_CTYPE unoid="generic">
++<Separators>
++<DateSeparator>-</DateSeparator>
++<ThousandSeparator>.</ThousandSeparator>
++<DecimalSeparator>,</DecimalSeparator>
++<TimeSeparator>:</TimeSeparator>
++<Time100SecSeparator>,</Time100SecSeparator>
++<ListSeparator>;</ListSeparator>
++<LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
++<LongDateDaySeparator> de </LongDateDaySeparator>
++<LongDateMonthSeparator> de </LongDateMonthSeparator>
++<LongDateYearSeparator> </LongDateYearSeparator>
++</Separators>
++<Markers>
++<QuotationStart>â</QuotationStart>
++<QuotationEnd>â</QuotationEnd>
++<DoubleQuotationStart>â</DoubleQuotationStart>
++<DoubleQuotationEnd>â</DoubleQuotationEnd>
++</Markers>
++<TimeAM>AM</TimeAM>
++<TimePM>PM</TimePM>
++<MeasurementSystem>Metric</MeasurementSystem>
++</LC_CTYPE>
++<LC_FORMAT>
++<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
++<FormatCode>DD-MM-AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
++<FormatCode>NN DD-MMM AA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
++<FormatCode>MM-AA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
++<FormatCode>DD-MMM</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
++<FormatCode>MMMM</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
++<FormatCode>QQ AA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
++<FormatCode>DD-MM-AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
++<FormatCode>DD-MM-AA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
++<FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
++<FormatCode>D "de" MMM "de" AA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
++<FormatCode>D "de" MMM "de" AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
++<FormatCode>D "de" MMMM "de" AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
++<FormatCode>NN, D "de" MMM "de" AA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
++<FormatCode>NN, D "de" MMMM "de" AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
++<FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
++<FormatCode>D. MMM. AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
++<FormatCode>D. MMMM AAAA</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
++<FormatCode>MM-DD</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
++<FormatCode>AA-MM-DD</FormatCode>
++<DefaultName>ISO 8601 (EN 28601)</DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
++<FormatCode>AAAA-MM-DD</FormatCode>
++<DefaultName>ISO 8601 (EN 28601)</DefaultName>
++</FormatElement>
++<FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
++<FormatCode>WW</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME"  formatindex="39">
++<FormatCode>HH:MM</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME"  formatindex="40">
++<FormatCode>HH:MM:SS</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME"  formatindex="41">
++<FormatCode>HH:MM AM/PM</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME"  formatindex="42">
++<FormatCode>HH:MM:SS AM/PM</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
++<FormatCode>[HH]:MM:SS</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
++<FormatCode>MM:SS,00</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
++<FormatCode>[HH]:MM:SS,00</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
++<FormatCode>DD-MM-AA HH:MM</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
++<FormatCode>DD-MM-AAAA HH:MM:SS</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
++<FormatCode>Estandar</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
++<FormatCode>0</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
++<FormatCode>0,00</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
++<FormatCode>#.##0</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
++<FormatCode>#.##0,00</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
++<FormatCode>#.###,00</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
++<FormatCode>#.##0 [$Kz-816];-#.##0 [$Kz-816]</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
++<FormatCode>#.##0,00 [$Kz-816];-#.##0,00 [$Kz-816]</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
++<FormatCode>#.##0 [$Kz-816];[RED]-#.##0 [$Kz-816]</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
++<FormatCode>#.##0,00 [$Kz-816];[RED]-#.##0,00 [$Kz-816]</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
++<FormatCode>#.##0,00 CCC</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
++<FormatCode>#.##0,-- [$Kz-816];[RED]-#.##0,-- [$Kz-816]</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
++<FormatCode>0%</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
++<FormatCode>0,00%</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
++<FormatCode>0,00E+000</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
++<FormatCode>0,00E+00</FormatCode>
++<DefaultName></DefaultName>
++</FormatElement>
++</LC_FORMAT>
++<LC_COLLATION ref="en_US"/>
++<LC_SEARCH ref="en_US"/>
++<LC_INDEX ref="en_US"/>
++<LC_CALENDAR>
++<Calendar unoid="gregorian" default="true">
++<DaysOfWeek>
++<Day>
++<DayID>sun</DayID>
++<DefaultAbbrvName>Dom</DefaultAbbrvName>
++<DefaultFullName>Domingo</DefaultFullName>
++</Day>
++<Day>
++<DayID>mon</DayID>
++<DefaultAbbrvName>Seg</DefaultAbbrvName>
++<DefaultFullName>Segunda-feira</DefaultFullName>
++</Day>
++<Day>
++<DayID>tue</DayID>
++<DefaultAbbrvName>Ter</DefaultAbbrvName>
++<DefaultFullName>TerÃa-feira</DefaultFullName>
++</Day>
++<Day>
++<DayID>wed</DayID>
++<DefaultAbbrvName>Qua</DefaultAbbrvName>
++<DefaultFullName>Quarta-feira</DefaultFullName>
++</Day>
++<Day>
++<DayID>thu</DayID>
++<DefaultAbbrvName>Qui</DefaultAbbrvName>
++<DefaultFullName>Quinta-feira</DefaultFullName>
++</Day>
++<Day>
++<DayID>fri</DayID>
++<DefaultAbbrvName>Sex</DefaultAbbrvName>
++<DefaultFullName>Sexta-feira</DefaultFullName>
++</Day>
++<Day>
++<DayID>sat</DayID>
++<DefaultAbbrvName>SÃb</DefaultAbbrvName>
++<DefaultFullName>SÃbado</DefaultFullName>
++</Day>
++</DaysOfWeek>
++<MonthsOfYear>
++<Month>
++<MonthID>jan</MonthID>
++<DefaultAbbrvName>Jan</DefaultAbbrvName>
++<DefaultFullName>Janeiro</DefaultFullName>
++</Month>
++<Month>
++<MonthID>feb</MonthID>
++<DefaultAbbrvName>Fev</DefaultAbbrvName>
++<DefaultFullName>Fevereiro</DefaultFullName>
++</Month>
++<Month>
++<MonthID>mar</MonthID>
++<DefaultAbbrvName>Mar</DefaultAbbrvName>
++<DefaultFullName>MarÃo</DefaultFullName>
++</Month>
++<Month>
++<MonthID>apr</MonthID>
++<DefaultAbbrvName>Abr</DefaultAbbrvName>
++<DefaultFullName>Abril</DefaultFullName>
++</Month>
++<Month>
++<MonthID>may</MonthID>
++<DefaultAbbrvName>Mai</DefaultAbbrvName>
++<DefaultFullName>Maio</DefaultFullName>
++</Month>
++<Month>
++<MonthID>jun</MonthID>
++<DefaultAbbrvName>Jun</DefaultAbbrvName>
++<DefaultFullName>Junho</DefaultFullName>
++</Month>
++<Month>
++<MonthID>jul</MonthID>
++<DefaultAbbrvName>Jul</DefaultAbbrvName>
++<DefaultFullName>Julho</DefaultFullName>
++</Month>
++<Month>
++<MonthID>aug</MonthID>
++<DefaultAbbrvName>Ago</DefaultAbbrvName>
++<DefaultFullName>Agosto</DefaultFullName>
++</Month>
++<Month>
++<MonthID>sep</MonthID>
++<DefaultAbbrvName>Set</DefaultAbbrvName>
++<DefaultFullName>Setembro</DefaultFullName>
++</Month>
++<Month>
++<MonthID>oct</MonthID>
++<DefaultAbbrvName>Out</DefaultAbbrvName>
++<DefaultFullName>Outubro</DefaultFullName>
++</Month>
++<Month>
++<MonthID>nov</MonthID>
++<DefaultAbbrvName>Nov</DefaultAbbrvName>
++<DefaultFullName>Novembro</DefaultFullName>
++</Month>
++<Month>
++<MonthID>dec</MonthID>
++<DefaultAbbrvName>Dez</DefaultAbbrvName>
++<DefaultFullName>Dezembro</DefaultFullName>
++</Month>
++</MonthsOfYear>
++<Eras>
++<Era>
++<EraID>bc</EraID>
++<DefaultAbbrvName>BC</DefaultAbbrvName>
++<DefaultFullName>BC</DefaultFullName>
++</Era>
++<Era>
++<EraID>ad</EraID>
++<DefaultAbbrvName>AD</DefaultAbbrvName>
++<DefaultFullName>AD</DefaultFullName>
++</Era>
++</Eras>
++<StartDayOfWeek>
++<DayID>mon</DayID>
++</StartDayOfWeek>
++<MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
++</Calendar>
++</LC_CALENDAR>
++<LC_CURRENCY>
++<Currency default="true" usedInCompatibleFormatCodes="true">
++<CurrencyID>Kz</CurrencyID>
++<CurrencySymbol>Kz</CurrencySymbol>
++<BankSymbol>AOA</BankSymbol>
++<CurrencyName>Kwanza</CurrencyName>
++<DecimalPlaces>2</DecimalPlaces>
++</Currency>
++</LC_CURRENCY>
++<LC_TRANSLITERATION ref="en_US"/>
++<LC_MISC>
++<ReservedWords>
++<trueWord>verdadeiro</trueWord>
++<falseWord>falso</falseWord>
++<quarter1Word>1Â trimestre</quarter1Word>
++<quarter2Word>2Â trimestre</quarter2Word>
++<quarter3Word>3Â trimestre</quarter3Word>
++<quarter4Word>4Â trimestre</quarter4Word>
++<aboveWord>acima</aboveWord>
++<belowWord>abaixo</belowWord>
++<quarter1Abbreviation>T1</quarter1Abbreviation>
++<quarter2Abbreviation>T2</quarter2Abbreviation>
++<quarter3Abbreviation>T3</quarter3Abbreviation>
++<quarter4Abbreviation>T4</quarter4Abbreviation>
++</ReservedWords>
++</LC_MISC>
++<LC_NumberingLevel ref="en_US"/>
++<LC_OutLineNumberingLevel ref="en_US"/>
++</Locale>
+--- i18npool/source/localedata/data/makefile.mk.ao	2007-10-19 16:45:53.000000000 -0200
++++ i18npool/source/localedata/data/makefile.mk	2007-10-19 16:46:08.000000000 -0200
+@@ -177,6 +177,7 @@ MY_MISC_CXXFILES = \
+     $(MISC)$/localedata_or_IN.cxx  \
+     $(MISC)$/localedata_pa_IN.cxx  \
+     $(MISC)$/localedata_pl_PL.cxx  \
++    $(MISC)$/localedata_pt_AO.cxx  \
+     $(MISC)$/localedata_pt_BR.cxx  \
+     $(MISC)$/localedata_pt_PT.cxx  \
+     $(MISC)$/localedata_ro_RO.cxx  \
+@@ -329,6 +330,7 @@ SHL3OBJS=	\
+ 	$(SLO)$/localedata_nn_NO.obj	\
+ 	$(SLO)$/localedata_no_NO.obj	\
+ 	$(SLO)$/localedata_pl_PL.obj	\
++	$(SLO)$/localedata_pt_AO.obj	\
+ 	$(SLO)$/localedata_pt_BR.obj	\
+ 	$(SLO)$/localedata_pt_PT.obj	\
+ 	$(SLO)$/localedata_ru_RU.obj	\
+--- i18npool/source/localedata/data/localedata_euro.map.orig	2007-07-03 10:10:14.000000000 -0400
++++ i18npool/source/localedata/data/localedata_euro.map	2007-11-05 07:29:03.000000000 -0500
+@@ -49,6 +49,7 @@
+ getAllCalendars_no_NO;
+ getAllCalendars_oc_FR;
+ getAllCalendars_pl_PL;
++getAllCalendars_pt_AO;
+ getAllCalendars_pt_BR;
+ getAllCalendars_pt_PT;
+ getAllCalendars_ro_RO;
+@@ -110,6 +111,7 @@
+ getAllCurrencies_no_NO;
+ getAllCurrencies_oc_FR;
+ getAllCurrencies_pl_PL;
++getAllCurrencies_pt_AO;
+ getAllCurrencies_pt_BR;
+ getAllCurrencies_pt_PT;
+ getAllCurrencies_ro_RO;
+@@ -171,6 +173,7 @@
+ getAllFormats0_no_NO;
+ getAllFormats0_oc_FR;
+ getAllFormats0_pl_PL;
++getAllFormats0_pt_AO;
+ getAllFormats0_pt_BR;
+ getAllFormats0_pt_PT;
+ getAllFormats0_ro_RO;
+@@ -232,6 +235,7 @@
+ getBreakIteratorRules_no_NO;
+ getBreakIteratorRules_oc_FR;
+ getBreakIteratorRules_pl_PL;
++getBreakIteratorRules_pt_AO;
+ getBreakIteratorRules_pt_BR;
+ getBreakIteratorRules_pt_PT;
+ getBreakIteratorRules_ro_RO;
+@@ -293,6 +297,7 @@
+ getCollationOptions_no_NO;
+ getCollationOptions_oc_FR;
+ getCollationOptions_pl_PL;
++getCollationOptions_pt_AO;
+ getCollationOptions_pt_BR;
+ getCollationOptions_pt_PT;
+ getCollationOptions_ro_RO;
+@@ -354,6 +359,7 @@
+ getCollatorImplementation_no_NO;
+ getCollatorImplementation_oc_FR;
+ getCollatorImplementation_pl_PL;
++getCollatorImplementation_pt_AO;
+ getCollatorImplementation_pt_BR;
+ getCollatorImplementation_pt_PT;
+ getCollatorImplementation_ro_RO;
+@@ -415,6 +421,7 @@
+ getContinuousNumberingLevels_no_NO;
+ getContinuousNumberingLevels_oc_FR;
+ getContinuousNumberingLevels_pl_PL;
++getContinuousNumberingLevels_pt_AO;
+ getContinuousNumberingLevels_pt_BR;
+ getContinuousNumberingLevels_pt_PT;
+ getContinuousNumberingLevels_ro_RO;
+@@ -476,6 +483,7 @@
+ getFollowPageWords_no_NO;
+ getFollowPageWords_oc_FR;
+ getFollowPageWords_pl_PL;
++getFollowPageWords_pt_AO;
+ getFollowPageWords_pt_BR;
+ getFollowPageWords_pt_PT;
+ getFollowPageWords_ro_RO;
+@@ -537,6 +545,7 @@
+ getForbiddenCharacters_no_NO;
+ getForbiddenCharacters_oc_FR;
+ getForbiddenCharacters_pl_PL;
++getForbiddenCharacters_pt_AO;
+ getForbiddenCharacters_pt_BR;
+ getForbiddenCharacters_pt_PT;
+ getForbiddenCharacters_ro_RO;
+@@ -598,6 +607,7 @@
+ getIndexAlgorithm_no_NO;
+ getIndexAlgorithm_oc_FR;
+ getIndexAlgorithm_pl_PL;
++getIndexAlgorithm_pt_AO;
+ getIndexAlgorithm_pt_BR;
+ getIndexAlgorithm_pt_PT;
+ getIndexAlgorithm_ro_RO;
+@@ -659,6 +669,7 @@
+ getLCInfo_no_NO;
+ getLCInfo_oc_FR;
+ getLCInfo_pl_PL;
++getLCInfo_pt_AO;
+ getLCInfo_pt_BR;
+ getLCInfo_pt_PT;
+ getLCInfo_ro_RO;
+@@ -720,6 +731,7 @@
+ getLocaleItem_no_NO;
+ getLocaleItem_oc_FR;
+ getLocaleItem_pl_PL;
++getLocaleItem_pt_AO;
+ getLocaleItem_pt_BR;
+ getLocaleItem_pt_PT;
+ getLocaleItem_ro_RO;
+@@ -781,6 +793,7 @@
+ getOutlineNumberingLevels_no_NO;
+ getOutlineNumberingLevels_oc_FR;
+ getOutlineNumberingLevels_pl_PL;
++getOutlineNumberingLevels_pt_AO;
+ getOutlineNumberingLevels_pt_BR;
+ getOutlineNumberingLevels_pt_PT;
+ getOutlineNumberingLevels_ro_RO;
+@@ -842,6 +855,7 @@
+ getReservedWords_no_NO;
+ getReservedWords_oc_FR;
+ getReservedWords_pl_PL;
++getReservedWords_pt_AO;
+ getReservedWords_pt_BR;
+ getReservedWords_pt_PT;
+ getReservedWords_ro_RO;
+@@ -903,6 +917,7 @@
+ getSearchOptions_no_NO;
+ getSearchOptions_oc_FR;
+ getSearchOptions_pl_PL;
++getSearchOptions_pt_AO;
+ getSearchOptions_pt_BR;
+ getSearchOptions_pt_PT;
+ getSearchOptions_ro_RO;
+@@ -964,6 +979,7 @@
+ getTransliterations_no_NO;
+ getTransliterations_oc_FR;
+ getTransliterations_pl_PL;
++getTransliterations_pt_AO;
+ getTransliterations_pt_BR;
+ getTransliterations_pt_PT;
+ getTransliterations_ro_RO;
+@@ -1025,6 +1041,7 @@
+ getUnicodeScripts_no_NO;
+ getUnicodeScripts_oc_FR;
+ getUnicodeScripts_pl_PL;
++getUnicodeScripts_pt_AO;
+ getUnicodeScripts_pt_BR;
+ getUnicodeScripts_pt_PT;
+ getUnicodeScripts_ro_RO;
+--- i18npool/source/localedata/localedata.cxx.ao	2007-10-19 16:48:10.000000000 -0200
++++ i18npool/source/localedata/localedata.cxx	2007-10-19 16:48:20.000000000 -0200
+@@ -139,6 +139,7 @@ static const struct {
+     { "nn_NO",  lcl_DATA_EURO },
+     { "nb_NO",  lcl_DATA_EURO },
+     { "pl_PL",  lcl_DATA_EURO },
++    { "pt_AO",  lcl_DATA_EURO },
+     { "pt_BR",  lcl_DATA_EURO },
+     { "pt_PT",  lcl_DATA_EURO },
+     { "ru_RU",  lcl_DATA_EURO },

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Jan 15 19:00:00 2008
@@ -75,7 +75,7 @@
 PLD: PLDBase
 PLD64: PLDBase
 # Mandriva Linux
-MandrivaBase: MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown
+MandrivaBase: CairoFonts, MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown, CalcSolver, Split, NotDebian
 Mandriva: MandrivaBase
 Mandriva64: MandrivaBase
 # Frugalware Linux
@@ -798,14 +798,19 @@
 
 [ MandrivaOnly ]
 SectionOwner => gghibo
-
-default-system-fpicker.diff, michael
 gcc401-stlport45-include.diff
 mandriva-archflags.diff
 mandriva-java32_64.diff
 # db42-fix-jni-includes.diff
 # Fixes msfontextract tool (uninitialized variable)
 msfontextract.diff, mrl
+# Fixes ooqstart.desktop Exec command
+ooqstart.desktop-exec.diff, Marcelo Ricardo Leitner
+# Adds Angola currency. FIXME: probably done in the worst way.
+angola.diff, mrl
+# Fix DictOOo.swx and FontOOo.swx paths, as Mandriva doesn't ship them
+# inside share/dict/ooo dir.
+wizards-path.diff, mrl
 
 
 [ MandrivaOnlyUnix ]

Added: trunk/patches/src680/ooqstart.desktop-exec.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/ooqstart.desktop-exec.diff	Tue Jan 15 19:00:00 2008
@@ -0,0 +1,11 @@
+--- sysui/desktop/menus/qstart.desktop.mrl	2007-07-02 10:16:59.000000000 -0400
++++ sysui/desktop/menus/qstart.desktop	2007-07-02 10:17:14.000000000 -0400
+@@ -4,7 +4,7 @@ Encoding=UTF-8
+ Terminal=false
+ Type=Application
+ Categories=Application;Office;
+-Exec=openoffice -quickstart -nologo -nodefault
++Exec=ooffice -quickstart -nologo -nodefault
+ NoDisplay=true
+ Name=%PRODUCTNAME Quickstarter
+ Comment=Hook for quickstarter startup

Added: trunk/patches/src680/wizards-path.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/wizards-path.diff	Tue Jan 15 19:00:00 2008
@@ -0,0 +1,22 @@
+--- wizards/source/launcher/FontOOo.xba.path	2007-10-18 16:08:57.000000000 -0200
++++ wizards/source/launcher/FontOOo.xba	2007-10-18 16:09:16.000000000 -0200
+@@ -15,7 +15,7 @@ on error resume next
+ &apos; Find path
+ aService = CreateUnoService(&quot;com.sun.star.util.PathSubstitution&quot;)
+ ThePath =ConvertToURL(aService.substituteVariables(&quot;$(prog)&quot;, true))
+-ThePath=ThePath &amp; &quot;/../share/dict/ooo&quot;
++ThePath=ThePath &amp; &quot;/../share/dict&quot;
+ 
+ if  fileExists(ThePath &amp; &quot;/FontOOo.lst&quot;) then
+ &apos;read FontOOo.lst file
+--- wizards/source/launcher/DicOOo.xba.path	2007-10-18 16:08:54.000000000 -0200
++++ wizards/source/launcher/DicOOo.xba	2007-10-18 16:09:09.000000000 -0200
+@@ -18,7 +18,7 @@ aService = CreateUnoService(&quot;com.su
+ ThePath =ConvertToURL(aService.substituteVariables(&quot;$(user)&quot;, true))
+ ThePath=ThePath &amp; &quot;/wordbook&quot;
+ DefPath =ConvertToURL(aService.substituteVariables(&quot;$(prog)&quot;, true))
+-DefPath=DefPath &amp; &quot;/../share/dict/ooo&quot;
++DefPath=DefPath &amp; &quot;/../share/dict&quot;
+ 
+ MyDicOOo=&quot;&quot;
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]