You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/04/03 19:26:47 UTC
svn commit: r1856901 - in /openoffice/branches/AOO42X: ./
main/instsetoo_native/util/openoffice.lst
Author: jim
Date: Wed Apr 3 19:26:47 2019
New Revision: 1856901
URL: http://svn.apache.org/viewvc?rev=1856901&view=rev
Log:
Merge r1856899 from trunk:
Set ADDSYSTEMINTEGRATION for Beta and Dev builds
Reviewed by: jim
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/instsetoo_native/util/openoffice.lst
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 3 19:26:47 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856833
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856833,1856899
Modified: openoffice/branches/AOO42X/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/instsetoo_native/util/openoffice.lst?rev=1856901&r1=1856900&r2=1856901&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/AOO42X/main/instsetoo_native/util/openoffice.lst Wed Apr 3 19:26:47 2019
@@ -139,6 +139,7 @@ Apache_OpenOffice_Dev
REGISTRYLAYERNAME LayerDev
UPDATEURL https://ooo-updates.apache.org/aoonextdev/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+ ADDSYSTEMINTEGRATION 1
EVAL
PACKAGEVERSION 4.2.0
PACKAGEREVISION {milestone}
@@ -354,7 +355,7 @@ Apache_OpenOffice_Beta
UPDATEURL https://ooo-updates.apache.org/aoonextbeta/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 0
+ ADDSYSTEMINTEGRATION 1
EVAL
PACKAGEVERSION 4.2.0
PACKAGEREVISION {milestone}