From 2b4fd2c89a38ccac13c72f2e94501a8702e7da4b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 6 Nov 2012 12:12:33 +0000 Subject: re-base on ALv2 code. Includes: Patches contributed by Pedro Giffuni: Avoid some uses of non portable #!/bin/bash in shell scripts. http://svn.apache.org/viewvc?view=revision&revision=1235297 Reduce the dependencies on non standard GNU copy. http://svn.apache.org/viewvc?view=revision&revision=1238684 Correct /usr/bin/env path. http://svn.apache.org/viewvc?view=revision&revision=1235619 Complex Toolbar Controls Extension from the SDK Patches contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revision&revision=1190390 i118615 - make epm more verbose http://svn.apache.org/viewvc?view=revision&revision=1204288 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 Patches contributed by Juergen Schmidt: jsc341: i117327: take care if no dependency node in current description exists, create one http://svn.apache.org/viewvc?view=revision&revision=1172101 jsc341: i117327: add extra extension dependency check http://svn.apache.org/viewvc?view=revision&revision=1172098 make initial branding changes http://svn.apache.org/viewvc?view=revision&revision=1231878 Patches contributed by Ingo Schmidt native373: #i117733# no linux jre installation on 64 bit systems http://svn.apache.org/viewvc?view=revision&revision=1167536 native373: ##164464# improve debian support http://svn.apache.org/viewvc?view=revision&revision=1167537 Patch contribtued by Armin Le-Grand: Changed various aspects concerning usages of old vendor names http://svn.apache.org/viewvc?view=revision&revision=1293313 fix for neon webdav, remove coinmp bits, improve odk script, cleanup & remove OS/2 conditionals, system ucpp fixes, remove OS/2 conditionals, restore our license filenames. --- postprocess/packcomponents/makefile.mk | 37 +++++++++------------- .../macosx/macosx_menubar_modification.xsl | 23 ++++++++++++-- postprocess/packregistry/makefile.mk | 35 ++++++++------------ 3 files changed, 49 insertions(+), 46 deletions(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 3d0a4937db24..a18394e47d58 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# This file is part of the LibreOffice project. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# OpenOffice.org - a multi-platform office productivity suite +# This file incorporates work covered by the following license notice: # -# This file is part of OpenOffice.org. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#***********************************************************************/ PRJ = .. PRJNAME = postprocess @@ -43,6 +34,7 @@ my_components = \ component/configmgr/source/configmgr \ component/cppcanvas/source/uno/mtfrenderer \ component/cui/util/cui \ + component/drawinglayer/drawinglayer \ component/dtrans/util/mcnttype \ component/embeddedobj/util/embobj \ component/eventattacher/source/evtatt \ @@ -98,6 +90,7 @@ my_components = \ component/svl/util/svl \ component/svtools/source/hatchwindow/hatchwindowfactory \ component/svtools/util/svt \ + component/svgio/svgio \ component/svx/util/svx \ component/svx/util/svxcore \ component/svx/util/textconversiondlgs \ @@ -167,7 +160,7 @@ my_components += \ component/desktop/source/splash/spl \ component/extensions/source/abpilot/abp \ component/extensions/source/bibliography/bib \ - component/extensions/source/config/ldap/ldapbe2 \ + component/extensions/source/config/ldap/ldapbe2 \ component/extensions/source/dbpilots/dbp \ component/extensions/source/logging/log \ component/extensions/source/propctrlr/pcr \ diff --git a/postprocess/packconfig/macosx/macosx_menubar_modification.xsl b/postprocess/packconfig/macosx/macosx_menubar_modification.xsl index 91c1d6fc2522..14a8be07c37e 100644 --- a/postprocess/packconfig/macosx/macosx_menubar_modification.xsl +++ b/postprocess/packconfig/macosx/macosx_menubar_modification.xsl @@ -1,8 +1,25 @@ - + - + diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index b0f000180890..019b1dce756a 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# This file is part of the LibreOffice project. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# OpenOffice.org - a multi-platform office productivity suite +# This file incorporates work covered by the following license notice: # -# This file is part of OpenOffice.org. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#***********************************************************************/ PRJ = .. PRJNAME = postprocess @@ -148,6 +139,7 @@ MY_FILES_main = \ $(MY_XCS)/Office/Embedding.xcs \ $(MY_XCS)/Office/Events.xcs \ $(MY_XCS)/Office/ExtendedColorScheme.xcs \ + $(MY_XCS)/Office/ExtensionDependencies.xcs \ $(MY_XCS)/Office/ExtensionManager.xcs \ $(MY_XCS)/Office/FormWizard.xcs \ $(MY_XCS)/Office/Histories.xcs \ @@ -223,6 +215,7 @@ MY_FILES_main = \ $(MY_XCU)/Office/Compatibility.xcu \ $(MY_XCU)/Office/DataAccess.xcu \ $(MY_XCU)/Office/Embedding.xcu \ + $(MY_XCU)/Office/ExtensionDependencies.xcu \ $(MY_XCU)/Office/ExtensionManager.xcu \ $(MY_XCU)/Office/FormWizard.xcu \ $(MY_XCU)/Office/Histories.xcu \ -- cgit