[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - instsetoo_native/CustomTarget_install.mk

[Christian Lohmaier]

 instsetoo_native/CustomTarget_install.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce366b6763a2e71db9f83de0c33371955bc310ae
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jun 2 11:49:05 2014 +0200

    don't limit the 0 → 1 replacement in release to deb
    
    since there are rpm-frontends that do their own version comparison that
    is different from rpm itself.
    
    Change-Id: Iddf38c14e7f48eec5d043de57e3404fcd9da24f7
    (cherry picked from commit 3d67e273cf8b210f2f80908dfa4f50be6acbcf5c)

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 16b841c..ea03413 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -81,7 +81,7 @@ $(foreach pkgformat,$(5),\
 	-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
 	-p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \
 	-u $(instsetoo_OUT) \
-	-buildid $(if $(filter deb0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
+	-buildid $(if $(filter deb0 rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
 	$(if $(filter WNT,$(OS)), \
 		-msitemplate $(dir $@)msi_templates \
 		-msilanguage $(dir $@)win_ulffiles \
commit 7ffba8e88ac527e473ca74996c6a453f392e63f1
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed May 21 17:37:33 2014 +0200

    fdo#70596 dependency problem with debian packages for master/dev builds
    
    debian packages don't cope with release number of 0, so use release 1
    for debian master/dev-packages
    
    Change-Id: Id91926322d13bddad3a39faccfee4e131d8956b0
    (cherry picked from commit a95d12b547e2635e10aa074fe42f12a0ea151163)

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 2af27ac..16b841c 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -81,7 +81,7 @@ $(foreach pkgformat,$(5),\
 	-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
 	-p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \
 	-u $(instsetoo_OUT) \
-	-buildid $(LIBO_VERSION_PATCH) \
+	-buildid $(if $(filter deb0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
 	$(if $(filter WNT,$(OS)), \
 		-msitemplate $(dir $@)msi_templates \
 		-msilanguage $(dir $@)win_ulffiles \