odfstudio: enable native Debian packaging

Define ODFStudioDev as an installer product inheriting from LibreOfficeDev and add it to the sysui product list.

Remove the stale odfstudio_branding package registration, as no corresponding package is currently provided.

This allows the native instsetoo packaging process to generate ODFStudioDev Debian packages and desktop integration.

Change-Id: I541efe6f5a686a7d4e73bc636a6ecbbc2a510f95

Repository.mk

@@ -1115,7 +1115,6 @@ $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\
 
 $(eval $(call gb_Helper_register_packages_for_install,brand,\
 	desktop_branding \
-	$(if $(ENABLE_ODFSTUDIO),odfstudio_branding) \
 	$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
 	$(if $(and $(filter-out EMSCRIPTEN HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\

instsetoo_native/util/openoffice.lst.in

@@ -118,6 +118,16 @@ LibreOfficeDev
     }
 }
 
+ODFStudioDev : LibreOfficeDev
+{
+    Settings
+    {
+        variables
+        {
+            PRODUCTNAME ODFStudioDev
+        }
+    }
+}
 LibreOffice_SDK
 {
     Settings

sysui/productlist.mk

@@ -7,12 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-PRODUCTLIST := libreoffice libreofficedev
+PRODUCTLIST := libreoffice libreofficedev odfstudiodev
 PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
 PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
 PRODUCTNAME.libreoffice := LibreOffice
 PRODUCTNAME.libreofficedev := LibreOfficeDev
+PRODUCTNAME.odfstudiodev := ODFStudioDev
 UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT)
 UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT)
+UNIXFILENAME.odfstudiodev := odfstudiodev$(PKGVERSIONSHORT)
 
 # vim: set noet sw=4 ts=4: