diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-05-21 17:37:33 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-06-02 11:53:31 +0200 |
| commit | 7ffba8e88ac527e473ca74996c6a453f392e63f1 (patch) | |
| tree | 75e564b93f258b84bc2d73ed151a112a8726bf34 | |
| parent | e5de2511068a1b7eea34fb10ea19b555abcd663b (diff) | |
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)
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 2af27acf35f5..16b841c1cda9 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 \ |