[SCM] LibreOffice packaging repository branch, master, updated. b55d47cb93721af78f14bfc137b5b96814ea3247
The following commit has been merged in the master branch:
commit b55d47cb93721af78f14bfc137b5b96814ea3247
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 2 21:44:22 2011 +0000
readd recommends for libtextcat-data though libtextcat0 depends on it. Makes more clear what we need now (see #620568)
diff --git a/changelog b/changelog
index 7203d57..e2eb9fe 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.3.2-3) UNRELEASED; urgency=low
+
+ * debian/rules, debian/control.in:
+ - readd recommends for libtextcat-data though libtextcat0 depends on it.
+ Makes more clear what we need now (see #620568)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Apr 2011 23:40:19 +0200
+
libreoffice (1:3.3.2-2) unstable; urgency=medium
* debian/patches/fix-evolution-local.diff: backport from libreoffice-3-3
diff --git a/control b/control
index 23d2d96..68a6a0f 100644
--- a/control
+++ b/control
@@ -104,7 +104,7 @@ Package: libreoffice-common
Architecture: all
Depends: libreoffice-style-default | libreoffice-style, ${misc:Depends}, ure
Suggests: libreoffice-style-hicontrast, libreoffice-style-tango, libreoffice-style-crystal, libreoffice-style-oxygen
-Recommends: xfonts-mathml
+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}~),
diff --git a/control.in b/control.in
index dcbea7a..5c3c6ad 100644
--- a/control.in
+++ b/control.in
@@ -213,7 +213,8 @@ Suggests: libreofficeVER-style-hicontrast,
libreofficeVER-style-tango,
libreofficeVER-style-crystal,
libreofficeVER-style-oxygen
-Recommends: xfonts-mathml
+Recommends: xfonts-mathml,
+ ${textcat-data-recommends}
Conflicts: libtextcat-data (<< 2.2-8),
broffice,
openoffice.org-common (<< 1:3.3.0~)
diff --git a/rules b/rules
index 58afb14..cf88545 100755
--- a/rules
+++ b/rules
@@ -513,6 +513,7 @@ ifneq (,$(filter libtextcat, $(SYSTEM_STUFF)))
endif
ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
CONFIGURE_FLAGS += --with-external-libtextcat-data=/usr/share/libtextcat/LM
+ TEXTCAT_DATA_RECOMMENDS := libtextcat-data (>= 2.2-9)
endif
ifeq "$(USE_LIBCURL4)" "y"
@@ -3397,6 +3398,7 @@ endif
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'lucene-conflicts=$(LUCENE_CONFLICTS)' \
+ -V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
--
LibreOffice packaging repository
Reply to: