[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-168-g639fae5
The following commit has been merged in the debian-experimental-3.5 branch:
commit 71528962e555d4a781ac0b2d6326f04c59258403
Author: Rene Engelhard <rene@debian.org>
Date: Wed Dec 21 12:35:03 2011 +0100
fix Breaks
diff --git a/control b/control
index 510b9f7..320f3ea 100644
--- a/control
+++ b/control
@@ -108,20 +108,20 @@ Suggests: libreoffice-style-hicontrast, libreoffice-style-tango, libreoffice-sty
Recommends: xfonts-mathml, ${textcat-data-recommends}
Conflicts: libtextcat-data (<< 2.2-8), broffice, openoffice.org-common (<< 1:3.3.0~)
Provides: libreoffice-l10n-en-us
-Breaks: libreoffice-style-crystal (<< 1:${basis-version}~),
- libreoffice-style-oxygen (<< 1:${basis-version}~),
+Breaks: libreoffice-style-crystal (<< 1:${oover}~),
+ libreoffice-style-oxygen (<< 1:${oover}~),
libreoffice-style-industrial,
- libreoffice-style-tango (<< 1:${basis-version}~),
- libreoffice-style-hicontrast (<< 1:${basis-version}~),
- libreoffice-style-galaxy (<< 1:${basis-version}~),
- libreoffice-style-andromeda (<< 1:${basis-version}~),
- libreoffice-core (<< 1:${basis-version}~),
- libreoffice-style-crystal (>= 1:${next-basis-version}~),
- libreoffice-style-oxygen (>= 1:${next-basis-version}~),
- libreoffice-style-tango (>= 1:${next-basis-version}~),
- libreoffice-style-hicontrast (>= 1:${next-basis-version}~),
- libreoffice-style-galaxy (>= 1:${next-basis-version}~),
- libreoffice-core (>= 1:${next-basis-version}~)
+ libreoffice-style-tango (<< 1:${oover}~),
+ libreoffice-style-hicontrast (<< 1:${oover}~),
+ libreoffice-style-galaxy (<< 1:${oover}~),
+ libreoffice-style-andromeda (<< 1:${oover}~),
+ libreoffice-core (<< 1:${oover}~),
+ libreoffice-style-crystal (>= 1:${next-oover}~),
+ libreoffice-style-oxygen (>= 1:${next-oover}~),
+ libreoffice-style-tango (>= 1:${next-oover}~),
+ libreoffice-style-hicontrast (>= 1:${next-oover}~),
+ libreoffice-style-galaxy (>= 1:${next-oover}~),
+ libreoffice-core (>= 1:${next-oover}~)
Replaces: openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.in b/control.in
index e9e7b7e..f0d20a6 100644
--- a/control.in
+++ b/control.in
@@ -210,20 +210,20 @@ Conflicts: libtextcat-data (<< 2.2-8),
broffice,
openoffice.org-common (<< 1:3.3.0~)
Provides: libreoffice-l10n-en-us
-Breaks: libreofficeVER-style-crystal (<< 1:${basis-version}~),
- libreofficeVER-style-oxygen (<< 1:${basis-version}~),
+Breaks: libreofficeVER-style-crystal (<< 1:${oover}~),
+ libreofficeVER-style-oxygen (<< 1:${oover}~),
libreofficeVER-style-industrial,
- libreofficeVER-style-tango (<< 1:${basis-version}~),
- libreofficeVER-style-hicontrast (<< 1:${basis-version}~),
- libreofficeVER-style-galaxy (<< 1:${basis-version}~),
- libreofficeVER-style-andromeda (<< 1:${basis-version}~),
- libreofficeVER-core (<< 1:${basis-version}~),
- libreofficeVER-style-crystal (>= 1:${next-basis-version}~),
- libreofficeVER-style-oxygen (>= 1:${next-basis-version}~),
- libreofficeVER-style-tango (>= 1:${next-basis-version}~),
- libreofficeVER-style-hicontrast (>= 1:${next-basis-version}~),
- libreofficeVER-style-galaxy (>= 1:${next-basis-version}~),
- libreofficeVER-core (>= 1:${next-basis-version}~)
+ libreofficeVER-style-tango (<< 1:${oover}~),
+ libreofficeVER-style-hicontrast (<< 1:${oover}~),
+ libreofficeVER-style-galaxy (<< 1:${oover}~),
+ libreofficeVER-style-andromeda (<< 1:${oover}~),
+ libreofficeVER-core (<< 1:${oover}~),
+ libreofficeVER-style-crystal (>= 1:${next-oover}~),
+ libreofficeVER-style-oxygen (>= 1:${next-oover}~),
+ libreofficeVER-style-tango (>= 1:${next-oover}~),
+ libreofficeVER-style-hicontrast (>= 1:${next-oover}~),
+ libreofficeVER-style-galaxy (>= 1:${next-oover}~),
+ libreofficeVER-core (>= 1:${next-oover}~)
Replaces: openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
diff --git a/rules b/rules
index 7f96d7a..fcaa0bf 100755
--- a/rules
+++ b/rules
@@ -2858,6 +2858,8 @@ endif
-Nlibreoffice$(VER)-mysql-connector -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
-V'base-version=$(BASE_VERSION)' \
+ -V'oover=$(OOVER)' \
+ -V'next-oover=$(NEXT_OOVER)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS) $(JAVA_COMMON_DEPENDS_VERSION)' \
@@ -2997,6 +2999,8 @@ endif
-Nfonts-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
-V'base-version=$(BASE_VERSION)' \
+ -V'oover=$(OOVER)' \
+ -V'next-oover=$(NEXT_OOVER)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'bsh-depends=$(BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
--
LibreOffice packaging repository
Reply to: