[cp] new versioning scheme: 21.05.x.y

Change-Id: I0596602ad33ea2f4d1291c84caaeb121a4fcb21a

7 files changed, 29 insertions, 29 deletions

diff --git a/configure.ac b/configure.ac
index 7eaf7dbee749..51933e069255 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([Collabora Office],[2021.0.0.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.05.1.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
@@ -441,7 +441,7 @@ test -n "$LIBO_VERSION_SUFFIX" && LIBO_VERSION_SUFFIX=".$LIBO_VERSION_SUFFIX"
 # CFBundleShortVersionString at
 # https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring
 
-MACOSX_BUNDLE_SHORTVERSION=$LIBO_VERSION_MAJOR.$LIBO_VERSION_PATCH
+MACOSX_BUNDLE_SHORTVERSION=$LIBO_VERSION_MAJOR.$LIBO_VERSION_MINOR.`expr $LIBO_VERSION_MICRO '*' 1000 + $LIBO_VERSION_PATCH`
 MACOSX_BUNDLE_VERSION=$MACOSX_BUNDLE_SHORTVERSION
 
 AC_SUBST(LIBO_VERSION_MAJOR)
@@ -465,7 +465,7 @@ dnl ===================================================================
 dnl Product version
 dnl ===================================================================
 AC_MSG_CHECKING([for product version])
-PRODUCTVERSION="$LIBO_VERSION_MAJOR"
+PRODUCTVERSION="$LIBO_VERSION_MAJOR.$LIBO_VERSION_MINOR"
 AC_MSG_RESULT([$PRODUCTVERSION])
 AC_SUBST(PRODUCTVERSION)
 
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 4c60da2814c7..a83be274ff4b 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -157,7 +157,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do
 			$(if $(PFXFILE),-f $(PFXFILE)) \
 			$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
 			$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
-			-d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH) \
+			-d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) \
 			$(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)/msi/install/*/*.msi \
 	&& touch $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
@@ -171,7 +171,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin
 			$(if $(PFXFILE),-f $(PFXFILE)) \
 			$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
 			$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
-			-d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH)\ Helppack \
+			-d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)\ Helppack \
 			$(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)_helppack/msi/install/*/*.msi \
 	&& touch $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
@@ -185,7 +185,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.don
 			$(if $(PFXFILE),-f $(PFXFILE)) \
 			$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
 			$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
