summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-02-21 10:17:26 +0100
committerJan Holesovsky <kendy@collabora.com>2014-02-21 10:17:26 +0100
commit46611099e805924d568ecf9d4b54ac7d840b5087 (patch)
treeea67c181b167a97c5cb4954144840cbb018188b1
parent934eab5b902e920c3b5a9993a69d5b2eaf26d8b0 (diff)
Update to a more recent svn commit.
"#i118923# OS/2 port, add CPPULIB to resolve uno constructors."
-rw-r--r--aoo-repositories.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/aoo-repositories.txt b/aoo-repositories.txt
index fae1e8e..01affee 100644
--- a/aoo-repositories.txt
+++ b/aoo-repositories.txt
@@ -36,17 +36,18 @@
:set filter=-1,dos644,^testautomation/writer/optional/input/import/dostext.txt$
:set filter=-1,unx,\<(AxTestComponents/AxTestComponents\.dsp|MfcControl/MfcControl\.dsp|unoTocomCalls/Test/Test\.dsp|XCallback_Impl/XCallback_Impl\.dsp)$
-# 1st non-empty commit after "#i122362# remove stlport4-build support"
-:revision from:1543342
+# 1st non-empty commit after """#i118923# OS/2 port, add CPPULIB to resolve uno constructors."""
+:revision from:1570241
# trunk is somewhere deep in the path
:set trunk=openoffice/trunk/main
-# the actual layout of the repositories (resets core to "#i122362# remove stlport4-build support")
-core:a7bc1f5a489cc599919e4f0cad5e9e72fb3a7506=^(config.guess|buildbot_linux.sh|DISCLAIMER|GNUmakefile|LICENSE|LICENSE_ALv2|LICENSE_aggregated|LICENSE_category_b|Makefile.in|MathMLDTD|Module_ooo.mk|NOTICE|NOTICE_aggregated|NOTICE_category_b|ooo.lst|external_libs.lst|external_deps.lst|rat-excludes|README|Repository.mk|RepositoryFixes.mk|UnoControls|accessibility|acinclude.m4|afms|agg|animations|apache-commons|apple_remote|autodoc|automation|avmedia|basctl|basebmp|basegfx|basic|bean|beanshell|berkeleydb|binaryurp|boost|bootstrap.1|bridges|buildscript.sh|cairo|canvas|chart2|cli_ure|codemaker|comphelper|config.sub|configmgr|configure.cmd|configure.in|connectivity|cosv|cppcanvas|cppu|cppuhelper|cppunit|cpputools|crashrep|cui|curl|dbaccess|default_images|desktop|dmake|drawinglayer|dtrans|editeng|embeddedobj|embedserv|epm|eventattacher|expat|extensions|external|extras|fetch_tarballs.sh|fileaccess|filter|forms|formula|fpicker|framework|gdk-pixbuf|gettext|glib|graphite|guw|hsqldb|hunspell|hwpfilter|hyphen|i18npool|i18nutil|icc|icu|idl|idlc|install-sh|instsetoo_native|io|javainstaller2|javaunohelper|jfreereport|jpeg|jurt|jvmaccess|jvmfwk|l10ntools|libcroco|libegg|libgsf|libpng|librsvg|libtextcat|libwpd|libxml2|libxmlsec|libxslt|lingucomponent|linguistic|lpsolve|lucene|makefile.rc|mdds|migrationanalysis|more_fonts|moz|mysqlc|mysqlcppconn|mythes|neon|np_sdk|nss|o3tl|odk|offapi|officecfg|offuh|ooo_custom_images|oovbaapi|oowintool|oox|openssl|package|packimages|padmin|pango|postprocess|psprint_config|python|pyuno|qadevOOo|rdbmaker|readlicense_oo|redland|regexp|registry|remotebridges|reportbuilder|reportdesign|rhino|ridljar|rsc|sal|salhelper|sane|sax|saxon|sc|scaddins|sccomp|scp2|scripting|sd|sdext|set_soenv.in|setup_native|sfx2|shell|slideshow|smoketestdoc|smoketestoo_native|soldep|solenv|soltools|sot|splitbuild|starmath|stax|stlport|stoc|store|svgio|svl|svtools|svx|sw|swext|sysui|test|testautomation|testcommon|testgui|testgraphical|testtools|tomcat|toolkit|tools|twain|ucb|ucbhelper|ucpp|udkapi|udm|unixODBC|unodevtools|unoil|unotools|unoxml|ure|uui|vbahelper|vcl|vigra|vos|winaccessibility|wizards|writerfilter|writerperfect|x11_extensions|xmerge|xml2cmp|xmlhelp|xmloff|xmlreader|xmlscript|xmlsecurity|xpdf|xsltml|zlib)\>
+# the actual layout of the repositories (resets core to """#i118923# OS/2 port, add CPPULIB to resolve uno constructors.""")
+core:c6d291416fecd48f56782d2c92f58d10b9ba2c27=^(config.guess|buildbot_linux.sh|DISCLAIMER|GNUmakefile|LICENSE|LICENSE_ALv2|LICENSE_aggregated|LICENSE_category_b|Makefile.in|MathMLDTD|Module_ooo.mk|NOTICE|NOTICE_aggregated|NOTICE_category_b|ooo.lst|external_libs.lst|external_deps.lst|rat-excludes|README|Repository.mk|RepositoryFixes.mk|UnoControls|accessibility|acinclude.m4|afms|agg|animations|apache-commons|apple_remote|autodoc|automation|avmedia|basctl|basebmp|basegfx|basic|bean|beanshell|berkeleydb|binaryurp|boost|bootstrap.1|bridges|buildscript.sh|cairo|canvas|chart2|cli_ure|codemaker|comphelper|config.sub|configmgr|configure.cmd|configure.in|connectivity|cosv|cppcanvas|cppu|cppuhelper|cppunit|cpputools|crashrep|cui|curl|dbaccess|default_images|desktop|dmake|drawinglayer|dtrans|editeng|embeddedobj|embedserv|epm|eventattacher|expat|extensions|external|extras|fetch_tarballs.sh|fileaccess|filter|forms|formula|fpicker|framework|gdk-pixbuf|gettext|glib|graphite|guw|hsqldb|hunspell|hwpfilter|hyphen|i18npool|i18nutil|icc|icu|idl|idlc|install-sh|instsetoo_native|io|javainstaller2|javaunohelper|jfreereport|jpeg|jurt|jvmaccess|jvmfwk|l10ntools|libcroco|libegg|libgsf|libpng|librsvg|libtextcat|libwpd|libxml2|libxmlsec|libxslt|lingucomponent|linguistic|lpsolve|lucene|makefile.rc|mdds|migrationanalysis|more_fonts|moz|mysqlc|mysqlcppconn|mythes|neon|np_sdk|nss|o3tl|odk|offapi|officecfg|offuh|ooo_custom_images|oovbaapi|oowintool|oox|openssl|package|packimages|padmin|pango|postprocess|psprint_config|python|pyuno|qadevOOo|rdbmaker|readlicense_oo|redland|regexp|registry|remotebridges|reportbuilder|reportdesign|rhino|ridljar|rsc|sal|salhelper|sane|sax|saxon|sc|scaddins|sccomp|scp2|scripting|sd|sdext|set_soenv.in|setup_native|sfx2|shell|slideshow|smoketestdoc|smoketestoo_native|soldep|solenv|soltools|sot|splitbuild|starmath|stax|stlport|stoc|store|svgio|svl|svtools|svx|sw|swext|sysui|test|testautomation|testcommon|testgui|testgraphical|testtools|tomcat|toolkit|tools|twain|ucb|ucbhelper|ucpp|udkapi|udm|unixODBC|unodevtools|unoil|unotools|unoxml|ure|uui|vbahelper|vcl|vigra|vos|winaccessibility|wizards|writerfilter|writerperfect|x11_extensions|xmerge|xml2cmp|xmlhelp|xmloff|xmlreader|xmlscript|xmlsecurity|xpdf|xsltml|zlib)\>
-# mapping of the start of the history (currently "#i122362# remove stlport4-build support")
-:commit map=core,1543341:a7bc1f5a489cc599919e4f0cad5e9e72fb3a7506
+# mapping of the start of the history; it is X-1, where ":revision from:X" above
+# (currently """#i118923# OS/2 port, add CPPULIB to resolve uno constructors.""")
+:commit map=core,1570240:c6d291416fecd48f56782d2c92f58d10b9ba2c27
# parts of the svn tree that are going to be just dumped, not imported
ignore-binfilter:ignore=^binfilter\>