The following commit has been merged in the master branch:
commit 40b57cb0b46502e0ebbb37e6b01be93ab70b2a8c
Author: Rene Engelhard <[email protected]>
Date: Tue Mar 22 02:06:03 2011 +0000
build with system libtextcat
diff --git a/changelog b/changelog
index 915271f..9ec79fe 100644
--- a/changelog
+++ b/changelog
@@ -11,13 +11,16 @@ libreoffice (1:3.3.2~rc2-2) UNRELEASED; urgency=low
- don't add shell-lib-conffiles.sh to maintscripts anymore
- remove lenny-backport support; lenny hasn't a dpkg-maintscript-helper
- make base-files build-conflict also work after 6.0.1
+ - build with system libtextcat now that that is patched
* debian/libreoffice-common.p*.in:
- remove hardcoded rm_conffile. use dpkg-maintscript-helper
- move psprint.conf, sofficerc and soffice.sh (closes: #619113)
* debian/shell-lib-conffiles.sh: remove
- * debian/control.in: Standards-Version: 3.9.1 (no changes needed)
+ * debian/control.in:
+ - Standards-Version: 3.9.1 (no changes needed)
+ - make conflicts on libtextcat-data versioned
- -- Rene Engelhard <[email protected]> Sun, 20 Mar 2011 12:15:19 +0000
+ -- Rene Engelhard <[email protected]> Tue, 22 Mar 2011 01:37:38 +0000
libreoffice (1:3.3.2~rc2-1) unstable; urgency=low
diff --git a/control b/control
index 795630e..b33ead4 100644
--- a/control
+++ b/control
@@ -3,8 +3,8 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>>
4.3.0) [s390], gcc (>> 4.3.0) [s390], dpkg-dev (>= 1.15.1), libgl1-mesa-dev
[!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev
(>= 0.8.0), libgraphite-dev, libcurl4-gnutls-dev, libssl-dev, libdb-dev, python
(>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev
(>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 powerpc powerpcspe ppc64
s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64],
libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0),
ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel],
libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11),
mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386],
libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd
-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64
kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64
kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev,
libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev
(>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev,
libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev,
liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4),
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1),
libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev
-Build-Depends-Indep: fdupes, xml-core, imagemagick, libtextcat-data-utf8,
fontforge
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>>
4.3.0) [s390], gcc (>> 4.3.0) [s390], dpkg-dev (>= 1.15.1), libgl1-mesa-dev
[!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev
(>= 0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev,
libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>=
7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf
i3
86 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc
!powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64],
ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime,
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org
[!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel],
libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11),
mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386],
libmono-dev (>= 2.4.2.3
) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3)
[amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7)
[amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>=
1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>=
2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev,
liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4),
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1),
libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (=
1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (=
6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
@@ -104,8 +104,8 @@ 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, ${textcat-data-recommends}
-Conflicts: libtextcat-data, broffice, openoffice.org-common (<< 1:3.3.0~)
+Recommends: xfonts-mathml
+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}~),
diff --git a/control.in b/control.in
index cc9ea63..dcbea7a 100644
--- a/control.in
+++ b/control.in
@@ -213,9 +213,8 @@ Suggests: libreofficeVER-style-hicontrast,
libreofficeVER-style-tango,
libreofficeVER-style-crystal,
libreofficeVER-style-oxygen
-Recommends: xfonts-mathml,
- ${textcat-data-recommends}
-Conflicts: libtextcat-data,
+Recommends: xfonts-mathml
+Conflicts: libtextcat-data (<< 2.2-8),
broffice,
openoffice.org-common (<< 1:3.3.0~)
Provides: libreoffice-l10n-en-us
diff --git a/libreoffice-common.links b/libreoffice-common.links.in
similarity index 99%
rename from libreoffice-common.links
rename to libreoffice-common.links.in
index be8c18d..04ff5f7 100644
--- a/libreoffice-common.links
+++ b/libreoffice-common.links.in
@@ -34,3 +34,4 @@
usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-spreadsheet-template.p
usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-text.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text.png
usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-text-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text-template.png
usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-web-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.web-template.png
+usr/share/libtextcat/LM @OOBASISDIR@/share/fingerprint
diff --git a/rules b/rules
index 715dad8..b449f03 100755
--- a/rules
+++ b/rules
@@ -274,6 +274,7 @@ PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
ALLOC=system
+SYSTEM_STUFF += textcat
USE_SYSTEM_TEXTCAT_DATA=y
SYSTEM_STUFF += cppunit
@@ -439,7 +440,7 @@ endif
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:[email protected]
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes libtextcat,
$(SYSTEM_STUFF))
JUNIT_MIN_VER=
endif
@@ -506,9 +507,13 @@ else
CONFIGURE_FLAGS += --disable-graphite
endif
+
+ifneq (,$(filter textcat, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libtextcat-dev (>= 2.2-8)
+ CONFIGURE_FLAGS += --with-system-libtextcat
+endif
ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
- BUILD_DEPS_INDEP += , libtextcat-data-utf8
- TEXTCAT_DATA_RECOMMENDS := libtextcat-data-utf8
+ CONFIGURE_FLAGS +=
--with-external-libtextcat-data=/usr/share/libtextcat/LM
endif
ifeq "$(USE_LIBCURL4)" "y"
@@ -3056,6 +3061,15 @@ endif
> debian/$$i.bug-script; \
fi ;\
done
+ # generate .links files from *.in
+ for PKG in $(ARCH_INDEP_PACKAGES); do \
+ LINKS=debian/$$PKG.links ; \
+ if [ -e $$LINKS.in ]; then \
+ sed -e "s/\@LIBSUFFIX\@/$(LIBSUFFIX)/g" \
+ -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+ < $$LINKS.in > $$LINKS ; \
+ fi; \
+ done
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
@@ -3098,14 +3112,6 @@ endif
ln -s /$(OOUREDIR) \
$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e
s/lib/share/)/ure-link
-ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
- # 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
-
# enable session handling and recovery
perl -pi -e 's,<prop oor:name="DocumentStoreUIEnabled"
oor:type="xs:boolean"><value>false</value></prop>,<prop
oor:name="DocumentStoreUIEnabled"
oor:type="xs:boolean"><value>true</value></prop>,'
$(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
@@ -3408,7 +3414,6 @@ 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
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
