summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@libreoffice.org>2018-04-09 18:47:47 +0200
committerJan Holesovsky <kendy@collabora.com>2018-04-09 19:07:32 +0200
commit417127ae0b7eb912da5e7fce63a23e55c26657e4 (patch)
tree2698923d07e4d7dc5ba074997f6dda3ad9464a87
parent653c601a44a89ba631845e0ed5b9a3136263ae35 (diff)
Update AOO mappings to r1813837
Now at: 8c5eeb4 Split off a new dbtools.jar from the PostgreSQL driver, containing
-rw-r--r--aoo-repositories.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/aoo-repositories.txt b/aoo-repositories.txt
index 5f7e654..8b66d66 100644
--- a/aoo-repositories.txt
+++ b/aoo-repositories.txt
@@ -36,18 +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 """Fix a typo (ucp instead of ucb) in the source file paths to our UCB GIO"""
-:revision from:1782030
+# 1st non-empty commit after """Split off a new dbtools.jar from the PostgreSQL driver, containing"""
+:revision from:1813837
# trunk is somewhere deep in the path
:set trunk=openoffice/trunk/main
-# the actual layout of the repositories (resets core to """Fix a typo (ucp instead of ucb) in the source file paths to our UCB GIO""")
-core:5642df3f3e6c764dc5723749b65f9407658225f2=^(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|RepositoryExternal.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|ooxml|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|source_soenv.sh|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 """Split off a new dbtools.jar from the PostgreSQL driver, containing""")
+core:8c5eeb4f15dc565768dd08cdce98afe3d6a7fc30=^(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|RepositoryExternal.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|ooxml|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|source_soenv.sh|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; it is X-1, where ":revision from:X" above
-# (currently """Fix a typo (ucp instead of ucb) in the source file paths to our UCB GIO""")
-:commit map=core,1782029:5642df3f3e6c764dc5723749b65f9407658225f2
+# (currently """Split off a new dbtools.jar from the PostgreSQL driver, containing""")
+:commit map=core,1813836:8c5eeb4f15dc565768dd08cdce98afe3d6a7fc30
# parts of the svn tree that are going to be just dumped, not imported
ignore-binfilter:ignore=^binfilter\>