[Libreoffice-commits] .: 2 commits - odk/pack odk/util offapi/com offapi/type_reference offapi/UnoApi_offapi.mk python3/ExternalPackage_python3.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 28 14:52:37 PST 2012


 odk/pack/gendocu/uno/package-list                    |    1 
 odk/util/check.pl                                    |    1 
 offapi/UnoApi_offapi.mk                              |   34 -----
 offapi/com/sun/star/modules.idl                      |    3 
 offapi/com/sun/star/setup/ActionType.idl             |   61 ----------
 offapi/com/sun/star/setup/BaseAction.idl             |   40 ------
 offapi/com/sun/star/setup/CopyFileAction.idl         |   53 ---------
 offapi/com/sun/star/setup/DeleteDirAction.idl        |   36 ------
 offapi/com/sun/star/setup/DeleteFileAction.idl       |   49 --------
 offapi/com/sun/star/setup/DeleteFolderAction.idl     |   36 ------
 offapi/com/sun/star/setup/DeleteFolderItemAction.idl |   39 ------
 offapi/com/sun/star/setup/DownloadAction.idl         |   42 -------
 offapi/com/sun/star/setup/FontAction.idl             |   42 -------
 offapi/com/sun/star/setup/InstallEnvironment.idl     |  110 -------------------
 offapi/com/sun/star/setup/InstallResponse.idl        |   48 --------
 offapi/com/sun/star/setup/InstallType.idl            |   55 ---------
 offapi/com/sun/star/setup/MakeDirAction.idl          |   39 ------
 offapi/com/sun/star/setup/MakeFolderAction.idl       |   39 ------
 offapi/com/sun/star/setup/MakeFolderItemAction.idl   |   48 --------
 offapi/com/sun/star/setup/MakeShortcutAction.idl     |   45 -------
 offapi/com/sun/star/setup/MirrorEntry.idl            |   40 ------
 offapi/com/sun/star/setup/ModuleInfo.idl             |   64 -----------
 offapi/com/sun/star/setup/ModuleState.idl            |   40 ------
 offapi/com/sun/star/setup/OSType.idl                 |   68 -----------
 offapi/com/sun/star/setup/ProductRegistration.idl    |   82 --------------
 offapi/com/sun/star/setup/ProfileItemAction.idl      |   48 --------
 offapi/com/sun/star/setup/ResponseErrorCode.idl      |   38 ------
 offapi/com/sun/star/setup/Setup.idl                  |   32 -----
 offapi/com/sun/star/setup/SizeInfo.idl               |   43 -------
 offapi/com/sun/star/setup/UnzipAction.idl            |   59 ----------
 offapi/com/sun/star/setup/UpdateType.idl             |   43 -------
 offapi/com/sun/star/setup/VersionIdentifier.idl      |   51 --------
 offapi/com/sun/star/setup/WindowsRegistryAction.idl  |   54 ---------
 offapi/com/sun/star/setup/XSetup.idl                 |   99 -----------------
 offapi/type_reference/types.rdb                      |binary
 python3/ExternalPackage_python3.mk                   |  110 +++++++++----------
 36 files changed, 55 insertions(+), 1637 deletions(-)

New commits:
commit 2787c0cf72bd1d33bb7feec4e3370d89bf9a5347
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 28 23:36:49 2012 +0100

    API CHANGE: remove com.sun.star.setup module
    
    This module was deprecated 10 years ago; the only thing in it that was
    actually used recently in OpenOffice.org is the ProductRegistration
    service, but the implementation of that has been removed since it
    is of no use to LibreOffice.
    
    WARNING: could not open key "/UCR/com/sun/star/setup/FontAction" in
    registry "/master/offapi/type_reference/types.rdb"
    EXISTENCE: module "/UCR/com/sun/star/setup" with published children
    exists only in registry 1
    
    Change-Id: I0c2809271eb46f6f9a125c5c88e4ec76a6c01551

diff --git a/odk/pack/gendocu/uno/package-list b/odk/pack/gendocu/uno/package-list
index 94e852b..7ed2072 100644
--- a/odk/pack/gendocu/uno/package-list
+++ b/odk/pack/gendocu/uno/package-list
@@ -32,7 +32,6 @@ com.sun.star.sdb
 com.sun.star.sdbc
 com.sun.star.sdbcx
 com.sun.star.security
-com.sun.star.setup
 com.sun.star.sheet
 com.sun.star.stoc
 com.sun.star.style
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 9109986..4d53a79 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -305,7 +305,6 @@ if (-d "$StartDir") {
                 "sdbc",
                 "sdbcx",
                 "security",
-                "setup",
                 "sheet",
                 "smarttags",
                 "style",
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 55d9693..dd22cee 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1056,10 +1056,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
 	View \
 	ViewDescriptor \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\
-	ProductRegistration \
-	Setup \
-))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
 	AccessibleCell \
 	AccessibleCsvCell \
