[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-1-31-g678c5eb
The following commit has been merged in the debian-experimental-3.5 branch:
commit 358f9dd6308bca97f5399e17b8fd2a75770ba2f0
Author: Rene Engelhard <rene@debian.org>
Date: Wed Sep 28 20:22:36 2011 +0000
adapt for libexttextcat move
diff --git a/changelog b/changelog
index 769a182..e0a84a9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~git20110911-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~git20110928-1) UNRELEASED; urgency=low
* new upstream snapshot
@@ -11,8 +11,8 @@ libreoffice (1:3.5.0~git20110911-1) UNRELEASED; urgency=low
- enable new build against Gtk3
- bump python b-d to >= 2.6 as we don't work with earlier anymore.
Also build python3-uno
- - add new conditionals and build-deps for new libvisio,librsvg and gettext
- usage
+ - add new conditionals and build-deps for new libvisio,librsvg,gettext
+ usage and libexttextcat switch
* debian/rules, debian/control.in:
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
diff --git a/rules b/rules
index 4fbafb9..a61f548 100755
--- a/rules
+++ b/rules
@@ -278,7 +278,7 @@ PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
ALLOC=system
-SYSTEM_STUFF += libtextcat
+SYSTEM_STUFF += libexttextcat
USE_SYSTEM_TEXTCAT_DATA=y
SYSTEM_STUFF += cppunit
ENABLE_LIBRSVG=y
@@ -451,7 +451,7 @@ endif
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libtextcat graphite libvisio, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite libvisio, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
PARALLEL_BUILD=n
endif
@@ -537,11 +537,8 @@ else
endif
-ifneq (,$(filter libtextcat, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libtextcat-dev (>= 2.2-8)
-endif
-ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
- CONFIGURE_FLAGS += --with-external-libtextcat-data=/usr/share/libtextcat/LM
+ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libtextcat-dev (>= 3.0.1)
TEXTCAT_DATA_RECOMMENDS := libtextcat-data (>= 2.2-9)
endif
@@ -3216,10 +3213,6 @@ endif
fi; \
done
-ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
- echo "usr/share/libtextcat/LM $(OOBASISDIR)/share/fingerprint" >> debian/libreoffice-common.links
-endif
-
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice >/dev/null; pwd`" ;\
--
LibreOffice packaging repository
Reply to: