[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-5-g6f3ed1f
The following commit has been merged in the master branch:
commit 6f3ed1f9ed1ed26982759ebb15535cc0ddebf5ba
Author: Rene Engelhard <rene@debian.org>
Date: Tue Oct 18 01:53:22 2011 +0200
fix USE_SYSTEM_TEXTCAT_DATA for squeeze
diff --git a/changelog b/changelog
index 6a00f33..8c7bbe2 100644
--- a/changelog
+++ b/changelog
@@ -3,11 +3,12 @@ libreoffice (1:3.4.3-5) UNRELEASED; urgency=low
* debian/rules:
- don't try to use internal jfreereport on ia64; disable the SRB
instead.
+ - fix USE_SYSTEM_TEXTCAT_DATA for squeeze
* debian/watch:
- - point to libreoffice-bootstrap-(\d.\d.\d).\d.tar.bz2 in debian/watch;
- does not suffice but we should reference the source and not binaries
+ - point to libreoffice-bootstrap-(\d.\d.\d).\d.tar.bz2 in debian/watch;
+ does not suffice but we should reference the source and not binaries
- -- Rene Engelhard <rene@debian.org> Sun, 16 Oct 2011 02:52:05 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 18 Oct 2011 01:52:39 +0200
libreoffice (1:3.4.3-4) unstable; urgency=low
diff --git a/rules b/rules
index d3caab0..433c7ef 100755
--- a/rules
+++ b/rules
@@ -552,7 +552,11 @@ ifneq (,$(filter libtextcat, $(SYSTEM_STUFF)))
endif
ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
CONFIGURE_FLAGS += --with-external-libtextcat-data=/usr/share/libtextcat/LM
+ ifeq "$(SQUEEZE_BACKPORT)" "y"
+ TEXTCAT_DATA_RECOMMENDS := libtextcat-data-utf8
+ else
TEXTCAT_DATA_RECOMMENDS := libtextcat-data (>= 2.2-9)
+ endif
endif
ifeq "$(USE_LIBCURL4)" "y"
@@ -3189,7 +3193,15 @@ endif
done
ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
+ ifneq "$(SQUEEZE_BACKPORT)" "y"
echo "usr/share/libtextcat/LM $(OOBASISDIR)/share/fingerprint" >> debian/libreoffice-common.links
+ else
+ # remove duplicated textcat data and replace with symlinks
+ cd $(PKGDIR)-common/$(OOBASISDIR)/share && \
+ for i in `fdupes -n -f -1 fingerprint/ /usr/share/libtextcat/LM`; do \
+ ln -sf /usr/share/libtextcat/LM/`basename $$i` fingerprint/`basename $$i`; \
+ done
+ endif
endif
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
--
LibreOffice packaging repository
Reply to: