From f09bcddfa9bd5b2944d70014efe9bc95cfa65047 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 29 Feb 2016 13:55:45 +0100
Subject: [PATCH] scp2: move scp2 classification package to AutoInstall

Change-Id: I59afb2302b7fe891a83ca5ce7b12eca322bb7ed7
---
 Repository.mk                                 |  1 +
 scp2/InstallModule_ooo.mk                     |  1 -
 scp2/source/ooo/module_classification.scp     | 35 -------------------
 .../source/packinfo/packinfo_office.txt       | 15 --------
 4 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 scp2/source/ooo/module_classification.scp

diff --git a/Repository.mk b/Repository.mk
index 83cfeb081813..61173d380134 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -824,6 +824,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 		Pyuno/web \
 		Pyuno/mailmerge \
 	)) \
+	sfx2_classification \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 33ca0b05c0e0..d54ca2e6d0c7 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -93,7 +93,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
 		scp2/source/ooo/mingw_dlls \
 	) \
     scp2/source/ooo/module_filter \
-    scp2/source/ooo/module_classification \
     $(if $(filter-out MACOSX WNT,$(OS)), \
 		scp2/source/ooo/module_libreofficekit \
 	) \
diff --git a/scp2/source/ooo/module_classification.scp b/scp2/source/ooo/module_classification.scp
deleted file mode 100644
index 4f04d2667051..000000000000
--- a/scp2/source/ooo/module_classification.scp
+++ /dev/null
@@ -1,35 +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/.
- */
-
-#include "macros.inc"
-
-Module gid_Module_Classification
-    Name = "Classification Data";
-    Description = "Classification Data";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root_Brand;
-    Styles = (HIDDEN_ROOT);
-    Dirs = (gid_Dir_Share_Classification);
-    Files = (
-        gid_File_Dat_Sfx2ClassificationExample);
-End
-
-Directory gid_Dir_Share_Classification
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "classification";
-End
-
-File gid_File_Dat_Sfx2ClassificationExample
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Classification;
-    Name = "example.xml";
-    Styles = (PACKED);
-End
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 870d5a805e49..a097481374c8 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1162,21 +1162,6 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
-Start
-module = "gid_Module_Classification"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-classification-data"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-classification-data"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
-linuxpatchrequires = ""
-copyright = "2016 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Classification data for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
 Start
 module = "gid_Module_Reportbuilder"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-report-builder"