summaryrefslogtreecommitdiff
path: root/scp2
AgeCommit message (Collapse)Author
2015-10-13KDE4: add kde4-open-url to the integration packageJan-Marek Glogowski
Currently kde4-open-url is just installed, but not included in the kde-integration package. Change-Id: Ic114a463b97aaaf4cc7ff3062143698daf93513c (cherry picked from commit 805a861b398bbe5f22cb08705dfa006b44fe4e40) Reviewed-on: https://gerrit.libreoffice.org/19327 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2015-08-22Generalize CONFIGURATION_LAYERS "winreg:" notationStephan Bergmann
...after 097292feab4fc3c064983e1dd08ac4bebe1fe216 "Add HKEY_CURRENT_USER registry integration" added "winuserreg:". Even though changing from the exisiting "winreg:" to "winreg:LOCAL_MACHINE" should be compatible, as it only ends up in fundamental.ini included in the LO inst set, play it safe it keep treating "winreg" the same as "winreg:LOCAL_MACHINE". ("url" is a misnomer now in configmgr's Components ctor, and should eventually be renamed to something more accurate.) Reviewed-on: https://gerrit.libreoffice.org/17891 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 53e3fb1d9337e450e926e163221fecaca13ea957, including fixes for the apparently inadvertent differences between 097292feab4fc3c064983e1dd08ac4bebe1fe216 "Add HKEY_CURRENT_USER registry integration" and its unfaithful backport 1b8812e7ad17957d8982095a37e489b8455a9bda "tdf#93546 -Add HKEY_CURRENT_USER registry integration") Conflicts: configmgr/source/components.cxx instsetoo_native/CustomTarget_setup.mk scp2/source/ooo/common_brand.scp Change-Id: Ifbcf3284d904490891642599468470d03547f92a Reviewed-on: https://gerrit.libreoffice.org/17905 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-21tdf#93546 -Add HKEY_CURRENT_USER registry integration.Michael Meeks
Back-port this to allow merging a user registry fragment. Conflicts: configmgr/source/components.cxx instsetoo_native/CustomTarget_setup.mk scp2/source/ooo/common_brand.scp Conflicts: scp2/source/ooo/common_brand.scp Change-Id: Ia32ba9ff3e7878d40032bd7d10fba2c143d11757 Reviewed-on: https://gerrit.libreoffice.org/17884 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2015-08-05Add "styles" template folder + content to installationTomaž Vajngerl
Change-Id: Ibb674e17eedfc325d3e335aa074391ad7b2b2aa2 (cherry picked from commit 6c853a986444294dd937cd570a4dc0a31943e432) Reviewed-on: https://gerrit.libreoffice.org/17486 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-06-25Avoid errors with stuff not build on --without-xRiccardo Magliocchetti
Reported by by Abhimanyu Singh Change-Id: I02bd2a2b85b9d55f0b237d3a1141801245473cd2 Reviewed-on: https://gerrit.libreoffice.org/16453 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 64b636b814ddd65b90459c75a49cc5e743a2785c)
2015-06-04Build time option --disable-extension-updateKatarina Behrens
to disable the possibility to update installed extensions Change-Id: Ifdee0f3b13ee3e2bcb288c8ded98cb9805a6e55a Reviewed-on: https://gerrit.libreoffice.org/16059 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-05-19upload libwps 0.4.0osnola
Change-Id: I9da61333b7c46d20cf7010553929b141ec011d84
2015-05-18scp2: fix --disable-pythonAndras Timar
Change-Id: Iec27f9d9efb506d67de6bc20eb0a8eef46a58ebf Reviewed-on: https://gerrit.libreoffice.org/15778 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-05-14do not set unix executable bit for CREDITS.fodt, LICENSE.fodt and NOTICEAndras Timar
Change-Id: Iab15ca1479d39e480369a18a7b043675d319f2ca
2015-05-01scp2: add scanner ui files to language pack templateAndras Timar
Change-Id: I10105770a119db8a21a3d09642f99b556440a57d
2015-04-30tdf#89152 add missing .ui localizations to install scriptAndras Timar
Change-Id: I32368329edfff18ea2a73de9a4cf60b2f734a54d
2015-04-20scp2: remove unused gidsMatúš Kukan
Change-Id: I723e752ff4bab9e36b3f3a08fc1fe8d10511d774
2015-03-05add country to strings refering to Brazilian PortugueseStanislav Horacek
Change-Id: If4487d7157adb949aca9ed0ca0739a00152e6955 Reviewed-on: https://gerrit.libreoffice.org/14747 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-28scp2: remove now unused variableMichael Stahl
Change-Id: I85c0db36709f545bf2d4eaba9b458e4741b7879b
2015-02-28scp2: move some ooo packages to AutoInstallMichael Stahl
Change-Id: I1c99cd2c8a392bf2a775eeb2c3acd4474aa2b0fb
2015-02-28scp2: move reportbuilder packages to AutoInstallMichael Stahl
Change-Id: I81778d452b548a0205db2e8bd30bcfed37becfcd
2015-02-28scp2: move xsltfilter packages to AutoInstallMichael Stahl
Change-Id: I2ae844d43a875ea0b4eb9dd445e483a36a90f73d
2015-02-28scp2: move python librelogo packages to AutoInstallMichael Stahl
Change-Id: Ib70d1510bac2eb6bd5491f3177191ad5a8aebe2d
2015-02-28scp2: move python packages to AutoInstallMichael Stahl
Change-Id: I1444e114e5cdbe794d79f40edebc32cb0229a4b5
2015-02-28scp2: move python scriptprovider package to AutoInstallMichael Stahl
Change-Id: I7e7f74ffbfd9edc4d8d4b3ca13d9a2f0d97dcbf4
2015-02-28scp2: move gallery packages to AutoInstallMichael Stahl
Change-Id: I56a89b8785d7ac9f959ed43be26302540332e7ee
2015-02-28scp2: remove obsolete mkopenwith.btmMichael Stahl
Change-Id: I409a505ad61f99e56081a9a05ec49284564fd568
2015-02-18Package 64bit dist runtime DLLs in 64bit msiDavid Ostrovsky
Change-Id: I0c8b7a8b2903d83eb37beb6b54f89dbcda8fba9c Reviewed-on: https://gerrit.libreoffice.org/14527 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-02-09On Mac OS X, directly name the executable "unopkg"Stephan Bergmann
Change-Id: I5f846d7f7c5ed54179504f551e19227f7283bda2
2015-02-08scp2: 'Minimal' key is unused, let's remove it from everywhereAndras Timar
Change-Id: I2c0d9c6870c52de85e288f4f70bc4d7c492e9987 Reviewed-on: https://gerrit.libreoffice.org/14361 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-02-08tdf#89135 install OpenGL slide transitions unconditionally on WindowsAndras Timar
Change-Id: I6efaaf56d56f27159f39046bdf2112ff2b9ed082 Reviewed-on: https://gerrit.libreoffice.org/14360 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-02-03fdo#67534 Fix "Property Handler" shared lockMaxime de Roucy
As explained in the following link, access mode should be set to "EnableShareDenyNone" to avoid blocking others process to access the file opened by the Property Handler. http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3 Reviewed-on: https://gerrit.libreoffice.org/13596 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-01-25add Guarani (gug) languageAndras Timar
Change-Id: Icf1612f88447e9ae348ef9ad333607a3f6dc8d32
2015-01-08install the new templates tooDavid Tardon
Change-Id: I503d2cf750f844999635c517b33788ba5f186788
2015-01-07drop crashrep unused since start of LibreOfficeCaolán McNamara
Change-Id: I3df1216054c133314b2317849744a0a37e9fbc8f Reviewed-on: https://gerrit.libreoffice.org/13733 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-12-22scp2: typo in source/impress/module_ogltrans.ulfAndras Timar
Change-Id: I3f2849784107a046bcf05e6cfb3b0b8d2f535912
2014-12-10scp2: move numbertext to AutoInstallDavid Ostrovsky
Change-Id: Idf9ea17b485ab07323a895e7e3f1eca1e198747c Reviewed-on: https://gerrit.libreoffice.org/13047 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-12-10extensions_ct2n: Add dependency in scp2/InstallModule_extensions.mkDavid Ostrovsky
9df0e4a709735e5fb5c0e87779b0694c512f0de7 moved ct2n to AutoInstall, but missed to add dependency in scp2/InstallModule_extensions.mk. Change-Id: Ibfc30f1efa494996e832c8039fde69420f0ad5ee Reviewed-on: https://gerrit.libreoffice.org/13398 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-12-03Fold URE: WindowsStephan Bergmann
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is no longer necessary and loading of cppuhelper from the program dir cannot fail regardless in whatever scenario the cli_cppuhelper library itself is loaded. Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
2014-12-01Fold URE: Linux ure/share/misc/* -> program/Stephan Bergmann
...and remove now unused ure-link symlink Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-11-28Fold URE: Linux ure/share/java/* -> program/classes/Stephan Bergmann
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28Fold URE: Linux ure/lib/* -> program/Stephan Bergmann
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge (and juh.jar had lacked adaption for Mac OS X). Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
2014-11-28Fold URE: Linux ure/bin/* -> program/Stephan Bergmann
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
2014-11-26Remove some obsolete definesStephan Bergmann
Change-Id: I6b62a824787cba47f3d3004f09ed684275c95995
2014-11-26Use Package_pyuno_pythonloader_ini for installStephan Bergmann
Change-Id: Ia4f06beea2e16b6a0235c87ae47cec8430cd1f40
2014-11-26No need for empty presets/uno_packages/Stephan Bergmann
...it is created on demand in the UserInstallation via dp_misc::create_folder (desktop/source/deployment/misc/dp_ucb.cxx)---and was only present in installation sets, not in instdir/, anyway. Change-Id: I37caf24a9d8821c49815be9d6b9b15c08a66af95
2014-11-26No need for empty presets/psprint/Stephan Bergmann
...it is created on demand in the UserInstallation in psp::getOfficePath (vcl/generic/fontmanager/helper.cxx)---and was only present in installation sets, not in instdir/, anyway. Change-Id: I6d7314f7fa4f6c0040e94e49ac1fe34d03e861be
2014-11-26version ini-file's ProductMajor/Minor are unusedStephan Bergmann
...and had started to have different values in instdir (ProductMajor=450, ProductMinor=0) vs. installation sets (ProductMajor=50, ProductMinor=) Change-Id: I4db2c07b5f7b011218833fc355a3097eb13d0cd4
2014-11-26Remove gid_Profile_Setup_Ini junkStephan Bergmann
884bb65da9414f9217cbbc77ae6fb9a2e4c41f4f "INTEGRATION: CWS native141: #i87732# version number in package names" removed gid_Profile_Setup_Ini and b857e4618b2ca37798a9aaa3121c5ff926df346f "INTEGRATION: CWS native141: #i87732# version number in package names" removed its nine correpsonding gid_Profileitems, but 00de796b0253e7374cf65ad59ef6d391dbdafaa7 "INTEGRATION: CWS odfversion241_DEV300" brought back seven of the gid_Profileitems (but not the gid _Profile_Setup_Ini itself; probably due to a merge conflict; then fd1db0b8eba8e86c5a7e1a3c685e76975d21d93c "Undo basis/brand split: move program/classes/ from basis to brand" removed one of the gid_Profileitems again). Now remove the remaining six. Change-Id: I464ac1258217b2ecf8e94b2c7e59b795306d5b06
2014-11-25Remove unused URE_LIB_DIRStephan Bergmann
(which now had a bogus value on Mac OS X anyway) Change-Id: I5bf233506d6c658560dfadddf79a9ed8605c2a20
2014-11-25Simplify some #ifStephan Bergmann
Change-Id: I9d3239bdbb92f715b050fd91238add5588969bf0
2014-11-24These are inside an !defined MACOSX blockStephan Bergmann
Change-Id: I09e2db009801c046cf8dd331c7e07cb83f9e3f20
2014-11-24scp2: move ct2n to AutoInstallDavid Ostrovsky
Change-Id: Ib4501298c78e591f24c2ad73cbc8aec0c4fc0347 Reviewed-on: https://gerrit.libreoffice.org/13020 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-14add redist files for VS 2013Andras Timar
Change-Id: I07c7af3b9b7d3335074d712c35cef9d7828a271b
2014-11-12Fix common typos. No automatic tools. Handmade…Andrea Gelmini
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
generated by cgit (git 2.34.1) at 2024-06-14 22:41:02 +0000