From 7d93f4fd7c21c525842fb4a96ec0d58fe12bf426 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 14 May 2012 13:19:24 -0500 Subject: [PATCH] Update license headers to include MPL at request of LO on IRC --- .../patches/libreoffice-trinity.diff | 443 ++++++++---------- 1 file changed, 202 insertions(+), 241 deletions(-) diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff index d9f3c95..7f158e2 100644 --- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff +++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff @@ -357,35 +357,32 @@ index e3943eb..093bfca 100644 AC_MSG_CHECKING([whether to enable KDE address book support]) diff --git a/connectivity/inc/tde_defines.h b/connectivity/inc/tde_defines.h new file mode 100644 -index 0000000..fe2d89e +index 0000000..52e610c --- /dev/null +++ b/connectivity/inc/tde_defines.h -@@ -0,0 +1,96 @@ +@@ -0,0 +1,93 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2012 Timothy Pearson ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ + * -+ * OpenOffice.org - a multi-platform office productivity suite ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. + * -+ * This file is part of OpenOffice.org. -+ * -+ * 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). ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. + * -+ * 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. ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ + @@ -459,36 +456,32 @@ index 0000000..fe2d89e +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/tde_headers.h b/connectivity/inc/tde_headers.h new file mode 100644 -index 0000000..389ecbe +index 0000000..e9ff855 --- /dev/null +++ b/connectivity/inc/tde_headers.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,94 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. -+ * Copyright 2012 Timothy Pearson -+ * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ + * -+ * 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. ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. + * -+ * 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). ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. + * -+ * 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. ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ + @@ -1377,35 +1370,31 @@ index cdcd157..3308e20 100644 gid_File_Lib_Macab_1, diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp new file mode 100644 -index 0000000..6387a57 +index 0000000..b4a7e1d --- /dev/null +++ b/scp2/source/tde/file_tde.scp -@@ -0,0 +1,37 @@ +@@ -0,0 +1,33 @@ +/************************************************************************* ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ + * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. -+ * Copyright 2011 Timothy Pearson ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. + * -+ * OpenOffice.org - a multi-platform office productivity suite ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. + * -+ * This file is part of OpenOffice.org. -+ * -+ * 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. ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ +#include "macros.inc" @@ -1420,35 +1409,32 @@ index 0000000..6387a57 +#endif diff --git a/scp2/source/tde/makefile.mk b/scp2/source/tde/makefile.mk new file mode 100644 -index 0000000..78d5728 +index 0000000..03bd0ba --- /dev/null +++ b/scp2/source/tde/makefile.mk -@@ -0,0 +1,59 @@ +@@ -0,0 +1,56 @@ +#************************************************************************* +# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2000, 2010 Oracle and/or its affiliates. -+# Copyright 2011 Timothy Pearson -+# -+# OpenOffice.org - a multi-platform office productivity suite ++# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# -+# This file is part of OpenOffice.org. ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (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.mozilla.org/MPL/ +# -+# 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. ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. +# -+# 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). ++# The Initial Developer of the Original Code is ++# Timothy Pearson (C) 2012, All Rights Reserved. +# -+# 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. ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++# instead of those above. +# +#************************************************************************* + @@ -1485,35 +1471,31 @@ index 0000000..78d5728 +.INCLUDE : target.mk diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp new file mode 100644 -index 0000000..9fdfecd +index 0000000..dcdd867 --- /dev/null +++ b/scp2/source/tde/module_tde.scp -@@ -0,0 +1,45 @@ +@@ -0,0 +1,41 @@ +/************************************************************************* ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ + * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. + * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * Copyright 2011 Timothy Pearson ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. + * -+ * This file is part of OpenOffice.org. -+ * -+ * 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. ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ + @@ -1536,35 +1518,31 @@ index 0000000..9fdfecd + diff --git a/scp2/source/tde/module_tde.ulf b/scp2/source/tde/module_tde.ulf new file mode 100644 -index 0000000..e55735f +index 0000000..65b03ba --- /dev/null +++ b/scp2/source/tde/module_tde.ulf -@@ -0,0 +1,34 @@ +@@ -0,0 +1,30 @@ +/************************************************************************* ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. -+ * Copyright 2011 Timothy Pearson -+ * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ + * -+ * 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. ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. + * -+ * 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). ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. + * -+ * 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. ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ + @@ -1619,35 +1597,32 @@ index 97127ef..0e4a704 100644 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01" diff --git a/shell/inc/tde_defines.h b/shell/inc/tde_defines.h new file mode 100644 -index 0000000..fe2d89e +index 0000000..52e610c --- /dev/null +++ b/shell/inc/tde_defines.h -@@ -0,0 +1,96 @@ +@@ -0,0 +1,93 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2012 Timothy Pearson -+ * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ + * -+ * 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. ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. + * -+ * 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). ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. + * -+ * 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. ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ + @@ -1721,36 +1696,32 @@ index 0000000..fe2d89e +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/inc/tde_headers.h b/shell/inc/tde_headers.h new file mode 100644 -index 0000000..389ecbe +index 0000000..e9ff855 --- /dev/null +++ b/shell/inc/tde_headers.h -@@ -0,0 +1,98 @@ +@@ -0,0 +1,94 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ + * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. -+ * Copyright 2012 Timothy Pearson ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. + * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. -+ * -+ * 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). ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. + * -+ * 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. ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ + @@ -2182,36 +2153,33 @@ index 0000000..8003f27 +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk new file mode 100644 -index 0000000..3f757db +index 0000000..a937dd3 --- /dev/null +++ b/vcl/Library_vclplug_tde.mk -@@ -0,0 +1,109 @@ +@@ -0,0 +1,106 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2000, 2010 Oracle and/or its affiliates. -+# Copyright 2012 Timothy Pearson -+# -+# OpenOffice.org - a multi-platform office productivity suite ++# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# -+# This file is part of OpenOffice.org. ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (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.mozilla.org/MPL/ +# -+# 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. ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. +# -+# 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). ++# The Initial Developer of the Original Code is ++# Timothy Pearson (C) 2012, All Rights Reserved. +# -+# 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. ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++# instead of those above. +# +#************************************************************************* + @@ -2340,35 +2308,32 @@ index de4ebb8..4ec9d7b 100644 DESKTOP_CDE diff --git a/vcl/inc/unx/tde/tde_defines.h b/vcl/inc/unx/tde/tde_defines.h new file mode 100644 -index 0000000..fe2d89e +index 0000000..52e610c --- /dev/null +++ b/vcl/inc/unx/tde/tde_defines.h -@@ -0,0 +1,96 @@ +@@ -0,0 +1,93 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2012 Timothy Pearson -+ * -+ * OpenOffice.org - a multi-platform office productivity suite ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ + * -+ * This file is part of OpenOffice.org. ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. + * -+ * 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. ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. + * -+ * 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. ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ + @@ -2442,36 +2407,32 @@ index 0000000..fe2d89e +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/tde/tde_headers.h b/vcl/inc/unx/tde/tde_headers.h new file mode 100644 -index 0000000..a08d166 +index 0000000..b2b1042 --- /dev/null +++ b/vcl/inc/unx/tde/tde_headers.h -@@ -0,0 +1,99 @@ +@@ -0,0 +1,95 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* -+ * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. -+ * Copyright 2012 Timothy Pearson -+ * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. -+ * -+ * 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. ++ * Version: MPL 1.1 / GPLv3+ / LGPLv3+ ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (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.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Initial Developer of the Original Code is ++ * Timothy Pearson (C) 2012, All Rights Reserved. ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or ++ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), ++ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable ++ * instead of those above. + * + ************************************************************************/ +