[Libreoffice-commits] .: 2 commits - Module_cross_tail_build.mk unodevtools/source

[Tor Lillqvist]

 Module_cross_tail_build.mk                          |    1 
 unodevtools/source/skeletonmaker/skeletoncommon.cxx |   34 ++++----------------
 2 files changed, 8 insertions(+), 27 deletions(-)

New commits:
commit 9369f5abd785a9df174c5d583d55e3fd6918b542
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Jun 6 18:58:11 2012 +0300

    unodevtools is not needed for the build platform in a cross-compilation
    
    Change-Id: If77a879178a260590be64253435b6c8adde31878

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index cc27ed1..86f87fd 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	sax \
 	shell \
 	tools \
-	unodevtools \
 	unoil \
 	unotest \
 	unotools \
commit d28f2135f12b6ea9e62027ccdb713c4758a41a13
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Jun 6 18:55:56 2012 +0300

    Nobody uses this tool, but still, update the license blurb it outputs
    
    Change-Id: Id9d767c2738d8052f2716086fb40a1b01c68d76e

diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index d9b9731..d6ce0f9 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -54,32 +54,14 @@ void printLicenseHeader(std::ostream& o, rtl::OString const & filename)
     if ( index != -1 )
         shortfilename = filename.copy(index+1);
 
-    o << "/*************************************************************************\n"
-        " *\n"
-        " * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"
-        " * \n"
-        " * Copyright 2000, 2010 Oracle and/or its affiliates.\n"
-        " *\n"
-        " * OpenOffice.org - a multi-platform office productivity suite\n"
-        " *\n"
-        " * This file is part of OpenOffice.org.\n"
-        " *\n"
-        " * OpenOffice.org is free software: you can redistribute it and/or modify\n"
-        " * it under the terms of the GNU Lesser General Public License version 3\n"
-        " * only, as published by the Free Software Foundation.\n"
-        " *\n"
-        " * OpenOffice.org is distributed in the hope that it will be useful,\n"
-        " * but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        " * GNU Lesser General Public License version 3 for more details\n"
-        " * (a copy is included in the LICENSE file that accompanied this code).\n"
-        " *\n"
-        " * You should have received a copy of the GNU Lesser General Public License\n"
-        " * version 3 along with OpenOffice.org.  If not, see\n"
-        " * <http://www.openoffice.org/license.html>\n"
-        " * for a copy of the LGPLv3 License.\n"
-        " *\n"
-        " ************************************************************************/\n\n";
+    o << "/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */\n"
+         "/*\n"
+         " * Copyright 2012 LibreOffice contributors.\n"
+         " *\n"
+         " * This Source Code Form is subject to the terms of the Mozilla Public\n"
+         " * License, v. 2.0. If a copy of the MPL was not distributed with this\n"
+         " * file, You can obtain one at http://mozilla.org/MPL/2.0/.\n"
+         " */\n\n";
 }
 
 bool getOutputStream(ProgramOptions const & options,