@@ -3264,36 +3260,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\
 	XSanExtension \
 	XSerialNumberAdapter \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/setup,\
-	ActionType \
-	BaseAction \
-	CopyFileAction \
-	DeleteDirAction \
-	DeleteFileAction \
-	DeleteFolderAction \
-	DeleteFolderItemAction \
-	DownloadAction \
-	FontAction \
-	InstallEnvironment \
-	InstallResponse \
-	InstallType \
-	MakeDirAction \
-	MakeFolderAction \
-	MakeFolderItemAction \
-	MakeShortcutAction \
-	MirrorEntry \
-	ModuleInfo \
-	ModuleState \
-	OSType \
-	ProfileItemAction \
-	ResponseErrorCode \
-	SizeInfo \
-	UnzipAction \
-	UpdateType \
-	VersionIdentifier \
-	WindowsRegistryAction \
-	XSetup \
-))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
 	ActivationEvent \
 	AddressConvention \
diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index 4582618..ed3b1a8 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -148,9 +148,6 @@ module sdbc {};
 /// High-level database component interfaces.
 module sdbcx {};
 
-/// Interfaces to control the setup process.
-module setup {};
-
 /// Spreadsheet specific interfaces.
 module sheet {};
 
diff --git a/offapi/com/sun/star/setup/ActionType.idl b/offapi/com/sun/star/setup/ActionType.idl
deleted file mode 100644
index 356c276..0000000
--- a/offapi/com/sun/star/setup/ActionType.idl
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_ActionType_idl__
-#define __com_sun_star_setup_ActionType_idl__
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published enum ActionType
-{
-    INVALID,
-
-    DOWNLOAD,
-
-    MAKEDIR,
-
-    DELETEDIR,
-
-    COPYFILE,
-
-    UNZIPFILE,
-
-    DELETEFILE,
-
-    MAKEFOLDER,
-
-    MAKEFOLDERITEM,
-
-    DELETEFOLDER,
-
-    DELETEFOLDERITEM,
-
-    PROFILEITEM,
-
-    FONT,
-
-    CREATESHORTCUT,
-
-    WINREGISTRY
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/BaseAction.idl b/offapi/com/sun/star/setup/BaseAction.idl
deleted file mode 100644
index ca92ac2..0000000
--- a/offapi/com/sun/star/setup/BaseAction.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_BaseAction_idl__
-#define __com_sun_star_setup_BaseAction_idl__
-
-#include <com/sun/star/setup/ActionType.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct BaseAction
-{
-    // DocMerge: empty anyway
-    ActionType                  eType;
-
-    // DocMerge: empty anyway
-    boolean                     bDone;
-    boolean                     bProcess;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/CopyFileAction.idl b/offapi/com/sun/star/setup/CopyFileAction.idl
deleted file mode 100644
index a83355a..0000000
--- a/offapi/com/sun/star/setup/CopyFileAction.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_CopyFileAction_idl__
-#define __com_sun_star_setup_CopyFileAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-#include <com/sun/star/util/DateTime.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct CopyFileAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strSourceFilename;
-
-    // DocMerge: empty anyway
-    string              strDestinationFilename;
-
-    // DocMerge: empty anyway
-    boolean             bUnoComponent;
-    boolean             bActiveX;
-
-    // DocMerge: empty anyway
-    boolean             bOverwrite;
-
-    // DocMerge: empty anyway
-    com::sun::star::util::DateTime aDateTime;
-
-    // DocMerge: empty anyway
-    long                nRights;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/DeleteDirAction.idl b/offapi/com/sun/star/setup/DeleteDirAction.idl
deleted file mode 100644
index 46346bf..0000000
--- a/offapi/com/sun/star/setup/DeleteDirAction.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_DeleteDirAction_idl__
-#define __com_sun_star_setup_DeleteDirAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct DeleteDirAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string          strDirname;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/DeleteFileAction.idl b/offapi/com/sun/star/setup/DeleteFileAction.idl
deleted file mode 100644
index 428e24b..0000000
--- a/offapi/com/sun/star/setup/DeleteFileAction.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_DeleteFileAction_idl__
-#define __com_sun_star_setup_DeleteFileAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-#include <com/sun/star/util/DateTime.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct DeleteFileAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strDestinationPath;
-
-    // DocMerge: empty anyway
-    string              strPattern;
-
-    // DocMerge: empty anyway
-    boolean             bUnoComponent;
-    boolean             bActiveX;
-
-    boolean             bTestDate;
-
-    // DocMerge: empty anyway
-    com::sun::star::util::DateTime aDateTime;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/DeleteFolderAction.idl b/offapi/com/sun/star/setup/DeleteFolderAction.idl
deleted file mode 100644
index 829c740..0000000
--- a/offapi/com/sun/star/setup/DeleteFolderAction.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_DeleteFolderAction_idl__
-#define __com_sun_star_setup_DeleteFolderAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct DeleteFolderAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strFoldername;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl b/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
deleted file mode 100644
index b2a0dde..0000000
--- a/offapi/com/sun/star/setup/DeleteFolderItemAction.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_DeleteFolderItemAction_idl__
-#define __com_sun_star_setup_DeleteFolderItemAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct DeleteFolderItemAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strFoldername;
-
-    // DocMerge: empty anyway
-    string              strItemname;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/DownloadAction.idl b/offapi/com/sun/star/setup/DownloadAction.idl
deleted file mode 100644
index c6eb380..0000000
--- a/offapi/com/sun/star/setup/DownloadAction.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_DownloadAction_idl__
-#define __com_sun_star_setup_DownloadAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct DownloadAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string          strFilename;
-
-    // DocMerge: empty anyway
-    long            nSizeKB;
-
-    // DocMerge: empty anyway
-    long            nCRC;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/FontAction.idl b/offapi/com/sun/star/setup/FontAction.idl
deleted file mode 100644
index 7acb0ac..0000000
--- a/offapi/com/sun/star/setup/FontAction.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_FontAction_idl__
-#define __com_sun_star_setup_FontAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct FontAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strFontFilename;
-
-    // DocMerge: empty anyway
-    string              strFontname;
-
-    // DocMerge: empty anyway
-    boolean             bCreate;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/InstallEnvironment.idl b/offapi/com/sun/star/setup/InstallEnvironment.idl
deleted file mode 100644
index f704e0e..0000000
--- a/offapi/com/sun/star/setup/InstallEnvironment.idl
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_InstallEnvironment_idl__
-#define __com_sun_star_setup_InstallEnvironment_idl__
-
-#include <com/sun/star/setup/OSType.idl>
-#include <com/sun/star/setup/ModuleState.idl>
-#include <com/sun/star/setup/InstallType.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct InstallEnvironment
-{
-    // DocMerge: empty anyway
-    OSType                      eOSType;
-
-    // DocMerge: empty anyway
-    InstallType                 eInstallType;
-
-    // DocMerge: empty anyway
-    string                      strDestinationPath;
-
-    // DocMerge: empty anyway
-     long                       nClusterSize;
-
-    // DocMerge: empty anyway
-    long                        nDriveSize;
-
-    // DocMerge: empty anyway
-    sequence <short>            seqLanguages;
-
-    // DocMerge: empty anyway
-    sequence <short>            seqSwitchLanguages;
-
-    // DocMerge: empty anyway
-    sequence <ModuleState>      seqModuleIDList;
-
-    // DocMerge: empty anyway
-    string                      strUserName;
-
-    // DocMerge: empty anyway
-    string                      strUserFirstName;
-
-    // DocMerge: empty anyway
-    string                      strUserId;
-
-    // DocMerge: empty anyway
-    string                      strCompanyname;
-
-    // DocMerge: empty anyway
-    string                      strStreet;
-
-    // DocMerge: empty anyway
-    string                      strCountry;
-
-    // DocMerge: empty anyway
-    string                      strZip;
-
-    // DocMerge: empty anyway
-    string                      strCity;
-
-    // DocMerge: empty anyway
-    string                      strTitle;
-
-    // DocMerge: empty anyway
-    string                      strPosition;
-
-    // DocMerge: empty anyway
-    string                      strPhonePriv;
-
-    // DocMerge: empty anyway
-    string                      strPhoneCompany;
-
-    // DocMerge: empty anyway
-    string                      strPhoneFax;
-
-    // DocMerge: empty anyway
-    string                      strEmail;
-
-    // DocMerge: empty anyway
-    string                      strState;
-
-    // DocMerge: empty anyway
-    string                      strFatherName;
-
-    // DocMerge: empty anyway
-    string                      strApartmentNr;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/InstallResponse.idl b/offapi/com/sun/star/setup/InstallResponse.idl
deleted file mode 100644
index 848edee..0000000
--- a/offapi/com/sun/star/setup/InstallResponse.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_InstallResponse_idl__
-#define __com_sun_star_setup_InstallResponse_idl__
-
-#include <com/sun/star/setup/ResponseErrorCode.idl>
-
-module com {  module sun {  module star {  module setup {
-
-// DocMerge: empty anyway
-published struct InstallResponse
-{
-    // DocMerge: empty anyway
-    boolean             bSuccess;
-
-    // DocMerge: empty anyway
-    ResponseErrorCode   eErrorCode;
-
-    // DocMerge: empty anyway
-    long                nSizeNeeded;
-
-    // DocMerge: empty anyway
-    boolean             bReboot;
-
-    // DocMerge: empty anyway
-    boolean             bLogout;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/InstallType.idl b/offapi/com/sun/star/setup/InstallType.idl
deleted file mode 100644
index 50e51aa..0000000
--- a/offapi/com/sun/star/setup/InstallType.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_InstallType_idl__
-#define __com_sun_star_setup_InstallType_idl__
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published enum InstallType
-{
-    // DocMerge: empty anyway
-    INVALID,
-
-    // DocMerge: empty anyway
-    INSTALL,
-
-    // DocMerge: empty anyway
-    FULLINSTALL,
-
-    // DocMerge: empty anyway
-    CHANGE,
-
-    // DocMerge: empty anyway
-    REPAIR,
-
-    // DocMerge: empty anyway
-    DELETE,
-
-    // DocMerge: empty anyway
-    FULLDELETE,
-
-    // DocMerge: empty anyway
-    UPDATE
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/MakeDirAction.idl b/offapi/com/sun/star/setup/MakeDirAction.idl
deleted file mode 100644
index b857ac2..0000000
--- a/offapi/com/sun/star/setup/MakeDirAction.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_MakeDirAction_idl__
-#define __com_sun_star_setup_MakeDirAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct MakeDirAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string          strDirname;
-
-    // DocMerge: empty anyway
-    long            nRights;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/MakeFolderAction.idl b/offapi/com/sun/star/setup/MakeFolderAction.idl
deleted file mode 100644
index 5c29e38..0000000
--- a/offapi/com/sun/star/setup/MakeFolderAction.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_MakeFolderAction_idl__
-#define __com_sun_star_setup_MakeFolderAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct MakeFolderAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strFoldername;
-
-    // DocMerge: empty anyway
-    boolean             bUserFolder;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/MakeFolderItemAction.idl b/offapi/com/sun/star/setup/MakeFolderItemAction.idl
deleted file mode 100644
index ba8215c..0000000
--- a/offapi/com/sun/star/setup/MakeFolderItemAction.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_MakeFolderItemAction_idl__
-#define __com_sun_star_setup_MakeFolderItemAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct MakeFolderItemAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strFoldername;
-
-    // DocMerge: empty anyway
-    string              strItemname;
-
-    // DocMerge: empty anyway
-    string              strDestinationPath;
-
-    // DocMerge: empty anyway
-    string              strDestinationExecutable;
-
-    // DocMerge: empty anyway
-    string              strParameter;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/MakeShortcutAction.idl b/offapi/com/sun/star/setup/MakeShortcutAction.idl
deleted file mode 100644
index 912220d..0000000
--- a/offapi/com/sun/star/setup/MakeShortcutAction.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_MakeShortcutAction_idl__
-#define __com_sun_star_setup_MakeShortcutAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct MakeShortcutAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strSource;
-
-    // DocMerge: empty anyway
-    string              strDestination;
-
-    // DocMerge: empty anyway
-    string              strPath;
-
-    // DocMerge: empty anyway
-    string              strDescription;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/MirrorEntry.idl b/offapi/com/sun/star/setup/MirrorEntry.idl
deleted file mode 100644
index 9956428..0000000
--- a/offapi/com/sun/star/setup/MirrorEntry.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_MirrorEntry_idl__
-#define __com_sun_star_setup_MirrorEntry_idl__
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct MirrorEntry
-{
-    // DocMerge: empty anyway
-    string          strDisplayname;
-
-    // DocMerge: empty anyway
-    string          strPath;
-
-    // DocMerge: empty anyway
-    short           nQuality;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/ModuleInfo.idl b/offapi/com/sun/star/setup/ModuleInfo.idl
deleted file mode 100644
index d7dfd8f..0000000
--- a/offapi/com/sun/star/setup/ModuleInfo.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_ModuleInfo_idl__
-#define __com_sun_star_setup_ModuleInfo_idl__
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct ModuleInfo
-{
-    // DocMerge: empty anyway
-    string                      strID;
-
-    // DocMerge: empty anyway
-    string                      strName;
-
-    // DocMerge: empty anyway
-    string                      strDescription;
-
-    // DocMerge: empty anyway
-    string                      strOnSelect;
-
-    // DocMerge: empty anyway
-    string                      strOnDeselect;
-
-    // DocMerge: empty anyway
-    boolean                     isMinimal;
-
-    // DocMerge: empty anyway
-    boolean                     isDefault;
-
-    // DocMerge: empty anyway
-    boolean                     isHiddenRoot;
-
-    // DocMerge: empty anyway
-    boolean                     isDontSelectByUser;
-
-    // DocMerge: empty anyway
-    long                        nSizeKB;
-
-    // DocMerge: empty anyway
-    sequence < any >            seqSubModules;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/ModuleState.idl b/offapi/com/sun/star/setup/ModuleState.idl
deleted file mode 100644
index eff7db2..0000000
--- a/offapi/com/sun/star/setup/ModuleState.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_ModuleState_idl__
-#define __com_sun_star_setup_ModuleState_idl__
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct ModuleState
-{
-    // DocMerge: empty anyway
-    string                      strID;
-
-    // DocMerge: empty anyway
-    boolean                     isSelected;
-
-    // DocMerge: empty anyway
-    boolean                     isInstalled;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/OSType.idl b/offapi/com/sun/star/setup/OSType.idl
deleted file mode 100644
index 17c18a8..0000000
--- a/offapi/com/sun/star/setup/OSType.idl
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_OSType_idl__
-#define __com_sun_star_setup_OSType_idl__
-
-// dear porters: please do not apply any patches for new platforms here
-//               it deprecated anyway and any patches will cause API
-//       incompatibility errors  mh
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published enum OSType
-{
-    // DocMerge: empty anyway
-    INVALID,
-
-    // DocMerge: empty anyway
-    WIN,
-
-    // DocMerge: empty anyway
-    OS2,
-
-    // DocMerge: empty anyway
-    MAC,
-
-    // DocMerge: empty anyway
-    UNIX_SOLS,
-
-    // DocMerge: empty anyway
-    UNIX_SOLI,
-
-    // DocMerge: empty anyway
-    UNIX_LINUX,
-
-    // DocMerge: empty anyway
-    UNIX_HP,
-
-    // DocMerge: empty anyway
-    UNIX_SCO,
-
-    // DocMerge: empty anyway
-    UNIX_SOLSG,
-
-    // DocMerge: empty anyway
-    UNIX_SOLIG
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/ProductRegistration.idl b/offapi/com/sun/star/setup/ProductRegistration.idl
deleted file mode 100644
index 3dbdf57..0000000
--- a/offapi/com/sun/star/setup/ProductRegistration.idl
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#ifndef __com_sun_star_setup_ProductRegistration_idl__
-#define __com_sun_star_setup_ProductRegistration_idl__
-
-#include <com/sun/star/task/JobExecutor.idl>
-#include <com/sun/star/task/XJob.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/** provides a mechanism for registering the product.
-
-    <p>Two main functionalities are covered by this service:
-    <ul><il><em>Triggering Online Registration</em><br/>
-            If, by any user interface of your choice, the user tells she wants to register
-            their product copy, ProductRegistration is the service of your choice.
-        </il><br/>
-        <il><em>Executing Registration Requests</em><br/>
-            ProductRegistration allows to remind your users to register, using a dialog with various
-            choices.
-        </il>
-    </ul></p>
-
-    @since OOo 1.1.2
-*/
-published service ProductRegistration
-{
-    /** allows to trigger certain events.
-
-        <p>The string argument of <method scope="com::sun::star::task">XJobExecutor::trigger</method> is
-            used to determine the type of the event. Currently supported events are:<br/>
-            <ul><li><b>RegistrationRequired</b><br/>
-                    Determines that the registration is required to be executed.<br/>
-                    This is usually triggered by some user interaction, for instance upon choosing a menu item
-                    called <em>Registration</em>.</p>
-                </li>
-            </ul>
-        </p>
-    */
-    service com::sun::star::task::JobExecutor;
-
-    /** allows the registration request to be scheduled automatically.
-
-        <p>There are processes which allow to schedule events and jobs, for instance there
-        can be configuration settings scheduling which operations are to be executed upon an program
-        startup. Such processes usually require the jobs to be executed to support the
-        <type scope="com::sun::star::task">XJob</type> interface.</p>
-
-        <p>That's why this service supports the <type scope="com::sun::star::task">XJob</type>, too.<br/>
-        Calling the <method scope="com::sun::star::task">XJob::execute</method> method results in displaying a
-        dialog which asks the user to register. This is done once per session, means you need to restart the
-        process which called this.</p>
-
-        <p>At the moment, there is no specification about how to use the arguments given in the
-        <method scope="com::sun::star::task">XJob::execute</method> method, but this may change in future versions of the service
-        descriptions, so to keep your implementation compatible, you should not use these arguments.</p>
-    */
-    interface com::sun::star::task::XJob;
-};
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/ProfileItemAction.idl b/offapi/com/sun/star/setup/ProfileItemAction.idl
deleted file mode 100644
index f8a8c55..0000000
--- a/offapi/com/sun/star/setup/ProfileItemAction.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_ProfileItemAction_idl__
-#define __com_sun_star_setup_ProfileItemAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct ProfileItemAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strProfilename;
-
-    // DocMerge: empty anyway
-    string              strSection;
-
-    // DocMerge: empty anyway
-    string              strKey;
-
-    // DocMerge: empty anyway
-    string              strValue;
-
-    // DocMerge: empty anyway
-    boolean             bCreate;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/ResponseErrorCode.idl b/offapi/com/sun/star/setup/ResponseErrorCode.idl
deleted file mode 100644
index 1e22992..0000000
--- a/offapi/com/sun/star/setup/ResponseErrorCode.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_ResponseErrorCode_idl__
-#define __com_sun_star_setup_ResponseErrorCode_idl__
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published enum ResponseErrorCode
-{
-    // DocMerge: empty anyway
-    NOERROR,
-
-    // DocMerge: empty anyway
-    NOT_ENOUGH_SPACE
-};
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/Setup.idl b/offapi/com/sun/star/setup/Setup.idl
deleted file mode 100644
index feba867..0000000
--- a/offapi/com/sun/star/setup/Setup.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_Setup_idl__
-#define __com_sun_star_setup_Setup_idl__
-
-#include <com/sun/star/setup/XSetup.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published service Setup : com::sun::star::setup::XSetup;
-
-}; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/SizeInfo.idl b/offapi/com/sun/star/setup/SizeInfo.idl
deleted file mode 100644
index 5854384..0000000
--- a/offapi/com/sun/star/setup/SizeInfo.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_SizeInfo_idl__
-#define __com_sun_star_setup_SizeInfo_idl__
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct SizeInfo
-{
-    // DocMerge: empty anyway
-    long                        nNormalSizeKB;
-
-    // DocMerge: empty anyway
-    long                        nNormalTempSizeKB;
-
-    // DocMerge: empty anyway
-    long                        nMinimalSizeKB;
-
-    // DocMerge: empty anyway
-    long                        nMinimalTempSizeKB;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/UnzipAction.idl b/offapi/com/sun/star/setup/UnzipAction.idl
deleted file mode 100644
index 30a556b..0000000
--- a/offapi/com/sun/star/setup/UnzipAction.idl
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_UnzipAction_idl__
-#define __com_sun_star_setup_UnzipAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-#include <com/sun/star/util/DateTime.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct UnzipAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string              strSourceFilename;
-
-    // DocMerge: empty anyway
-    string              strDestinationPath;
-
-    // DocMerge: empty anyway
-    string              strPattern;
-
-    // DocMerge: empty anyway
-    boolean             bUnoComponent;
-    boolean             bActiveX;
-
-    // DocMerge: empty anyway
-    boolean             bOverwrite;
-
-    // DocMerge: empty anyway
-    com::sun::star::util::DateTime aDateTime;
-
-    // DocMerge: empty anyway
-    long                nRights;
-
-    // DocMerge: empty anyway
-    sequence <string>   seqSubFiles;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/UpdateType.idl b/offapi/com/sun/star/setup/UpdateType.idl
deleted file mode 100644
index 2b0f90f..0000000
--- a/offapi/com/sun/star/setup/UpdateType.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_UpdateType_idl__
-#define __com_sun_star_setup_UpdateType_idl__
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published enum UpdateType
-{
-    // DocMerge: empty anyway
-    INVALID,
-
-    // DocMerge: empty anyway
-    EQUAL,
-
-    // DocMerge: empty anyway
-    OPTIONAL,
-
-    // DocMerge: empty anyway
-    REQUIRED
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/VersionIdentifier.idl b/offapi/com/sun/star/setup/VersionIdentifier.idl
deleted file mode 100644
index a7d746f..0000000
--- a/offapi/com/sun/star/setup/VersionIdentifier.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_VersionIdentifier_idl__
-#define __com_sun_star_setup_VersionIdentifier_idl__
-
-#include <com/sun/star/setup/OSType.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct VersionIdentifier
-{
-    // DocMerge: empty anyway
-    OSType                      eOSType;
-
-    // DocMerge: empty anyway
-    short                       nLanguage;
-
-    // DocMerge: empty anyway
-    long                        nBuildnumber;
-
-    // DocMerge: empty anyway
-    string                      strProductKey;
-
-    // DocMerge: empty anyway
-    string                      strInstLanguages;
-
-    // DocMerge: empty anyway
-    string                      strInstMinor;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/WindowsRegistryAction.idl b/offapi/com/sun/star/setup/WindowsRegistryAction.idl
deleted file mode 100644
index 21d7efa..0000000
--- a/offapi/com/sun/star/setup/WindowsRegistryAction.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_WindowsRegistryAction_idl__
-#define __com_sun_star_setup_WindowsRegistryAction_idl__
-
-#include <com/sun/star/setup/BaseAction.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published struct WindowsRegistryAction: BaseAction
-{
-    // DocMerge: empty anyway
-    string          strKey;
-
-    // DocMerge: empty anyway
-    string          strSubkey;
-
-    // DocMerge: empty anyway
-    string          strName;
-
-    // DocMerge: empty anyway
-    string          strValue;
-
-    // DocMerge: empty anyway
-    boolean         bCreate;
-
-    // DocMerge: empty anyway
-    boolean         bHexValue;
-
-    // DocMerge: empty anyway
-    boolean         bDeleteAll;
-    };
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/setup/XSetup.idl b/offapi/com/sun/star/setup/XSetup.idl
deleted file mode 100644
index ca1c3ce..0000000
--- a/offapi/com/sun/star/setup/XSetup.idl
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef __com_sun_star_setup_XSetup_idl__
-#define __com_sun_star_setup_XSetup_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/setup/OSType.idl>
-#include <com/sun/star/setup/UpdateType.idl>
-#include <com/sun/star/setup/ModuleInfo.idl>
-#include <com/sun/star/setup/InstallEnvironment.idl>
-#include <com/sun/star/setup/InstallResponse.idl>
-#include <com/sun/star/setup/VersionIdentifier.idl>
-#include <com/sun/star/setup/SizeInfo.idl>
-#include <com/sun/star/setup/MirrorEntry.idl>
-
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published interface XSetup: com::sun::star::uno::XInterface
-{
-    // DocMerge: empty anyway
-    boolean                 isVersionSupported          ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    sequence <short>        getAvailableLanguages       ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    ModuleInfo              getRootModule               ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    void                    setHiddenModule             ( [in] VersionIdentifier aVerIdentifier,
-                                                          [in] string strModuleID,
-                                                          [in] boolean bHidden );
-
-    // DocMerge: empty anyway
-    string                  getProductname              ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    string                  getVendorname               ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    string                  getDefaultDestinationPath   ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    SizeInfo                getStandardSizeValues       ( [in] VersionIdentifier aVerIdentifier,
-                                                          [in] sequence <short> seqLanguages );
-
-    // DocMerge: empty anyway
-    string                  getHelpText                 ( [in] VersionIdentifier aVerIdentifier,
-                                                          [in] string strPagename );
-
-    // DocMerge: empty anyway
-    string                  getReadmeText               ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    string                  getLicenseText              ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    string                  getNativeLocation           ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    sequence < any >        getMirrorList               ( [in] VersionIdentifier aVerIdentifier );
-
-    // DocMerge: empty anyway
-    UpdateType              isUpdateAvailable           ( [in] VersionIdentifier aVerIdentifier,
-                                                          [out] VersionIdentifier aNewVerIdentifier );
-
-    // DocMerge: empty anyway
-    boolean                 isModuleAvailable           ( [in] VersionIdentifier aVerIdentifier,
-                                                          [in] string strModuleID );
-
-    // DocMerge: empty anyway
-    sequence < any >        getActionListForInstall     ( [in] VersionIdentifier aVerIdentifier,
-                                                          [in] VersionIdentifier aOldVerIdentifier,
-                                                          [in] InstallEnvironment aEnvironment,
-                                                          [out] InstallResponse aResponse );
-    };
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 0f959fa..ef224a7 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
commit be1136a3f1bff15c96e4f6940400157f5f105ffc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 28 23:28:08 2012 +0100

    python3: use version variables instead of hardcoded number
    
    Change-Id: Ic91cab680b86d8064212e9833c81b37db2002720

diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index ef6fe42..6c3c448 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -13,10 +13,10 @@ $(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_ExternalPackage_add_file,python3,bin/python.exe,LO_lib/python.exe))
-$(eval $(call gb_ExternalPackage_add_file,python3,bin/python3.dll,LO_lib/python3.dll))
-$(eval $(call gb_ExternalPackage_add_file,python3,bin/python33.dll,LO_lib/python33.dll))
-$(eval $(call gb_ExternalPackage_add_file,python3,lib/python3.lib,LO_lib/python3.lib))
-$(eval $(call gb_ExternalPackage_add_file,python3,lib/python33.lib,LO_lib/python33.lib))
+$(eval $(call gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/python$(PYTHON_VERSION_MAJOR).dll))
+$(eval $(call gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).dll,LO_lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).dll))
+$(eval $(call gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR).lib,LO_lib/python$(PYTHON_VERSION_MAJOR).lib))
+$(eval $(call gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).lib,LO_lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).lib))
 $(eval $(call gb_ExternalPackage_add_files,python3,lib/python,\
 	LO_lib/_ctypes.pyd \
 	LO_lib/_ctypes_test.pyd \
@@ -37,11 +37,11 @@ $(eval $(call gb_ExternalPackage_add_files,python3,lib/python,\
 else ifeq ($(OS),WNT) # MinGW
 # TODO how are C modules called on this platform?
 $(eval $(call gb_ExternalPackage_add_file,python3,bin/python.exe,python.exe))
-$(eval $(call gb_ExternalPackage_add_file,python3,bin/python3.dll,python3.dll))
+$(eval $(call gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR).dll,python$(PYTHON_VERSION_MAJOR).dll))
 else
 $(eval $(call gb_ExternalPackage_add_file,python3,bin/python,python))
-$(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython3.so,libpython3.so))
-$(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython3.3m.so,libpython3.3m.so))
+$(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so))
+$(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so))
 # versioned lib/libpython3.3m.so.1.0 appears to be unnecessary?
 
 # Unfortunately the python build system does not allow to explicitly enable or
@@ -52,54 +52,54 @@ $(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython3.3m.so,libpython
 # that may not be available on baseline systems.
 
 $(eval $(call gb_ExternalPackage_add_files,python3,lib/python/lib-dynload,\
-	LO_lib/array.cpython-33m.so \
-	LO_lib/atexit.cpython-33m.so \
-	LO_lib/audioop.cpython-33m.so \
-	LO_lib/binascii.cpython-33m.so \
-	LO_lib/_bisect.cpython-33m.so \
-	LO_lib/cmath.cpython-33m.so \
-	LO_lib/_codecs_cn.cpython-33m.so \
-	LO_lib/_codecs_hk.cpython-33m.so \
-	LO_lib/_codecs_iso2022.cpython-33m.so \
-	LO_lib/_codecs_jp.cpython-33m.so \
-	LO_lib/_codecs_kr.cpython-33m.so \
-	LO_lib/_codecs_tw.cpython-33m.so \
-	LO_lib/_crypt.cpython-33m.so \
-	LO_lib/_csv.cpython-33m.so \
-	LO_lib/_ctypes.cpython-33m.so \
-	LO_lib/_ctypes_test.cpython-33m.so \
-	LO_lib/_datetime.cpython-33m.so \
-	LO_lib/_decimal.cpython-33m.so \
-	LO_lib/_elementtree.cpython-33m.so \
-	LO_lib/fcntl.cpython-33m.so \
-	LO_lib/grp.cpython-33m.so \
-	LO_lib/_hashlib.cpython-33m.so \
-	LO_lib/_heapq.cpython-33m.so \
-	LO_lib/_json.cpython-33m.so \
-	LO_lib/_lsprof.cpython-33m.so \
-	LO_lib/math.cpython-33m.so \
-	LO_lib/mmap.cpython-33m.so \
-	LO_lib/_multibytecodec.cpython-33m.so \
-	LO_lib/_multiprocessing.cpython-33m.so \
-	LO_lib/nis.cpython-33m.so \
-	LO_lib/ossaudiodev.cpython-33m.so \
-	LO_lib/parser.cpython-33m.so \
-	LO_lib/_pickle.cpython-33m.so \
-	LO_lib/_posixsubprocess.cpython-33m.so \
-	LO_lib/pyexpat.cpython-33m.so \
-	LO_lib/_random.cpython-33m.so \
-	LO_lib/resource.cpython-33m.so \
-	LO_lib/select.cpython-33m.so \
-	LO_lib/_socket.cpython-33m.so \
-	LO_lib/spwd.cpython-33m.so \
-	LO_lib/_ssl.cpython-33m.so \
-	LO_lib/_struct.cpython-33m.so \
-	LO_lib/syslog.cpython-33m.so \
-	LO_lib/termios.cpython-33m.so \
-	LO_lib/_testbuffer.cpython-33m.so \
-	LO_lib/_testcapi.cpython-33m.so \
-	LO_lib/time.cpython-33m.so \
-	LO_lib/zlib.cpython-33m.so \
+	LO_lib/array.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/atexit.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/audioop.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/binascii.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_bisect.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/cmath.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_cn.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_hk.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_iso2022.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_jp.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_kr.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_tw.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_crypt.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_csv.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_ctypes.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_ctypes_test.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_datetime.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_decimal.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/grp.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_heapq.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_json.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_lsprof.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/math.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/mmap.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_multibytecodec.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_multiprocessing.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/nis.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/ossaudiodev.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/parser.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_pickle.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_posixsubprocess.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/pyexpat.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_random.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/resource.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/select.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_struct.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/syslog.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/termios.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_testbuffer.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/time.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
 ))
 endif
 


More information about the Libreoffice-commits mailing list