[SCM] LibreOffice packaging repository branch, master, updated. 999b653e61b6260f3fa06c820e6b78171b46befc
The following commit has been merged in the master branch:
commit 999b653e61b6260f3fa06c820e6b78171b46befc
Author: Rene Engelhard <rene@debian.org>
Date: Thu Mar 31 11:48:31 2011 +0200
s/textcat/lib&/, saves us a manual --with-system-libtextcat
diff --git a/rules b/rules
index 2a16147..e2b5078 100755
--- a/rules
+++ b/rules
@@ -263,7 +263,7 @@ PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
ALLOC=system
-SYSTEM_STUFF += textcat
+SYSTEM_STUFF += libtextcat
USE_SYSTEM_TEXTCAT_DATA=y
SYSTEM_STUFF += cppunit
@@ -429,7 +429,7 @@ endif
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes textcat, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes libtextcat, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
endif
@@ -497,9 +497,8 @@ else
endif
-ifneq (,$(filter textcat, $(SYSTEM_STUFF)))
+ifneq (,$(filter libtextcat, $(SYSTEM_STUFF)))
BUILD_DEPS += , libtextcat-dev (>= 2.2-8)
- CONFIGURE_FLAGS += --with-system-libtextcat
endif
ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
CONFIGURE_FLAGS += --with-external-libtextcat-data=/usr/share/libtextcat/LM
--
LibreOffice packaging repository
Reply to: