The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit ceed7962ca5a03f9d4a9837137bf3b1bca8c1869
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Mon Jul 18 10:32:42 2011 +0200
reenable kde, evolution2 and opensymbol by adding the configureflags
directy, instead of depending on the distro-config insanity
diff --git a/control b/control
index f345bef..9ab5bc4 100644
--- a/control
+++ b/control
@@ -4,8 +4,8 @@ Priority: optional
Maintainer: Ubuntu Core Developers <ubuntu-devel-disc...@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian LibreOffice Maintainers
<debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-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, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1),
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libtextcat-dev (>= 2.2-8),
libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4),
python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk
[alpha amd64 armel armhf i386 mips mipsel 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), 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, javahelper (>= 0.37), xulrunner-dev | firefox-dev,
libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>=
1.38), libmdds-dev (>= 0.5.0), libvigraimpex-d
ev, 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,
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev,
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
+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, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1),
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libtextcat-dev (>= 2.2-8),
libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4),
python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk
[alpha amd64 armel armhf i386 mips mipsel 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), 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, javahelper (>= 0.37), xulrunner-dev | firefox-dev,
libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>=
1.38), libmdds-dev (>= 0.5.0), libvigraimpex-d
ev, 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), libebook1.2-dev [!armel], libxrandr-dev,
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, 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~),
qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant (=
1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa ia64
kfreebsd-i386 kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1),
libhsqldb-java (>= 1.8.1~), libstlport4.6-dev
Standards-Version: 3.9.1
XS-Python-Version: current
@@ -18,7 +18,7 @@ Package: libreoffice
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel], libreoffice-report-builder-bin [!armel], ttf-dejavu,
ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends},
${java-common-depends}, ${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
-Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1,
libreoffice-gnome, iceweasel | firefox | icedove | thunderbird | iceape-browser
| mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit,
imagemagick | graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests},
${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
+Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1,
libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove |
thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends},
openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests},
${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
Description: office productivity suite
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -43,6 +43,7 @@ Description: office productivity suite
* libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
* libreoffice-gnome: GNOME VFS, GConf backend
+ * libreoffice-kde: KDE UI Plugin and KDE File Picker support
* menu: Will add libreoffice menu entries for every Debian window manager.
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
@@ -688,6 +689,16 @@ Description: LibreOffice extension for importing PDF
documents
LibreOffice Draw.
Homepage: http://extensions.services.openoffice.org/project/pdfimport
+Package: ttf-opensymbol
+Section: fonts
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: fontconfig
+Description: OpenSymbol TrueType font
+ This package contains the OpenSymbol TrueType font included in
+ LibreOffice. This font contains symbols (like fonts as Wingdings(tm)),
+ bullets (needed for bullets in LibreOffice) and non-latin character
+
Package: libreoffice-dbg
Section: debug
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
@@ -735,6 +746,25 @@ Description: office productivity suite -- SDK documentation
.
It also contains the gsicheck utility.
+Package: libreoffice-kde
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Recommends: ${kde-iconset-dep}
+Suggests: konqueror, kmail, libreoffice-kab
+Section: kde
+Enhances: libreoffice
+Replaces: openoffice.org-kde (<< 1:3.3.0~)
+Description: office productivity suite -- KDE integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the KDE plugin for drawing OOo's widgets with
+ KDE/Qt and a KDEish File Picker when running under KDE.
+ You can extend the functionality of this by installing these packages:
+ .
+ * konqueror / kmail
+ * libreoffice-kab: KDE Addressbook support
+
Package: libreoffice-mysql-connector
Section: misc
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
@@ -749,6 +779,20 @@ Description: MySQL Connector extension for LibreOffice
The MySQL Connector extension allows one to use the MySQL database from
LibreOffice without any wrapper layer such as ODBC or JDBC.
+Package: libreoffice-evolution
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Section: gnome
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>=
1:3.4.0~), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
+Recommends: evolution
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Replaces: libreoffice-common (<< 1:3.3.3-2~)
+Description: office productivity suite -- Evolution addressbook support
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package allows LibreOffice to access Evolution address books.
+ You need to install evolution separately.
+
Package: libreoffice-filter-binfilter
Section: misc
Architecture: alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x
sparc kfreebsd-amd64 kfreebsd-i386
diff --git a/rules b/rules
index 154ee5c..d96c5cf 100755
--- a/rules
+++ b/rules
@@ -471,17 +471,12 @@ ifeq "$(DIST)" "Ubuntu"
--with-system-sane \
--with-system-xrender-headers \
--with-vendor=\"Ubuntu\" \
+ --without-fonts \
--without-myspell-dicts \
SYSTEM_STUFF := $(filter-out lucene, $(SYSTEM_STUFF))
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
- # FIXME: fails to produce fps_kde*.uno.so for packaging
- BUILD_KDE=n
- # FIXME: fails to produce libevoab*.so for packaging
- ENABLE_EVO2=n
- PACKAGE_TTF_OPENSYMBOL=n
-
# FIXME: smoketest fails, but we need the indep packages for the other archs
# disabling for all archs to get rid of epm dependency
RUN_SMOKETEST=n
@@ -1004,6 +999,7 @@ ifeq "$(BUILD_KDE)" "n"
CONFIGURE_FLAGS-= --disable-kde4
else
CONFIGURE_FLAGS += --disable-kde
+ CONFIGURE_FLAGS += --enable-kde4
KDE_ICONSET_DEP=libreoffice$(VER)-style-oxygen
BUILD_DEPS += , kdelibs5-dev $(KDELIBS_MINVER)
BUILD_DEPS += , libqt4-dev $(QT_MINVER)
@@ -1034,6 +1030,7 @@ endif
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
else
+ CONFIGURE_FLAGS += --enable-evolution2
BUILD_DEPS += , libebook1.2-dev$(OOO_NO_BASE_ARCHS)
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qinjx-0002ne...@vasks.debian.org