-			-d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH)\ SDK \
+			-d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)\ SDK \
 			$(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)_SDK/msi/install/*/*.msi \
 	&& touch $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 232c4b5a1309..ff4dca17b084 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -5,11 +5,11 @@ Globals
         variables
         {
             LIBO_VERSION_MAJOR @LIBO_VERSION_MAJOR@
-            UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_PATCH@
+            UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 4.1
             WINDOWSBASISROOTNAME Collabora Office
-            UNIXBASISROOTNAME collaboraoffice@LIBO_VERSION_MAJOR@
+            UNIXBASISROOTNAME collaboraoffice
             HIDELICENSEDIALOG 0
             PACKAGEPREFIX
             BASISPACKAGEPREFIX collaboraofficebasis
@@ -30,7 +30,7 @@ Globals
             CREATE_MSP_INSTALLSET 0
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
             PACKAGEMAP package_names.txt,package_names_ext.txt
-            WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
+            WINDOWSPATCHLEVEL @LIBO_VERSION_MICRO@
             OOOVENDOR Collabora Productivity Ltd.
             64BITPRODUCT @WINDOWS_X64@
             WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@
@@ -46,21 +46,21 @@ CollaboraOffice
         variables
         {
             PRODUCTNAME Collabora Office
-            PRODUCTVERSION @LIBO_VERSION_MAJOR@
-            PRODUCTEXTENSION -@LIBO_VERSION_PATCH@
+            PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+            PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@
             POSTVERSIONEXTENSION
             BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
-            BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@
+            BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@-@LIBO_VERSION_PATCH@
+            ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@
             ABOUTBOXPRODUCTVERSIONSUFFIX
-            BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@
+            BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             PCPFILENAME libreoffice.pcp
             UPDATEURL https://update.libreoffice.org/check.php
             ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
             ADDSYSTEMINTEGRATION 1
-            PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_PATCH@
-            PACKAGEREVISION {buildid}
+            PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@
+            PACKAGEREVISION @LIBO_VERSION_PATCH@
             LICENSENAME LGPL
             ROOTMODULEGID gid_Module_Root
             GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 52fd881c6ea0..5dc49f597281 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -555,7 +555,7 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(l
 #
 
 postprocess_main_SED := \
-	-e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_PATCH),g' \
+	-e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \
 	-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' \
 	-e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(subst $(COMMA),\x2c,$(OOO_VENDOR)),The Document Foundation),g' \
 	-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index 4904e9c09386..bb3b41e768a8 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -45,7 +45,7 @@ endif
 
 readlicense_oo_README_SED := \
 	-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
-	-e 's,$${PRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_PATCH),g' \
+	-e 's,$${PRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR),g' \
 
 $(readlicense_oo_DIR)/$(call gb_README,%) : \
 		$(SRCDIR)/readlicense_oo/docs/readme.xsl \
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 44afba7233ee..e2ff8edb595f 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -21,10 +21,10 @@ $(foreach product,$(PRODUCTLIST),\
 	$(product)/DEBIAN/postinst \
 	$(product)/DEBIAN/postrm \
 	$(product)/DEBIAN/prerm \
-	$(product)$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb) \
+	$(product)-freedesktop-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb) \
 ))
 
-$(deb_WORKDIR)/%-desktop-integration.tar.gz: $(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb
+$(deb_WORKDIR)/%-desktop-integration.tar.gz: $(deb_WORKDIR)/%-freedesktop-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb
 	fakeroot $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@
 
 $(deb_WORKDIR)/%/DEBIAN/postrm: $(deb_SRCDIR)/postrm
@@ -47,19 +47,19 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge
 		KDEMAINDIR=/usr \
 		PREFIXDIR=/usr \
 		./create_tree.sh
-	sed $(deb_SRCDIR)/openoffice.org-debian-menus \
+	sed $(deb_SRCDIR)/openoffice.org-freedesktop-menus \
 		-e 's/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
 		-e 's/%PREFIX/$(UNIXFILENAME.$*)/' \
 		-e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \
-		> $(deb_WORKDIR)/$*/usr/lib/menu/$*$(PKGVERSIONSHORT)
-	echo "Package: $*$(PKGVERSIONSHORT)-debian-menus" >$@
+		> $(deb_WORKDIR)/$*/usr/lib/menu/$*
+	echo "Package: $*-freedesktop-menus" >$@
 	cat $< | tr -d "\015" | \
 		sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
 		>> $@
 	echo "Version: $(PKGVERSION)-$(LIBO_VERSION_PATCH)" >>$@
 	du -k -s $(deb_WORKDIR)/$* | $(gb_AWK) -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >>$@
 
-$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb: $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst $(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control
+$(deb_WORKDIR)/%-freedesktop-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb: $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst $(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control
 
 	chmod -R g-w $(deb_WORKDIR)/$*
 	chmod a+rx $(deb_WORKDIR)/$*/DEBIAN \
diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index a76b4161e2af..cb8ed05fe10f 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -15,10 +15,10 @@ rpm_SRCDIR := $(SRCDIR)/sysui/desktop
 RPMDISTROS := freedesktop
 
 define rpm_register_target
-$(call gb_CustomTarget_get_target,sysui/rpm): $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
+$(call gb_CustomTarget_get_target,sysui/rpm): $(rpm_WORKDIR)/$(1)/$(1)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
 
-$(rpm_WORKDIR)/$(1)-desktop-integration.tar.gz: $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
-$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm : \
+$(rpm_WORKDIR)/$(1)-desktop-integration.tar.gz: $(rpm_WORKDIR)/$(1)/$(1)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
+$(rpm_WORKDIR)/$(1)/$(1)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm : \
 		$(rpm_SRCDIR)/$(2)/$(2)-menus.spec \
 		$(call gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh \
 		| $(rpm_WORKDIR)/$(1)/.dir
@@ -29,7 +29,7 @@ $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSI
 			--define "_rpmdir $(rpm_WORKDIR)/$(1)" \
 			--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
 			--define "productname $(PRODUCTNAME.$(1))" \
-			--define "pkgprefix $(1)$(PKGVERSIONSHORT)" \
+			--define "pkgprefix $(1)" \
 			--define "unixfilename $(UNIXFILENAME.$(1))" \
 			--define "productversion $(PRODUCTVERSION)" \
 			--define "iconprefix $(UNIXFILENAME.$(1))" \
@@ -54,6 +54,6 @@ $(foreach product,$(PRODUCTLIST),\
 ))
 
 $(rpm_WORKDIR)/%-desktop-integration.tar.gz:
-	fakeroot $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@
+	fakeroot $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@
 
 # vim: set noet sw=4 ts=4: