svn commit: r1705542 - in /openoffice/trunk/main/ucb/source/ucp/webdav: SerfLockRefreshProcImpl.cxx SerfLockReqProcImpl.cxx SerfUnlockProcImpl.cxx

[pfg]

Author: pfg
Date: Sun Sep 27 15:11:15 2015
New Revision: 1705542

URL: http://svn.apache.org/viewvc?rev=1705542=rev
Log:
Fix build with external webdav.

Submitted by:   Don Lewis

Modified:
openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx

Modified: 
openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx?rev=1705542=1705541=1705542=diff
==
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx 
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx Sun 
Sep 27 15:11:15 2015
@@ -27,9 +27,9 @@
 #include "DAVProperties.hxx"
 
 #include "webdavresponseparser.hxx"
-#include 
+#include 
 #include 
-#include 
+#include 
 
 namespace http_dav_ucp
 {

Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx?rev=1705542=1705541=1705542=diff
==
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx 
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx Sun Sep 
27 15:11:15 2015
@@ -27,9 +27,9 @@
 #include "DAVProperties.hxx"
 
 #include "webdavresponseparser.hxx"
-#include 
+#include 
 #include 
-#include 
+#include 
 
 namespace http_dav_ucp
 {

Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx?rev=1705542=1705541=1705542=diff
==
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx 
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx Sun Sep 
27 15:11:15 2015
@@ -27,9 +27,9 @@
 #include "DAVProperties.hxx"
 
 #include "webdavresponseparser.hxx"
-#include 
+#include 
 #include 
-#include 
+#include 
 
 namespace http_dav_ucp
 {

svn commit: r1705551 - /openoffice/trunk/ext_libraries/apr-util/prj/d.lst

[pfg]

Author: pfg
Date: Sun Sep 27 16:15:26 2015
New Revision: 1705551

URL: http://svn.apache.org/viewvc?rev=1705551=rev
Log:
Revert r1705543: unwanted typo

Modified:
openoffice/trunk/ext_libraries/apr-util/prj/d.lst

Modified: openoffice/trunk/ext_libraries/apr-util/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/prj/d.lst?rev=1705551=1705550=1705551=diff
==
--- openoffice/trunk/ext_libraries/apr-util/prj/d.lst (original)
+++ openoffice/trunk/ext_libraries/apr-util/prj/d.lst Sun Sep 27 16:15:26 2015
@@ -10,7 +10,6 @@ mkdir: %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
 linklib: libaprutil-1.so.*
-linklib: libaprutil-1.so.*
 
 # Mac
 ..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%

svn commit: r1705552 - in /openoffice/branches/AOO410: ./ ext_libraries/apr-util/prj/d.lst

[pfg]

Author: pfg
Date: Sun Sep 27 16:30:04 2015
New Revision: 1705552

URL: http://svn.apache.org/viewvc?rev=1705552=rev
Log:
partial revert of r1705547
Revert r1705543: unwanted typo

Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst

Propchange: openoffice/branches/AOO410/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 16:30:04 2015
@@ -2,5 +2,5 @@
 /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:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551
 /openoffice/trunk/main:1705369

Modified: openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst?rev=1705552=1705551=1705552=diff
==
--- openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst (original)
+++ openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst Sun Sep 27 
16:30:04 2015
@@ -10,7 +10,6 @@ mkdir: %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
 linklib: libaprutil-1.so.*.*
-linklib: libaprutil-1.so.*
 
 # Mac
 ..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%

svn commit: r1705549 - in /openoffice/branches/AOO410: ./ ext_libraries/coinmp/ main/

[pfg]

Author: pfg
Date: Sun Sep 27 15:41:17 2015
New Revision: 1705549

URL: http://svn.apache.org/viewvc?rev=1705549=rev
Log:
MFT - CoinMP update

r1585171:
i124158 - Update CoinMP to 1.7.6

r1647713:
Make sure system LAPACK/BLAS are never used.

r1690740, r1690755, r1690854, r1694131
Fix for FreeBSD and MacOSX build.

Added:
openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
  - copied, changed from r1585171, 
openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6.patch
  - copied unchanged from r1585171, 
openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6.patch
Removed:
openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.6.0-clang.patch
openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.6.0.patch
Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/external_deps.lst

Propchange: openoffice/branches/AOO410/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 15:41:17 2015
@@ -2,5 +2,5 @@
 /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:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543
 /openoffice/trunk/main:1705369

Copied: 
openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch (from 
r1585171, openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch)
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch?p2=openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch=openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch=1585171=1705549=1705549=diff
==
--- openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch (original)
+++ openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch 
Sun Sep 27 15:41:17 2015
@@ -1,14 +1,15 @@
 misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2011-01-03 
20:31:00.0 -0300
-+++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp   2014-02-01 
02:02:10.596696644 -0300
-@@ -95,7 +95,10 @@
- 
+--- misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2011-01-03 
23:31:00.0 +
 misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp   2015-08-04 
23:25:43.46841 +
+@@ -44,7 +44,11 @@
  
//-
  
--#if defined(__MACH__) && defined(__GNUC__)
-+#if defined(__clang__)
-+   typedef void(*CoinSighandler_t)(int);
-+#  define CoinSighandler_t_defined
-+#elif defined(__MACH__) && defined(__GNUC__)
-typedef typeof(SIG_DFL) CoinSighandler_t;
+ #if defined(__FreeBSD__) && defined(__GNUC__)
+-   typedef typeof(SIG_DFL) CoinSighandler_t;
++   #if defined(__clang__)
++ typedef __decltype(SIG_DFL) CoinSighandler_t;
++  

svn commit: r1705543 - /openoffice/trunk/ext_libraries/apr-util/prj/d.lst

[pfg]

Author: pfg
Date: Sun Sep 27 15:13:21 2015
New Revision: 1705543

URL: http://svn.apache.org/viewvc?rev=1705543=rev
Log:
Fix installation of apr-util on FreeBSD buildbot

Submitted by:   Don Lewis

Modified:
openoffice/trunk/ext_libraries/apr-util/prj/d.lst

Modified: openoffice/trunk/ext_libraries/apr-util/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/prj/d.lst?rev=1705543=1705542=1705543=diff
==
--- openoffice/trunk/ext_libraries/apr-util/prj/d.lst (original)
+++ openoffice/trunk/ext_libraries/apr-util/prj/d.lst Sun Sep 27 15:13:21 2015
@@ -10,6 +10,7 @@ mkdir: %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
 linklib: libaprutil-1.so.*
+linklib: libaprutil-1.so.*
 
 # Mac
 ..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%

svn commit: r1705580 - /openoffice/tags/AOO411/AOO410/

[pescetti]

Author: pescetti
Date: Sun Sep 27 21:33:03 2015
New Revision: 1705580

URL: http://svn.apache.org/viewvc?rev=1705580=rev
Log:
AOO revision 1617669 from branch AOO410 was voted to be released as Apache 
OpenOffice 4.1.1

Removed:
openoffice/tags/AOO411/AOO410/

svn commit: r1705581 - /openoffice/tags/SNAPSHOT/

[pescetti]

Author: pescetti
Date: Sun Sep 27 21:34:38 2015
New Revision: 1705581

URL: http://svn.apache.org/viewvc?rev=1705581=rev
Log:
Remove the SNAPSHOT tag in preparation for update.

Removed:
openoffice/tags/SNAPSHOT/

svn commit: r1705574 - in /openoffice/updates-site/trunk/aoo412: ./ check.Update index.html

[pescetti]

Author: pescetti
Date: Sun Sep 27 21:04:31 2015
New Revision: 1705574

URL: http://svn.apache.org/viewvc?rev=1705574=rev
Log:
#i126480# Empty XML update feed for OpenOffice 4.1.2.

Added:
openoffice/updates-site/trunk/aoo412/
openoffice/updates-site/trunk/aoo412/check.Update   (with props)
openoffice/updates-site/trunk/aoo412/index.html   (with props)

Added: openoffice/updates-site/trunk/aoo412/check.Update
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo412/check.Update?rev=1705574=auto
==
Binary file - no diff available.

Propchange: openoffice/updates-site/trunk/aoo412/check.Update
--
svn:mime-type = application/xml

Added: openoffice/updates-site/trunk/aoo412/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/updates-site/trunk/aoo412/index.html?rev=1705574=auto
==
--- openoffice/updates-site/trunk/aoo412/index.html (added)
+++ openoffice/updates-site/trunk/aoo412/index.html Sun Sep 27 21:04:31 2015
@@ -0,0 +1,12 @@
+
+
+
+
+Apache OpenOffice Product Update Service for installed AOO 4.1.2 
instances
+
+
+Apache OpenOffice Product Update Service for installed AOO 4.1.2 
instances
+Folder containing update service feed for AOO 4.1.2 users performing 
the update check and getting the message about an available new version.
+contents...check.Update ... xml feed 
+
+

Propchange: openoffice/updates-site/trunk/aoo412/index.html
--
svn:executable = *

buildbot success in ASF Buildbot on openoffice-linux64-rat-aoo410

[buildbot]

The Buildbot has detected a passing build on builder 
openoffice-linux64-rat-aoo410 while building ASF Buildbot. Full details are 
available at:
http://ci.apache.org/builders/openoffice-linux64-rat-aoo410/builds/78

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: tethys_ubuntu

Build Reason: The Nightly scheduler named 'openoffice-linux64-rat-aoo410' 
triggered this build
Build Source Stamp: [branch openoffice/branches/AOO410] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r1705579 - /openoffice/tags/AOO411/AOO410/

[pescetti]

Author: pescetti
Date: Sun Sep 27 21:26:32 2015
New Revision: 1705579

URL: http://svn.apache.org/viewvc?rev=1705579=rev
Log:
AOO revision 1617669 from the branch AOO410 was released as Apache OpenOffice 
4.1.1.

Added:
openoffice/tags/AOO411/AOO410/   (props changed)
  - copied from r1617669, openoffice/branches/AOO410/

Propchange: openoffice/tags/AOO411/AOO410/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Sep 27 21:26:32 2015
@@ -0,0 +1,5 @@
+/openoffice/branches/AOO400:1503684
+/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:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801

svn commit: r1705582 - /openoffice/tags/SNAPSHOT/

[pescetti]

Author: pescetti
Date: Sun Sep 27 21:36:08 2015
New Revision: 1705582

URL: http://svn.apache.org/viewvc?rev=1705582=rev
Log:
SNAPSHOT is now set to AOO410 revision 1705581.

Added:
openoffice/tags/SNAPSHOT/   (props changed)
  - copied from r1705581, openoffice/branches/AOO410/

Propchange: openoffice/tags/SNAPSHOT/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Sep 27 21:36:08 2015
@@ -0,0 +1,6 @@
+/openoffice/branches/AOO400:1503684
+/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:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551
+/openoffice/trunk/main:1705369

svn commit: r1705575 - /openoffice/branches/AOO410/main/sysui/desktop/productversion.mk

[pescetti]

Author: pescetti
Date: Sun Sep 27 21:08:39 2015
New Revision: 1705575

URL: http://svn.apache.org/viewvc?rev=1705575=rev
Log:
#i126480# Further 'version numbers' which need to be adapted to 4.1.2.

Modified:
openoffice/branches/AOO410/main/sysui/desktop/productversion.mk

Modified: openoffice/branches/AOO410/main/sysui/desktop/productversion.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sysui/desktop/productversion.mk?rev=1705575=1705574=1705575=diff
==
--- openoffice/branches/AOO410/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/AOO410/main/sysui/desktop/productversion.mk Sun Sep 27 
21:08:39 2015
@@ -47,7 +47,7 @@ PRODUCTLIST = openoffice
 # default values to minimize maintainance effort
 
 # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.1.1
+PRODUCTVERSION = 4.1.2
 
 # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
 PRODUCTVERSIONSHORT = 4

svn commit: r1705572 - /openoffice/branches/AOO410/main/solenv/bin/srcrelease.xml

[pescetti]

Author: pescetti
Date: Sun Sep 27 20:55:44 2015
New Revision: 1705572

URL: http://svn.apache.org/viewvc?rev=1705572=rev
Log:
#i126480# Adapt version number for src release.

Modified:
openoffice/branches/AOO410/main/solenv/bin/srcrelease.xml

Modified: openoffice/branches/AOO410/main/solenv/bin/srcrelease.xml
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/bin/srcrelease.xml?rev=1705572=1705571=1705572=diff
==
--- openoffice/branches/AOO410/main/solenv/bin/srcrelease.xml (original)
+++ openoffice/branches/AOO410/main/solenv/bin/srcrelease.xml Sun Sep 27 
20:55:44 2015
@@ -27,7 +27,7 @@
   
   
   
-  
+  
 
   
   

svn commit: r1705573 - /openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst

[pescetti]

Author: pescetti
Date: Sun Sep 27 21:00:41 2015
New Revision: 1705573

URL: http://svn.apache.org/viewvc?rev=1705573=rev
Log:
#i126480# Provide Update URL for OpenOffice 4.1.2 instances.

Modified:
openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst

Modified: openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst?rev=1705573=1705572=1705573=diff
==
--- openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst 
(original)
+++ openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst Sun 
Sep 27 21:00:41 2015
@@ -71,7 +71,7 @@ Apache_OpenOffice
 ABOUTBOXPRODUCTVERSION 4.1.2
 BASEPRODUCTVERSION 4.1
 PCPFILENAME openoffice.pcp
-UPDATEURL https://ooo-updates.apache.org/aoo411/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo412/check.Update
 ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 ADDSYSTEMINTEGRATION 1
@@ -130,7 +130,7 @@ Apache_OpenOffice_wJRE
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.1.2
 BASEPRODUCTVERSION 4.1
-UPDATEURL https://ooo-updates.apache.org/aoo411/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo412/check.Update
 ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 ADDSYSTEMINTEGRATION 1
@@ -197,7 +197,7 @@ Apache_OpenOffice_Dev
 UREPACKAGEPREFIX aoodev
 SOLSUREPACKAGEPREFIX aoodev
 REGISTRYLAYERNAME LayerDev
-UPDATEURL https://ooo-updates.apache.org/aoo411/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo412/check.Update
 ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 EVAL
 PACKAGEVERSION 4.1.2
@@ -410,7 +410,7 @@ Apache_OpenOffice_Beta
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.1.2
 BASEPRODUCTVERSION 4.1
-UPDATEURL https://ooo-updates.apache.org/aoo411/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo412/check.Update
 ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 ADDSYSTEMINTEGRATION 0

svn commit: r1705547 - in /openoffice/branches/AOO410: ./ ext_libraries/apr-util/prj/d.lst main/ main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx main/ucb/source/ucp/webdav/SerfLockReqProcImpl.c

[pfg]

Author: pfg
Date: Sun Sep 27 15:26:48 2015
New Revision: 1705547

URL: http://svn.apache.org/viewvc?rev=1705547=rev
Log:
MFT r1705542, r1705543
Fix build with external webdav.

Submitted by:   Don Lewis

Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst
openoffice/branches/AOO410/main/   (props changed)

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx

Propchange: openoffice/branches/AOO410/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 15:26:48 2015
@@ -2,5 +2,5 @@
 /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:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1694132,1694701,1702894,1702898,1702986,1702988
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543
 /openoffice/trunk/main:1705369

Modified: openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst?rev=1705547=1705546=1705547=diff
==
--- openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst (original)
+++ openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst Sun Sep 27 
15:26:48 2015
@@ -10,6 +10,7 @@ mkdir: %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
 linklib: libaprutil-1.so.*.*
+linklib: libaprutil-1.so.*
 
 # Mac
 ..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%

Propchange: openoffice/branches/AOO410/main/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 15:26:48 2015
@@ -2,4 +2,4 @@
 /openoffice/branches/ia2/main:1417739-1541842
 
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617

buildbot success in ASF Buildbot on openoffice-linux32-nightly

[buildbot]

The Buildbot has detected a passing build on builder openoffice-linux32-nightly 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-linux32-nightly/builds/98

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm2_ubuntu_32bit

Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' 
triggered this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

[buildbot]

The Buildbot has detected a failed build on builder openoffice-fbsd-nightly 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/84

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-fbsd2_64bit

Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered 
this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

BUILD FAILED: failed build --all

Sincerely,
 -The Buildbot

buildbot success in ASF Buildbot on openoffice-linux64-rat

[buildbot]

The Buildbot has detected a passing build on builder openoffice-linux64-rat 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-linux64-rat/builds/82

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: tethys_ubuntu

Build Reason: The Nightly scheduler named 'openoffice-linux64-rat' triggered 
this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on aoo-win7

[buildbot]

The Buildbot has detected a failed build on builder aoo-win7 while building ASF 
Buildbot. Full details are available at:
http://ci.apache.org/builders/aoo-win7/builds/95

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-win7

Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this 
build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

BUILD FAILED: failed svn info build.pl --all

Sincerely,
 -The Buildbot

svn commit: r1705514 - in /openoffice/branches/AOO410/main: ./ sd/ sd/source/ui/view/sdview4.cxx

[pescetti]

Author: pescetti
Date: Sun Sep 27 08:24:21 2015
New Revision: 1705514

URL: http://svn.apache.org/viewvc?rev=1705514=rev
Log:
#i125613# Fix "Insert Picture from file does not work".
Patch by: regina

Modified:
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sd/   (props changed)
openoffice/branches/AOO410/main/sd/source/ui/view/sdview4.cxx

Propchange: openoffice/branches/AOO410/main/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 08:24:21 2015
@@ -2,4 +2,4 @@
 /openoffice/branches/ia2/main:1417739-1541842
 
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,1700078,1700135,1702894,1702898,1702986,170298
 8,1705193,1705196,1705199,1705276,1705364,1705368-1705369
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1650314,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,1700078,1700135,1702894,1702898,170298
 6,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369

Propchange: openoffice/branches/AOO410/main/sd/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 08:24:21 2015
@@ -2,4 +2,4 @@
 /openoffice/branches/ia2/main/sd:1417739-1541842
 
/openoffice/branches/ooxml-osba/main/sd:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 
/openoffice/branches/rejuvenate01/main/sd:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/sd:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1609118,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988
+/openoffice/trunk/main/sd:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1609118,1621121,1623847,1623849-1623850,1642300-1642302,1650314,1702894,1702898,1702986,1702988

Modified: openoffice/branches/AOO410/main/sd/source/ui/view/sdview4.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sd/source/ui/view/sdview4.cxx?rev=1705514=1705513=1705514=diff
==
--- openoffice/branches/AOO410/main/sd/source/ui/view/sdview4.cxx (original)
+++ 

buildbot success in ASF Buildbot on openoffice-fbsd-nightly

[buildbot]

The Buildbot has detected a passing build on builder openoffice-fbsd-nightly 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/83

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-fbsd2_64bit

Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered 
this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot success in ASF Buildbot on openoffice-linux64-nightly

[buildbot]

The Buildbot has detected a passing build on builder openoffice-linux64-nightly 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-linux64-nightly/builds/92

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: tethys_ubuntu

Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' 
triggered this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot